Commit Graph

756484 Commits

Author SHA1 Message Date
Vania Desmonda
7bc8a3988b Merge "Enable feature flag to show "Turns on at bedtime" as a Schedule in Dark theme Settings page." into tm-dev 2022-04-07 15:01:31 +00:00
Miguel Aranda
94b8687974 Merge "Add first set of libcore benchmarks to the System Health CB framework." am: e01a01ca3e am: c7fda7b570 am: 5b96793af5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1986426

Change-Id: If512729ba53b711e03ed3241d872df92cde69d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 15:00:55 +00:00
Miguel Aranda
5b96793af5 Merge "Add first set of libcore benchmarks to the System Health CB framework." am: e01a01ca3e am: c7fda7b570
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1986426

Change-Id: I8c987aec63b108fe9aa267532fdf9a75eb8f2d00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 14:40:46 +00:00
Evan Laird
756f7b4e91 Merge "Use background call for BatteryController#init()" into tm-dev 2022-04-07 14:30:54 +00:00
Nathalie Le Clair
c325e0fc57 Merge "cec: fix Traditional Chinese issue for Playback [1/1] BUG:183071276" am: f4c40e0b0b am: 6a47166d50 am: a1b57ae256
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566053

Change-Id: I080621c2c0845ac23074cc66d13509a6cd370080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 14:22:29 +00:00
Miguel Aranda
c7fda7b570 Merge "Add first set of libcore benchmarks to the System Health CB framework." am: e01a01ca3e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1986426

Change-Id: Iae1a66165221f45051be17c4d047b5bd5be3999b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 14:21:58 +00:00
Nathalie Le Clair
a1b57ae256 Merge "cec: fix Traditional Chinese issue for Playback [1/1] BUG:183071276" am: f4c40e0b0b am: 6a47166d50
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566053

Change-Id: I9d3fce190d3449dabd24862a8eb8d0d6f944a0db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 14:16:09 +00:00
TreeHugger Robot
67bb5cec83 Merge "Fix touchable region calculation in NavigationBarController" into tm-dev 2022-04-07 14:04:29 +00:00
Miguel Aranda
e01a01ca3e Merge "Add first set of libcore benchmarks to the System Health CB framework." 2022-04-07 14:01:23 +00:00
Shawn Lin
c5c2322583 [automerger skipped] Merge "[DO NOT MERGE] Fixed status bar glitch for apps that access internal res" into sc-v2-dev am: 88af43ac60 -s ours am: a3c90b5bb6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib2b1749d28949aded024a695f4c6f9e0e3cd0c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 14:01:22 +00:00
Miguel
1935f73e5b Add first set of libcore benchmarks to the System Health CB framework.
These will later be referenced by a google3 gcl file as part of a new
libcore test set. Doc: go/libcore-benchmarks-doc

Test: N/A
Bug: 210606618
Change-Id: I4f38b797f8f4978d00e92da07c3db8df366a6897
2022-04-07 14:01:16 +00:00
Shawn Lin
ddc1148737 [automerger skipped] Merge changes from topic "sb_height" into sc-v2-dev-plus-aosp am: 6f23b6d3ff -s ours
am skip reason: Merged-In I306efa187ffa69223c06fd248cfe57d183f96c59 with SHA-1 e901942281 is already in history

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

Change-Id: I2f3e61c9db5d63e6b9a8585d0c6229d906933d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 14:00:35 +00:00
Shawn Lin
a3c90b5bb6 [automerger skipped] Merge "[DO NOT MERGE] Fixed status bar glitch for apps that access internal res" into sc-v2-dev am: 88af43ac60 -s ours
am skip reason: Merged-In I306efa187ffa69223c06fd248cfe57d183f96c59 with SHA-1 df8300727f is already in history

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

Change-Id: I2af7da6434e6536b393cc109cd2e43559c27da46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 14:00:30 +00:00
shawnlin
a72c7d8bbb [automerger skipped] [automerged blank] [DO NOT MERGE] Fixed status bar glitch for apps that access internal res 2p: df8300727f am: 2bd1cdbf79 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3b016a65b7944eaaa63ddeaf7d1b516451f45781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 14:00:10 +00:00
Nathalie Le Clair
6a47166d50 Merge "cec: fix Traditional Chinese issue for Playback [1/1] BUG:183071276" am: f4c40e0b0b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566053

Change-Id: Idf5faed6c0587657203113b11caef8aeb4b056ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 13:53:49 +00:00
Robert Horvath
2d69b6d442 Merge "Consider all TV PiP stashing directions" into tm-dev 2022-04-07 13:42:21 +00:00
Shawn Lin
6f23b6d3ff Merge changes from topic "sb_height" into sc-v2-dev-plus-aosp
* changes:
  [automerged blank] [DO NOT MERGE] Fixed status bar glitch for apps that access internal res 2p: df8300727f
  [DO NOT MERGE] Fixed status bar glitch for apps that access internal res
2022-04-07 13:33:49 +00:00
Shawn Lin
88af43ac60 Merge "[DO NOT MERGE] Fixed status bar glitch for apps that access internal res" into sc-v2-dev 2022-04-07 13:33:49 +00:00
Miranda Kephart
333f81af88 Merge "Cast copied text to string before sending share intent" into tm-dev 2022-04-07 13:25:12 +00:00
Nathalie Le Clair
f4c40e0b0b Merge "cec: fix Traditional Chinese issue for Playback [1/1] BUG:183071276" 2022-04-07 13:23:52 +00:00
Luca Zuccarini
a58f3635a4 Merge "[ViewHierarchyAnimator] Remove all listeners at the end of an animation." into tm-dev 2022-04-07 13:05:04 +00:00
TreeHugger Robot
156ca21933 Merge "Supports multiple-display on activated mode recording." into tm-dev 2022-04-07 12:35:58 +00:00
TreeHugger Robot
608ff04417 Merge "Fixing not responsive tiles in split shade" into tm-dev 2022-04-07 11:50:28 +00:00
TreeHugger Robot
2bc6dae0b7 Merge "Add DISALLOW_CHANGE_WIFI_STATE user restriction" into tm-dev 2022-04-07 11:47:53 +00:00
Automerger Merge Worker
f1e9ff4e9a Merge "Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b9b am: 3caa3cf399 am: 2194a62f15" into tm-dev 2022-04-07 11:38:00 +00:00
Chiachang Wang
4319575deb Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b9b am: 3caa3cf399 am: 2194a62f15
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978249

Change-Id: I494bcbae0a8ba83d8950db060c8f0fb3447ed050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 11:37:31 +00:00
Chiachang Wang
3f5a343fea Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b9b am: 3caa3cf399 am: 2194a62f15
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978249

Change-Id: If09fe0cfa513efd6f61d45faa19ba98c2435c1a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 11:37:13 +00:00
Treehugger Robot
0b9d40af0f Merge "Add OWNERS for libcore perf tests" am: e8869375d9 am: 8cd8c8c8ec am: 70a2f0ce66
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2055912

Change-Id: I4db539126f620d3c83f52e01292bdd0ab4914519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 11:36:25 +00:00
Oli Lan
78c0c44cc0 Merge "Update default user icon colors." into tm-dev 2022-04-07 11:15:22 +00:00
Chiachang Wang
2194a62f15 Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b9b am: 3caa3cf399
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978249

Change-Id: I7d3a2631cd70a342e7f224fcd99ec8eb1e2c77d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 11:13:54 +00:00
Treehugger Robot
70a2f0ce66 Merge "Add OWNERS for libcore perf tests" am: e8869375d9 am: 8cd8c8c8ec
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2055912

Change-Id: I46736a2326bd68055bc5720e6efcf53640967e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 11:13:41 +00:00
Vania Desmonda
ec4b72b700 Enable feature flag to show "Turns on at bedtime" as a Schedule in Dark theme Settings page.
Bug: 218629025
Test: manual
Change-Id: I718c68f77f10015133e8b7a58ae3831ccf096ded
2022-04-07 10:50:25 +00:00
Riddle Hsu
35a7d444fd Merge "Remove meaningless ActivityStarter#mReuseTask" into tm-dev 2022-04-07 10:41:45 +00:00
Chiachang Wang
3caa3cf399 Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b9b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978249

Change-Id: I3595e032cff0b18959150139d9f84cb817784fb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 10:38:03 +00:00
Treehugger Robot
8cd8c8c8ec Merge "Add OWNERS for libcore perf tests" am: e8869375d9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2055912

Change-Id: Id83bc77af4bbac7e8eb970ccf7237971d0aea9ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 10:37:09 +00:00
Chiachang Wang
48160f9b9b Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" 2022-04-07 10:24:03 +00:00
Wenhao Wang
2a1adc793d Merge "Add command to require strong auth" am: de6f930c61 am: eea4573539 am: c42a8e8f44
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2056513

Change-Id: Ib92821e1363d38cca6554420b4fc534d4048d4f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 10:22:03 +00:00
Treehugger Robot
e8869375d9 Merge "Add OWNERS for libcore perf tests" 2022-04-07 10:20:31 +00:00
Jernej Virag
187a7d7d45 Merge "Don't trigger TextView relayouts if content doesn't change" into tm-dev 2022-04-07 09:43:01 +00:00
TreeHugger Robot
579f8a6234 Merge "Allowing SurfaceViewHost to show up in layout inspector" into tm-dev 2022-04-07 09:28:47 +00:00
Riddle Hsu
eda2165b91 Merge "Do not set report-orientation-changed for window without surface" into tm-dev 2022-04-07 08:47:27 +00:00
Riddle Hsu
a3348272e7 Merge "Pass background color from transition info to remote animation" into tm-dev 2022-04-07 08:41:17 +00:00
Selim Cinek
11c6bd077e Merge "Fixed an issue where notification launches were visually broken" into tm-dev 2022-04-07 08:37:52 +00:00
Luca Zuccarini
11d0f55753 [ViewHierarchyAnimator] Remove all listeners at the end of an animation.
Fixes: 228310296
Test: manual and unit tests
Change-Id: I3099ab440c7a219523df499834b3201ee072876a
2022-04-07 08:35:07 +00:00
Daniel Hsieh
b26c4316cb Supports multiple-display on activated mode recording.
In previous, we only use a variable to record the state of magnification
mode. Therefore, it would be confused when there are multiple displays.

Now, we use sparse array to keep the state of current magnification mode
and last magnification activated modes with corresponding displayId,
making us have ability to distinguish different modes in different
displayId.

Bug: 182227245
Test: atest MagnificationControllerTest
      atest MagnificationProcessorTest
      atest FullScreenMagnificationGestureHandlerTest
      atest MagnificationConfigTest
Change-Id: I239faab22bb6abe3e6cadde9b09eba496c4688c0
2022-04-07 08:17:35 +00:00
Riddle Hsu
d4e60a1b36 Remove meaningless ActivityStarter#mReuseTask
It was also assigned when reusing a cleared task. But the latest
only assign it from mInTask, which has lost it original purpose.

Add a explicit mIsTaskCleared for notifyActivityRestartAttempt.
The condition 'clearedTask' is removed because it was almost always
not satisfied.

Bug: 163976519
Test: WindowManagerServiceTests
Change-Id: I6e3cd10463cacc4aa7fb84a1f631c0179ea4e013
2022-04-07 16:12:33 +08:00
Wenhao Wang
c42a8e8f44 Merge "Add command to require strong auth" am: de6f930c61 am: eea4573539
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2056513

Change-Id: Ib2d8d5e89234a68e154d7b193f48a37712fb1903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 08:05:39 +00:00
Edgar Wang
194d7396e2 Merge "Update Spinner font and color" into tm-dev 2022-04-07 08:01:57 +00:00
Suprabh Shukla
04f3a36705 Merge "Deny SCHEDULE_EXACT_ALARM by default to newer apps" into tm-dev 2022-04-07 07:35:28 +00:00
Aseem Kumar
6ccb8cb405 Merge "Add expiration time to the response when token is returned from the cached. We only need to add expiration time for the custom tokens" into tm-dev 2022-04-07 07:21:11 +00:00