Commit Graph

642620 Commits

Author SHA1 Message Date
Chiachang Wang
021e9e2ecf Merge "Extend framework-connectivity.impl visibility" into sc-dev am: f083dae515
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14174195

Change-Id: I61cbb9f3f7a256a83f3d4c9716d912675a4a5ad1
2021-04-16 01:35:30 +00:00
TreeHugger Robot
ab4b9a7d58 Merge "Change brightness icon depending on level" into sc-dev am: 1332ae37bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14184747

Change-Id: I53d4e63e671878618880fd368975ff98ebde2db3
2021-04-16 01:35:09 +00:00
TreeHugger Robot
dabd5f6346 Merge "@IntDef incorrectly marked as containing flags" into sc-dev am: 4a9b2e6e36
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14186248

Change-Id: Ia6dface6f61dd6b484b412ab2221da9a50d922df
2021-04-16 01:34:54 +00:00
Wei Sheng Shih
2e8beab949 Merge "Hold WM lock when add starting window to TaskOrganizer" into sc-dev am: 5ddb3b7aeb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14161102

Change-Id: I572c3567bddca2f60846cf4ea9410a5094334bc7
2021-04-16 01:34:19 +00:00
Chiachang Wang
f083dae515 Merge "Extend framework-connectivity.impl visibility" into sc-dev 2021-04-16 01:13:34 +00:00
TreeHugger Robot
1332ae37bd Merge "Change brightness icon depending on level" into sc-dev 2021-04-16 01:12:40 +00:00
TreeHugger Robot
4a9b2e6e36 Merge "@IntDef incorrectly marked as containing flags" into sc-dev 2021-04-16 01:06:49 +00:00
Wei Sheng Shih
5ddb3b7aeb Merge "Hold WM lock when add starting window to TaskOrganizer" into sc-dev 2021-04-16 01:06:45 +00:00
TreeHugger Robot
54b7fc64dc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bd3d2e9a7f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7b3df55e04ccea163fa11d9f5c8d3a09a153565d
2021-04-16 00:55:31 +00:00
TreeHugger Robot
40af339d25 Merge "Allow provisioning state transition _PROFILE_FINALIZED->_USER_UNMANAGED" into sc-dev am: 43799d4d09
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14187466

Change-Id: I8e3782234c65f37b27f1f53ac6e2a17b8b7ea4ca
2021-04-16 00:55:17 +00:00
Chiachang Wang
53fa6bab85 Resovle hidden connectivity methods usage in SystemUITests am: 490befc506
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14194566

Change-Id: If48cf85e5f60069b151687f96ae7133d1a479422
2021-04-16 00:55:05 +00:00
Chavi Weingarten
f8a437a452 Merge "Use BLAST layer for screen rotation, surface freezer, and organizer" into sc-dev am: d6ea380f13
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13886772

Change-Id: I2df84bc00c8a0c3c819ab6691e35aabcfaba0df9
2021-04-16 00:54:57 +00:00
Jason Chang
d15ce9f5b7 Merge "Fix One Handed Feedback gesture's animations are quite jarring" into sc-dev am: 97bf5c62e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14150473

Change-Id: I83766b7ea23e8922727a831f3124e9c8465b668a
2021-04-16 00:54:10 +00:00
TreeHugger Robot
bd3d2e9a7f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-16 00:39:55 +00:00
TreeHugger Robot
43799d4d09 Merge "Allow provisioning state transition _PROFILE_FINALIZED->_USER_UNMANAGED" into sc-dev 2021-04-16 00:37:19 +00:00
Chiachang Wang
490befc506 Resovle hidden connectivity methods usage in SystemUITests
Connectivity hidden methods are no longer accessible outside
the module scope. Thus, replace the usage with equivalent
methods.

Bug: 182859030
Test: 1. remove framework-connectivity.impl from framework bp
      2. cd frameworks/base/packages/SystemUI/tests ; mm
      3. atest SystemUITests
Change-Id: Icfdcd983762eac788042e3d41db06597b69f3559
2021-04-16 00:34:53 +00:00
Chavi Weingarten
d6ea380f13 Merge "Use BLAST layer for screen rotation, surface freezer, and organizer" into sc-dev 2021-04-16 00:30:11 +00:00
Jason Chang
97bf5c62e1 Merge "Fix One Handed Feedback gesture's animations are quite jarring" into sc-dev 2021-04-16 00:29:30 +00:00
Siim Sammul
1ad4228bc3 Merge "Add dplotnikov and gaillard as owners for binder proto file too." am: 0c67225999 am: d3404b3c64 am: 6cebda3718 am: ac6f5ee927
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675889

Change-Id: If7673bf507eccfcd8fa41f307263a640c64eaab3
2021-04-16 00:01:52 +00:00
Siim Sammul
ac6f5ee927 Merge "Add dplotnikov and gaillard as owners for binder proto file too." am: 0c67225999 am: d3404b3c64 am: 6cebda3718
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675889

Change-Id: I2bba3c67462f4191f90181c6a16c17297c430bfc
2021-04-15 23:37:53 +00:00
Automerger Merge Worker
988f6290f3 Merge "[automerger skipped] Merge "OOB generateLocalOobData" am: 3a4f319145 am: bb6ea3457c am: 5a9fcc3d76 -s ours" into sc-dev am: 2363862360 -s ours
am skip reason: skip tag Change-Id I2d4167a6c92ee0cc24da12df206838161c8f3318 with SHA-1 ba2c904f8d is already in history

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

Change-Id: Ie5a758a42ceb2543cd1e2fafec92dff1d88a2e88
2021-04-15 23:08:38 +00:00
TreeHugger Robot
6d813fa0bd Merge "Update gpay icon on keyguard visibility" into sc-dev am: 8d4b0ccbd8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14202030

Change-Id: I89dc67be93f9d70c9e68eaffd26d4ffb1fda79ba
2021-04-15 23:08:15 +00:00
TreeHugger Robot
abf8d66597 Merge "Phase 1 of status bar system event animations" into sc-dev am: e438034aee
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14053994

Change-Id: If6f54ba441475f1b5b55cbeb10b0fa9b53b20889
2021-04-15 23:07:59 +00:00
Siim Sammul
6cebda3718 Merge "Add dplotnikov and gaillard as owners for binder proto file too." am: 0c67225999 am: d3404b3c64
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675889

Change-Id: Ifb3927030a449e5f6daa7a34e673b955714de58b
2021-04-15 22:56:51 +00:00
Automerger Merge Worker
2363862360 Merge "[automerger skipped] Merge "OOB generateLocalOobData" am: 3a4f319145 am: bb6ea3457c am: 5a9fcc3d76 -s ours" into sc-dev 2021-04-15 22:48:25 +00:00
TreeHugger Robot
8d4b0ccbd8 Merge "Update gpay icon on keyguard visibility" into sc-dev 2021-04-15 22:48:17 +00:00
Treehugger Robot
07e439e1c1 [automerger skipped] Merge "OOB generateLocalOobData" am: 3a4f319145 am: bb6ea3457c am: 5a9fcc3d76 -s ours
am skip reason: skip tag Change-Id I2d4167a6c92ee0cc24da12df206838161c8f3318 with SHA-1 ba2c904f8d is already in history

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

Change-Id: Ie353ad0084ce116285dfef430a5c4d29ad5e3e56
2021-04-15 22:48:15 +00:00
TreeHugger Robot
e438034aee Merge "Phase 1 of status bar system event animations" into sc-dev 2021-04-15 22:46:11 +00:00
Bill Yi
77147a3194 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idf84fd16696c813cc4edac45ffac2ea585b07746
2021-04-15 22:42:56 +00:00
Siim Sammul
d3404b3c64 Merge "Add dplotnikov and gaillard as owners for binder proto file too." am: 0c67225999
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675889

Change-Id: Ic704bca33a496656e6c58d8b67499c796d3349de
2021-04-15 22:32:04 +00:00
Chavi Weingarten
827f94d693 Merge "Update Wallpaper to use BLAST" into sc-dev am: e6791edbbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14192025

Change-Id: I8150b476bfe60adef77efde0d6c6d7f2543a736c
2021-04-15 22:21:29 +00:00
TreeHugger Robot
a8abd31421 Merge "Fix size calculation" into sc-dev am: 123079969d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14191409

Change-Id: Ia1ce0ac55da931d37a0f9b4c3fdc6ebc33df79c1
2021-04-15 22:21:17 +00:00
TreeHugger Robot
f146de70c4 Merge "Do not hold indicators for apps that become paused" into sc-dev am: 92716ec4ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14161928

Change-Id: I21bc10abfd063b975f314a1a193a6c9860cb9bc9
2021-04-15 22:20:56 +00:00
Treehugger Robot
5a9fcc3d76 Merge "OOB generateLocalOobData" am: 3a4f319145 am: bb6ea3457c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677745

Change-Id: Idcbf693aa6336aea76c0fa7d97262132c0cdeb8a
2021-04-15 22:19:43 +00:00
Erik Wolsheimer
3f66ba5bef Merge "Revert "Increase MAX_ATTRIBUTIONS to 10000"" into sc-dev am: 404920ea6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14201758

Change-Id: I7bffd054edffb5211728f0fccad0ec356faafc8a
2021-04-15 22:19:10 +00:00
Chavi Weingarten
e6791edbbf Merge "Update Wallpaper to use BLAST" into sc-dev 2021-04-15 22:05:37 +00:00
Siim Sammul
0c67225999 Merge "Add dplotnikov and gaillard as owners for binder proto file too." 2021-04-15 21:51:23 +00:00
Todd Kennedy
5889bd1f7f @IntDef incorrectly marked as containing flags
Change-Id: I0bde93fde412b4770a84124a9e323e4ac003d587
Bug: 174238856
Fixes: 174238856
Test: None. Doc only change.
2021-04-15 21:51:13 +00:00
TreeHugger Robot
123079969d Merge "Fix size calculation" into sc-dev 2021-04-15 21:37:59 +00:00
TreeHugger Robot
92716ec4ed Merge "Do not hold indicators for apps that become paused" into sc-dev 2021-04-15 21:35:10 +00:00
Erik Wolsheimer
404920ea6b Merge "Revert "Increase MAX_ATTRIBUTIONS to 10000"" into sc-dev 2021-04-15 21:20:25 +00:00
Beverly
b28ccdd2b4 Update gpay icon on keyguard visibility
- only show gpay icon on LS if cards exist

Test: manual
Fixes: 185490957
Change-Id: I53bf1633322406ae42f4eeb9153fbd903c01fd29
2021-04-15 21:19:59 +00:00
TreeHugger Robot
6baaa027d2 Merge "Exempting prioritized alarms from min_window" into sc-dev am: 9863f6343b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14193894

Change-Id: I3d2d55457842e555547f7b500b7ef3b7ebe13b46
2021-04-15 21:15:36 +00:00
TreeHugger Robot
48c61871b0 Merge "Clean up ComponentController and fix some bugs." into sc-dev am: a9d0dfcd90
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14201521

Change-Id: I4242e7419f63a30bdd2dcb74e41d04f3b998a4ef
2021-04-15 21:15:09 +00:00
Zhen Zhang
e541420417 Merge "Log hibernation state with AppStartOccurred atom" into sc-dev am: 69f97fa19a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14100518

Change-Id: I65c69e06c5f533d5f9b29c719f270e5d2a236504
2021-04-15 21:14:50 +00:00
TreeHugger Robot
1ee166f104 Merge "Add log detail on throttling events" into sc-dev am: 541aa2ce6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14127875

Change-Id: I7b901e4df7524d987802a194c43999aaffd6fcb0
2021-04-15 21:14:03 +00:00
TreeHugger Robot
9863f6343b Merge "Exempting prioritized alarms from min_window" into sc-dev 2021-04-15 21:06:12 +00:00
TreeHugger Robot
a9d0dfcd90 Merge "Clean up ComponentController and fix some bugs." into sc-dev 2021-04-15 21:01:42 +00:00
Zhen Zhang
69f97fa19a Merge "Log hibernation state with AppStartOccurred atom" into sc-dev 2021-04-15 20:58:26 +00:00
TreeHugger Robot
541aa2ce6b Merge "Add log detail on throttling events" into sc-dev 2021-04-15 20:58:22 +00:00