Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
726,463 Commits 3 Branches 0 Tags
b4aa180dcdd979cfff06785d2602dcb82c05d23b
Commit Graph

726463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Vela
b4aa180dcd Merge "Update SidecarProvider to pass Application Context." into sc-v2-dev am: 32038eabfa am: b066ade937 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16065848

Change-Id: If8b32e3ea4f34f87692c75ec61cc435ea45b76c9
 2021-10-18 17:35:37 +00:00
Diego Vela
b066ade937 Merge "Update SidecarProvider to pass Application Context." into sc-v2-dev am: 32038eabfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16065848

Change-Id: Ib4ab446d2ef9cf592650be6942690bcf8e6afad4
 2021-10-18 17:26:57 +00:00
Diego Vela
32038eabfa Merge "Update SidecarProvider to pass Application Context." into sc-v2-dev 2021-10-18 17:23:32 +00:00
Fabian Kozynski
130af6c5e2 Merge "Fix dispatch in FakeSettings" into sc-v2-dev am: ae77bd5865 am: 812cedcfc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16066509

Change-Id: I1e4d7f3fe59448c59689a1ef3da4b98ddb9dd538
 2021-10-18 17:22:22 +00:00
Trevor Radcliffe
124237cc01 Merge "Migrate LockTaskTests to Soong" am: 106fa79deb am: 226f91ed89 am: a65c3d15f0 am: 6f519663ad am: 68a450eed9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857983

Change-Id: I317779ff59784b61b3b395266eed8ef49f26b769
 2021-10-18 17:21:59 +00:00
Fabian Kozynski
812cedcfc3 Merge "Fix dispatch in FakeSettings" into sc-v2-dev am: ae77bd5865 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16066509

Change-Id: Iad3fc305f0e0ee1d006c8597589186c508bbff88
 2021-10-18 17:21:33 +00:00
Trevor Radcliffe
25ff3083d0 Merge "Migrate DynamicCodeLoggerIntegrationTests to Soong" am: 770099002a am: 012fc9b01a am: de5eff0206 am: 0e56995dba am: c17e31d365 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856813

Change-Id: Idaed4e2e2d9986f4a0f0db93663d57591c6dd9be
 2021-10-18 17:21:05 +00:00
Fabian Kozynski
ae77bd5865 Merge "Fix dispatch in FakeSettings" into sc-v2-dev 2021-10-18 17:06:36 +00:00
TreeHugger Robot
0c6c7812f1 Merge "Rename "priority" to "bias"." 2021-10-18 17:06:35 +00:00
Trevor Radcliffe
68a450eed9 Merge "Migrate LockTaskTests to Soong" am: 106fa79deb am: 226f91ed89 am: a65c3d15f0 am: 6f519663ad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857983

Change-Id: I6b3a58ba44dae609757c835e50fb6e4e01265adb
 2021-10-18 17:06:14 +00:00
Trevor Radcliffe
c17e31d365 Merge "Migrate DynamicCodeLoggerIntegrationTests to Soong" am: 770099002a am: 012fc9b01a am: de5eff0206 am: 0e56995dba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856813

Change-Id: I444299e9be1a7b699b22545a4612108dd240f6c3
 2021-10-18 17:05:50 +00:00
Trevor Radcliffe
6f519663ad Merge "Migrate LockTaskTests to Soong" am: 106fa79deb am: 226f91ed89 am: a65c3d15f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857983

Change-Id: I7a66c1555658ce241783df4f0b47817f9df8e91c
 2021-10-18 16:55:38 +00:00
Trevor Radcliffe
0e56995dba Merge "Migrate DynamicCodeLoggerIntegrationTests to Soong" am: 770099002a am: 012fc9b01a am: de5eff0206 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856813

Change-Id: I762c710fdce0f95a05e366e1a971f00f1eddb62d
 2021-10-18 16:55:26 +00:00
Trevor Radcliffe
a65c3d15f0 Merge "Migrate LockTaskTests to Soong" am: 106fa79deb am: 226f91ed89 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857983

Change-Id: I149f0dea7e0f021c9dcf4e787aa95006a7a1048b
 2021-10-18 16:46:35 +00:00
Trevor Radcliffe
de5eff0206 Merge "Migrate DynamicCodeLoggerIntegrationTests to Soong" am: 770099002a am: 012fc9b01a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856813

Change-Id: Ifa5320b3c151200054998a328af70c59eaf53a9c
 2021-10-18 16:46:26 +00:00
Trevor Radcliffe
226f91ed89 Merge "Migrate LockTaskTests to Soong" am: 106fa79deb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857983

Change-Id: I1106728f0179d95ac2002e32528f3d51ab19f37c
 2021-10-18 16:29:14 +00:00
Trevor Radcliffe
012fc9b01a Merge "Migrate DynamicCodeLoggerIntegrationTests to Soong" am: 770099002a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856813

Change-Id: Id4cc4a6dbaaa5c566a864c4eb8a468b28b8b41ff
 2021-10-18 16:28:25 +00:00
TreeHugger Robot
1f3c7fd840 Merge "Use app ops to trigger app block change notifications" 2021-10-18 16:26:59 +00:00
Trevor Radcliffe
106fa79deb Merge "Migrate LockTaskTests to Soong" 2021-10-18 16:13:22 +00:00
Trevor Radcliffe
770099002a Merge "Migrate DynamicCodeLoggerIntegrationTests to Soong" 2021-10-18 16:12:52 +00:00
Zoey Chen
2967ca7d74 Merge "[Telephony] Add more javadoc for carrier privileges" 2021-10-18 15:55:32 +00:00
TreeHugger Robot
1885f4d598 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-18 15:07:22 +00:00
TreeHugger Robot
aa94f69ff1 Merge "Update light idle API naming." 2021-10-18 14:59:40 +00:00
TreeHugger Robot
292d34be1a Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-18 14:58:49 +00:00
TreeHugger Robot
32747f1996 Merge "Separate split layout shifting callback from layout changed callback" into sc-v2-dev am: 6f26ef6d74 am: 737afa31f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16003789

Change-Id: I59703ea6e840613660e412eb9a1a329daa6f55ac
 2021-10-18 14:54:04 +00:00
TreeHugger Robot
31d99ef25a Merge "Replace tasks in the same split with the dropping app" into sc-v2-dev am: 3d13d0cbad am: 57020f3464 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16062196

Change-Id: I3ba2846070c895baf3c18b3ae4499d4147895ff7
 2021-10-18 14:53:32 +00:00
TreeHugger Robot
97f56af8e4 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-18 14:43:49 +00:00
Tom Hsu
60fc8fb1ee Merge "Add a new settings' flag to control enable of app's language function." 2021-10-18 14:42:16 +00:00
TreeHugger Robot
737afa31f8 Merge "Separate split layout shifting callback from layout changed callback" into sc-v2-dev am: 6f26ef6d74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16003789

Change-Id: I5790d144e36d5c2daa2335757d5c3fc2420bed80
 2021-10-18 14:39:05 +00:00
TreeHugger Robot
57020f3464 Merge "Replace tasks in the same split with the dropping app" into sc-v2-dev am: 3d13d0cbad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16062196

Change-Id: I3a44d7e2ba54148672caabc9debbc89019089c57
 2021-10-18 14:38:29 +00:00
TreeHugger Robot
8309057962 Merge "ThermalManagerService: fix different system clock comparison" 2021-10-18 14:34:39 +00:00
TreeHugger Robot
6f26ef6d74 Merge "Separate split layout shifting callback from layout changed callback" into sc-v2-dev 2021-10-18 14:28:30 +00:00
TreeHugger Robot
3d13d0cbad Merge "Replace tasks in the same split with the dropping app" into sc-v2-dev 2021-10-18 14:27:18 +00:00
TreeHugger Robot
67a7208574 Merge "Synchronize screen turning on and unfold overlay" into sc-v2-dev am: 6ba778585f am: 89c0796657 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15920768

Change-Id: If231208769fe0115f2c00a181ac3ed08486f6d4b
 2021-10-18 12:56:05 +00:00
TreeHugger Robot
89c0796657 Merge "Synchronize screen turning on and unfold overlay" into sc-v2-dev am: 6ba778585f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15920768

Change-Id: I707d47888d0ed436f247287474273b42f5463c5e
 2021-10-18 12:41:54 +00:00
Issei Suzuki
8de5b8b998 Merge "Revised logic to sync keyguard occlude status." into sc-v2-dev am: ed14802c51 am: e76cc48d71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930803

Change-Id: Ia031b20f5af06cca4fb21f5f30260f8866f9aebe
 2021-10-18 12:35:52 +00:00
TreeHugger Robot
6ba778585f Merge "Synchronize screen turning on and unfold overlay" into sc-v2-dev 2021-10-18 12:28:26 +00:00
Issei Suzuki
e76cc48d71 Merge "Revised logic to sync keyguard occlude status." into sc-v2-dev am: ed14802c51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930803

Change-Id: I959881438881d2cc1e3cc81672fb0a9beb1430da
 2021-10-18 12:20:58 +00:00
Issei Suzuki
ed14802c51 Merge "Revised logic to sync keyguard occlude status." into sc-v2-dev 2021-10-18 12:03:28 +00:00
Ricky Wai
1c0e4ae86f Merge "Merge BroadcastOptions and ActivityOptions PendingIntent BAL flags and remove @hide." 2021-10-18 11:06:13 +00:00
Michal Olech
f483aae674 Merge changes Ifb05b969,I74808d8e 
* changes:
  [CEC Configuration] Switch HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED to Shared Preferences
  [CEC Configuration] Switch HDMI_CEC_ENABLED to Shared Preferences
 2021-10-18 10:38:44 +00:00
Wei Sheng Shih
93d235902d Merge "Revert "Use display awake signal to replace screen-off signal for sleep token."" into sc-v2-dev am: 2328dee098 am: cda95b514a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16074573

Change-Id: I397de8535578482e79ba3ee2d3a597d7c1bf0444
 2021-10-18 09:58:26 +00:00
Michał Brzeziński
64258bbb6f Merge "Fixing Heads Up Notifications not reacting to action touches in split shade" into sc-v2-dev am: 4772ecd698 am: ca1bb8b3da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16031101

Change-Id: I24ad1bf51956372731bc0c2e672f67fbd3e213a9
 2021-10-18 09:57:40 +00:00
Miguel Aranda
287245f148 [automerger skipped] Merge "Revert "Provide IconProvider in sysui dagger"" into sc-v2-dev am: b169404b77 am: d35724797b -s ours 
am skip reason: Merged-In If4ab0590f4b850103411b6a2dccf2092bb06d563 with SHA-1 d5abf60750 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16051988

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16074574

Change-Id: I0bf6f4ba86f5efcfd43607bdcaaa0ccdae321f54
 2021-10-18 09:56:09 +00:00
Wei Sheng Shih
cda95b514a Merge "Revert "Use display awake signal to replace screen-off signal for sleep token."" into sc-v2-dev am: 2328dee098 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16074573

Change-Id: Ic20884a16f3035a566d35d17361b1bb54d4e642a
 2021-10-18 09:46:35 +00:00
Michał Brzeziński
ca1bb8b3da Merge "Fixing Heads Up Notifications not reacting to action touches in split shade" into sc-v2-dev am: 4772ecd698 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16031101

Change-Id: I42ab7a4ccbe291511f2a70a35c12aff7a20d4e92
 2021-10-18 09:45:39 +00:00
Miguel Aranda
d35724797b Merge "Revert "Provide IconProvider in sysui dagger"" into sc-v2-dev am: b169404b77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16074574

Change-Id: Ib8fc344996264f9d1dbeb79917fa3c06de35ed7f
 2021-10-18 09:44:21 +00:00
Wei Sheng Shih
2328dee098 Merge "Revert "Use display awake signal to replace screen-off signal for sleep token."" into sc-v2-dev 2021-10-18 09:33:12 +00:00
Michał Brzeziński
4772ecd698 Merge "Fixing Heads Up Notifications not reacting to action touches in split shade" into sc-v2-dev 2021-10-18 09:26:19 +00:00
tom hsu
375f3c08f4 Add a new settings' flag to control enable of app's language function. 
Bug: 203382108
Test: local test.
Change-Id: I63e007e44113f6f59dfcf13471a6a259aaf7a692
 2021-10-18 17:24:45 +08:00