Commit Graph

834445 Commits

Author SHA1 Message Date
Evan Rosky
ef854fbdb9 Merge "Use transition for desktop-mode switch when enabled" into tm-qpr-dev am: d6c6f5865f am: ddf207959e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19973186

Change-Id: I2f3596acc2bcbd4cf94eb58750ddb5fe4cbb1d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:47:32 +00:00
Automerger Merge Worker
00db9419a7 Merge changes from topic "am-74b4885ebe3c49aea524226e5bda8731" into tm-qpr-dev-plus-aosp am: 436a274c4f -s ours
am skip reason: Merged-In Idf5a339a5fb0ffd510e7fda0e3784916c8505eae with SHA-1 1c36dbb35a is already in history

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

Change-Id: I5197cf6f4b81085e76b0a4bb217ff6116ed35d35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:47:01 +00:00
Lais Andrade
749db30555 [automerger skipped] Merge "Remove VibrationEffect javadocs to methods not available in public APIs." into tm-dev am: 40739d5379 -s ours am: 486bb250e5 -s ours am: 813b319154 -s ours am: 27a68b6ef8 -s ours
am skip reason: Merged-In Idf5a339a5fb0ffd510e7fda0e3784916c8505eae with SHA-1 55217bc20b is already in history

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

Change-Id: I1ad3090644d82bc95afb9e7c11335283202874ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:46:46 +00:00
Mady Mellor
bff0151a9e Merge "Expose getTaskInfo on TaskView" into tm-qpr-dev am: 63caeaf9fa am: b0b360041c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19661165

Change-Id: Ibe6cda2b54cb2f75a5b12ac3c24e59a418c2057e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:45:48 +00:00
Rasheed Lewis
a73def52d5 Merge "Replaced Data Saver Icons with Animation" into tm-qpr-dev am: 9ce67ba284 am: 21d1fc7c71
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18603255

Change-Id: I358e7cd0e371aa16e4bc3ef07c3adcdec6d9471c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:44:59 +00:00
Lais Andrade
a868c0b5ac [automerger skipped] Merge "Remove VibrationEffect javadocs to methods not available in public APIs." into tm-dev am: 40739d5379 am: 6c9ae0c881 am: 864d640e8d -s ours am: cf4855204f -s ours
am skip reason: Merged-In Idf5a339a5fb0ffd510e7fda0e3784916c8505eae with SHA-1 55217bc20b is already in history

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

Change-Id: Iff38166b57e074ba5bc6d3dc1754f5cc78f2fa3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:44:12 +00:00
Hawkwood Glazier
4d373e8791 [automerger skipped] Merge "[DO NOT MERGE] Resolve file inconsistencies between master and tm-qpr-dev" into tm-qpr-dev am: 60e003dd44 am: c6b0ab5a5f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic33e7bab00839db618a86c00336300a757059c0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:43:47 +00:00
Hawkwood Glazier
0faee1b195 [automerger skipped] [DO NOT MERGE] Resolve file inconsistencies between master and tm-qpr-dev am: 3140d3530c am: 4942e374bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib3ac966933c9add758eebd38ca0e5c01344efe4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:43:23 +00:00
Lucas Silva
5461c21563 Merge "Implement double shadow text view for dream complications" into tm-qpr-dev am: 7b4c3efca3 am: b1aef7daff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19970191

Change-Id: I576bf47881cabdafc10c13ab13cc2d2a547bdf3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:42:45 +00:00
Tiger Huang
2a7f7ed158 Merge changes Ibc2f40dd,I37fb8ffc into tm-qpr-dev am: dea70726f6 am: d95c3121b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19963144

Change-Id: I8c08856b1d5e20fef1175d2205e3f2dcc21af7cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:42:07 +00:00
Caitlin Shkuratov
60b03ef003 Merge "[SB Refactor] Delete ConnectivityInfoProcessor." into tm-qpr-dev am: 511de5c9af am: dfa40d2c34
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19970205

Change-Id: Iebb3ccdd6331f13489464cf13125697e8588be76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:40:54 +00:00
Caitlin Shkuratov
bb2c29b69e Merge "[Bluetooth] Convert BluetoothController logs to log buffer so we'll always have them." into tm-qpr-dev am: 33c9d7b2d2 am: 7eb41a4aab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969290

Change-Id: I384f851a876f1b97ce47a95a551d4089ec54de1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:39:59 +00:00
Automerger Merge Worker
e4a85d9f40 Merge "Merge "Disable freeze insets for non blast sync shell transition" into tm-qpr-dev am: d9e5e14cb8" into tm-qpr-dev-plus-aosp am: a3cb49b285
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19953145

Change-Id: I3a5a62a8f3fa71ff9dcf1a59fb6e36f0c8c6c6b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:38:58 +00:00
Treehugger Robot
7815cd1c99 Merge "Enable DISALLOW_DUPLICATE_FIELD_IN_SKELETON since U" am: 643e586072 am: de4ea8f38b am: e47e8ec3f6 am: 15390ccf1d am: 913f632490
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216581

Change-Id: I26336026ab0c7c92f4cbfe1c937be04fcf19d380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:37:50 +00:00
Mateusz Cicheński
52c5e16586 Merge "Mark touchable region of IME windows as unrestricted keep clear areas" into tm-qpr-dev am: 88f8b673d3 am: 678bb88d0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19971746

Change-Id: I8499d2f080bb91327894bc4de2c577ca039125dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:36:19 +00:00
Treehugger Robot
8f49373913 Merge "Clarify method names and improve debug" am: 1ab7ac7f56 am: 1d74b8207b am: a6a8219798 am: f1f8a7519c am: dd2eed7053
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2217306

Change-Id: I35466159e53b25b3b00c0b2afd540a265b43f482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:35:25 +00:00
Beverly Tai
19bba4a375 Merge "Wakeup display on taps before entering true AoD" into tm-qpr-dev am: 88deb41710 am: 79012b04a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969291

Change-Id: I8bd6497928d1455b0cd20feb10cdbf15037676aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:34:08 +00:00
Treehugger Robot
d124d13c86 Merge "Switch to source build of JavaPoet." am: af086389ff am: 287790cc9c am: a09f7b22a3 am: c26ef968e1 am: 3f4b7c90e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216685

Change-Id: I6c288aec1a09493b138c94db4795aa6d4b5d5c57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:32:44 +00:00
Mårten Kongstad
bb447e9a65 Merge "OMS: dump: silently ignore -a" am: 51f47d9bc1 am: 8dc97ba452 am: be5174e5f1 am: 6b33264e14 am: 0ba21f9c25
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2214727

Change-Id: I7ffd7de1ae0e2bcf21a4c99729630b601dcd167f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:30:26 +00:00
Tetiana Meronyk
169de3b9ea Merge "Align User Switcher with User Settings" into tm-qpr-dev am: 5e14ffaec6 am: 53dd479bb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19929708

Change-Id: Ib30a8b400d829021245d3d8e5f60eca80793148d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:28:28 +00:00
Linus Tufvesson
407854c62c [automerger skipped] Merge "Hide SAWs while LogAccessDialogActivity is visbile" into tm-qpr-dev am: ff37e2d652 am: 7232ac610b -s ours
am skip reason: Merged-In If46dd52b4717dfe433e256394311b097b19d6f6e with SHA-1 d63219a512 is already in history

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

Change-Id: I274f64151de40a24ee41d81c552f338c1062eb79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:27:12 +00:00
Benno Lin
8f3b5bc7e7 Merge "Create test app to emulate assistant UI." into tm-qpr-dev am: 4e330bd3fc am: 1d45f10c70
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19928112

Change-Id: Ibb49b564cab16af899e0c0f6069eab941ada79a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:25:42 +00:00
Steven Terrell
da54b2835e Merge changes from topic "cursor-bg-blink-cp" into tm-qpr-dev am: 131fb1ff89 am: b2eba6b95d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19955684

Change-Id: I61543684ba63c8a2aa9ee5c9e1b6f9df92d5d2a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:16:58 +00:00
Steven Terrell
6a2d5e3277 [automerger skipped] Stop cursor from blinking when not visible am: 4ec6dfc389 am: e23d904d4a -s ours
am skip reason: Merged-In Iad4396e5f7fd810344c711320d65c57ea25eda70 with SHA-1 941de7ed8f is already in history

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

Change-Id: I36fb9b3e1c603d4bee25229d6657a4e01d63d3eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:16:27 +00:00
TreeHugger Robot
f4540530f2 Merge "Add "UNKNOWN" for "allow in any condition" IWLAN handover example" 2022-09-17 07:27:48 +00:00
rambowang
14eef32cd3 Add "UNKNOWN" for "allow in any condition" IWLAN handover example
Bug 234095834 started to supported UNKNOWN in source of IWLAN
handover rules. While the rule syntax was added to include
"UNKNOWN" in source, the example in the same javadoc should
be updated as well to keep consistent.

Bug: 247170538
Test: m -j offline-sdk-docs
Change-Id: Ia566fc6f0e0fdc09cca963d298a1c44dcbee540a
2022-09-16 22:09:08 -05:00
George Chan
a7e6eb8627 Merge "Added transparency metadata feature flag." 2022-09-17 02:46:45 +00:00
Kelly Zhang
d3e8794f4b Merge "Enable static color scheme to support minimum sdk version to be 21." 2022-09-17 01:54:51 +00:00
TreeHugger Robot
a4466cc46c Merge "Added builder for SubscriptionInfo" 2022-09-17 01:08:31 +00:00
TreeHugger Robot
2aba2a128d Merge "Set elapsedRealtime if HAL doesn't set it" 2022-09-16 23:43:11 +00:00
Ryan Zuklie
3aeb8f4925 Merge "Export BatteryStats events to Atrace." 2022-09-16 23:07:49 +00:00
Jack Yu
9f6f23101c Added builder for SubscriptionInfo
Added the builder for SubscriptionInfo, and make all members
final. This can prevent other clients accidentally modifying
the same copy of SubscriptionInfo.

Also moved getAllAccessRules into getAccessRules.

Bug: 239607619
Bug: 247140269
Test: Manual + atest SubscriptionInfoTest
Change-Id: I8eb757960375c299f7770cbed27cd0fca8e33612
2022-09-16 16:00:18 -07:00
Evan Severson
888da4eeba Merge "Use delayed uid state update in AppOpsService" 2022-09-16 22:30:33 +00:00
Brett Chabot
2a402d2766 Merge "Fix input when hardware renderer drawing is disabled." 2022-09-16 22:26:02 +00:00
Chavi Weingarten
7d6d3cbd12 Merge "Create DMS wrapper around hidden SC APIs" 2022-09-16 22:22:17 +00:00
Sally Yuen
b99e9b0bb4 Merge "Add API warnings in AccessibilityManager" 2022-09-16 21:20:47 +00:00
Alec Mouri
172f625928 Merge "Revert^2 "Support alpha for SurfaceView"" 2022-09-16 20:23:57 +00:00
TreeHugger Robot
f19f32457c Merge "Add Android keycodes for stylus buttons" 2022-09-16 20:07:59 +00:00
George Chan
44a5976d81 Added transparency metadata feature flag.
This is for feature gating a feature expansion to App Info -> App Details to include MBAs on top of existing Playstore Apps.

Change-Id: I7b3e296c310f19a01bc83b129b95021e92df3abb
Bug: 244215932
2022-09-16 19:05:27 +00:00
Brett Chabot
32dfc98382 Fix input when hardware renderer drawing is disabled.
When drawing is disabled the window's layer won't have a valid buffer. This
causes surfaceflinger to set the window's touchableRegion to zero.
This commit sets a window crop when drawing is disabled, so surfaceflinger
set touchableregion from crop instead of buffer.
And it modifies LetterboxUiController to not reset the crop.

Test: cts and perf tests as documented in go/android-slimulator-dev-env
Bug: 229870984
Change-Id: I4d6ca513c3daf5818ded03eae00e551fc319ad69
2022-09-16 11:19:02 -07:00
TreeHugger Robot
5cb56048cb Merge "More minor improvements on users on secondary display APIs." 2022-09-16 18:13:19 +00:00
TreeHugger Robot
9a82381027 Merge "Add a way to disable non-wakeup alarm deferral." 2022-09-16 18:06:04 +00:00
TreeHugger Robot
cd019868ce Merge "Disallow OP_VIBRATE for suspended apps" 2022-09-16 18:02:39 +00:00
Alan Viverette
9bb4f2962b Merge "Revert "Intercept abnormal MotionEvent in GestureDetector#onTouc..."" 2022-09-16 17:57:06 +00:00
Sally
97640b600a Add API warnings in AccessibilityManager
Recommend that developers don't change UI or behavior based on
accessibility checks.

Bug: 235506503
Test: na
Change-Id: I8e8b712a484a2b6dabe0f6c657766a0c1e21c92d
2022-09-16 17:55:32 +00:00
Chavi Weingarten
1e8b7d543a Create DMS wrapper around hidden SC APIs
There are several places that are calling the SC display APIs that were
hidden. They are already protected in SF so all the processes using the
hidden APIs were running as shell. However, we want to remove the APIs
into SF since they create confusion and instead replace with calls to
system server. For now, route the SurfaceControl hidden API calls that
are not used by system server to call through to DMS via the new
MediaProjectionGlobal API.

This will ensure the callers have a release to migrate before we remove
the APIs.

This also partially reverts commit c4bf46c247.

Test: Apps using SurfaceControl hidden display APIs
Bug: 237664947
Change-Id: I859743cb8b10c0352a30280a610b13a4f44f34dc
2022-09-16 17:25:36 +00:00
Jeremy Meyer
8200d40609 Merge "Store frro configs in idmap file" 2022-09-16 16:53:05 +00:00
Evan Rosky
ddf207959e Merge "Use transition for desktop-mode switch when enabled" into tm-qpr-dev am: d6c6f5865f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19973186

Change-Id: I8e5b1c58353dcb546b3d4ed64696f26c957f3e02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 16:43:04 +00:00
Automerger Merge Worker
436a274c4f Merge changes from topic "am-74b4885ebe3c49aea524226e5bda8731" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Remove VibrationEffect javadocs to methods not available in public APIs." into tm-dev am: 40739d5379 -s ours am: 486bb250e5 -s ours am: 813b319154 -s ours
  [automerger skipped] Remove VibrationEffect javadocs to methods not available in public APIs. am: 1c36dbb35a -s ours am: 60a3635fee -s ours am: bc586013b4 -s ours
2022-09-16 16:42:58 +00:00
Lais Andrade
27a68b6ef8 [automerger skipped] Merge "Remove VibrationEffect javadocs to methods not available in public APIs." into tm-dev am: 40739d5379 -s ours am: 486bb250e5 -s ours am: 813b319154 -s ours
am skip reason: Merged-In Idf5a339a5fb0ffd510e7fda0e3784916c8505eae with SHA-1 55217bc20b is already in history

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

Change-Id: I23ae2590081e55c90a700dc9b827e8100c77306b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 16:42:34 +00:00