Commit Graph

763455 Commits

Author SHA1 Message Date
Chavi Weingarten
55d0efa95a Merge "Don't request sync again for reparented WC" into tm-dev am: 7b0ceb4ff1 am: 7481dcbbab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18148567

Change-Id: I149724081dfd50ae8d4a65ec01951772d0a7c9a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:43:00 +00:00
Robert Wu
de6a8247c5 Merge "MidiService: Fix USB removeDeviceConnection" into tm-dev am: 5fa99c336c am: c0edca9399
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18169657

Change-Id: I3e6f3166a31cb44e210d023743126bdd77441989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:42:48 +00:00
Robert Horvath
faa548f4af Merge "Dismiss TV PiP when app op OP_PICTURE_IN_PICTURE is revoked" into tm-dev am: 7bea00698c am: 6b5a11cf3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907962

Change-Id: Ie365eacc179eab5cd579bb7bdafa25be4ed95120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:42:34 +00:00
Aaron Liu
451484ac5f Merge "[Bouncer] Match spec for pattern view." into tm-dev am: e87d18f780 am: 05a16d4af8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18169303

Change-Id: I7460385e51291b644064043f8498e94e996ea8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:42:13 +00:00
Aaron Liu
d09b31eaa4 Merge "[Bouncer] Force bouncer into portrait mode." into tm-dev am: b560e960bc am: 4588524a5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18077199

Change-Id: I117d034f0d4fc9e54327b9f02b6bdeafffa7b89c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:41:59 +00:00
Rob Carr
dda57ab123 Merge "ViewRootImpl/SurfaceView: Listen for queue stalls" into tm-dev am: 7a0ee72bff am: f371225580
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17778270

Change-Id: I5c45dcd148e8dd97346433be70c10ba3fe52f627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:41:46 +00:00
Rob Carr
fe7932e71e Merge "SurfaceView: Fix overlocking of mSurfaceLock" into tm-dev am: ec6577d13e am: 3d3692b21d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17808703

Change-Id: I732885cf4600f5e3a71e5d783e0aa840aa108ba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:41:31 +00:00
Caitlin Cassidy
2e3a252ff0 Merge "[Media] Add some tests in ResumeMediaBrowserTest to ensure we're disconnecting old browsers." into tm-dev am: 5630265c02 am: 37b4779314
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144865

Change-Id: I6df3bdfdb0d61b53a3e8ff98b545a7a3ce4f5f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:41:21 +00:00
Josh Tsuji
f9d664e029 Merge "Unocclude immediately so that the surface animation is visible." into tm-dev am: aa9e92c1a0 am: 2f6acab1da
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18169504

Change-Id: Ieed0d58a6b2afa03e047aff2f666eaabd0aaa5c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:41:09 +00:00
Samiul Islam
43be403330 Merge "Disallow external storage access without restricting other api calls" into tm-dev am: 5f0c868b6a am: c545627a16
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17940795

Change-Id: I4a63904db958fc3222402ce2b8656cec19e33e61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:40:58 +00:00
TreeHugger Robot
f22ab3d69b Merge "[Panlingual] Add a flag to control opt-in/out" into tm-dev am: aaf912305b am: 4219739b2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18161842

Change-Id: If9a7264ad2373f9acb9e67cb7ef2ed20e516620b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:40:30 +00:00
Prabir Pradhan
ba0300d6b6 Merge "IMS: Intialize static association map before initializing native service" into tm-dev am: fb2c1de5b7 am: 16845bff63
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185202

Change-Id: Id247ef000d20f48dd976582893b92152b879b28c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:40:18 +00:00
Julia Reynolds
8b44e0c298 Merge "Revert "Clocks were switching too frequently"" into tm-dev am: 203d94b1fa am: e10ae3cd31
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18178894

Change-Id: I0fd049297b7594af7f7c7549e5f10b9091826610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:40:06 +00:00
TreeHugger Robot
0fc12fd609 Merge "Update wallet tile secondary label." into tm-dev am: 8ec931fd44 am: 8c9e554436
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18127905

Change-Id: Id80ec9aac412c83618ff53162fb982df654f041c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:39:52 +00:00
Issei Suzuki
ab569bcef3 Merge "Suppress app transition while recents is running" into tm-dev am: 0d83eb099d am: 48fd600e17
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18140343

Change-Id: If7fc42f59a1ea05b017fd2033b4b105a6c1295b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:39:38 +00:00
TreeHugger Robot
29089f7185 Merge "Add accessibility action menu items for divider" into tm-dev am: 55dd1c3792 am: 8701caa278
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18155923

Change-Id: Iac16501b6bc77beea61df8596bac04b7726a61c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:39:32 +00:00
Michał Brzeziński
9f08e0ba9e Merge "Adjust QS side spacing in split shade according to specs" into tm-dev am: eb08799ad3 am: 59efb31209
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17658388

Change-Id: I5eaa0caed89955f98acb10f494ed51ab20eb53ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:35:51 +00:00
Charles Chen
cc0d3b8e42 Merge "[conflict] Merge "Use current user Context to generate NavBar layout" into tm-dev am: a7abdb12df am: 1a1349553f" into tm-qpr-dev 2022-05-06 15:27:50 +00:00
TreeHugger Robot
5b3c330195 Merge "Implement backup & restore for the device state based auto rotation setting" into tm-qpr-dev 2022-05-06 14:00:47 +00:00
TreeHugger Robot
86c9d56dc2 Merge "Update renderer surface if rotation is changed" into tm-qpr-dev 2022-05-06 13:58:05 +00:00
Matt Pietal
c6e714a962 Revert "Revert "Clocks were switching too frequently""
This reverts commit 1ab0ed29e4.

Reason for revert: Fixed

Change-Id: I7baacba6dced16bdcaecb0edec14e7fbcb5d4b30
(cherry picked from commit 6347dec97b)
2022-05-06 12:16:21 +00:00
Christian Göllner
c562b38cdc Implement backup & restore for the device state based auto rotation setting
- Adds the setting to DeviceSpecificSettings so that it is only restored on the same device
- Prevents the non-device state based setting to be restored if device stated based settings are enabled

Fixes: 196933725
Test: atest SettingsHelperTest
Change-Id: I58163cb70e8136104370ae7c1cdaaa8b7124b853
2022-05-06 12:06:35 +00:00
TreeHugger Robot
baf76a1173 Merge "Simplify dock setup state setting" into tm-qpr-dev 2022-05-05 17:46:04 +00:00
Chavi Weingarten
7481dcbbab Merge "Don't request sync again for reparented WC" into tm-dev am: 7b0ceb4ff1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18148567

Change-Id: Iafb87808349dc088f4d3f6763d60e4c25110ead4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 16:56:17 +00:00
Robert Wu
c0edca9399 Merge "MidiService: Fix USB removeDeviceConnection" into tm-dev am: 5fa99c336c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18169657

Change-Id: I78c836e09424f414ccda4aaa6c61c86a9c0f2b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 16:55:57 +00:00
Robert Horvath
6b5a11cf3e Merge "Dismiss TV PiP when app op OP_PICTURE_IN_PICTURE is revoked" into tm-dev am: 7bea00698c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907962

Change-Id: Id068a631149212aac3ffe10989bbf41a6cf85b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 16:55:29 +00:00
Chavi Weingarten
7b0ceb4ff1 Merge "Don't request sync again for reparented WC" into tm-dev 2022-05-05 16:10:38 +00:00
Robert Wu
5fa99c336c Merge "MidiService: Fix USB removeDeviceConnection" into tm-dev 2022-05-05 16:07:31 +00:00
Robert Horvath
7bea00698c Merge "Dismiss TV PiP when app op OP_PICTURE_IN_PICTURE is revoked" into tm-dev 2022-05-05 16:03:31 +00:00
Aaron Liu
05a16d4af8 Merge "[Bouncer] Match spec for pattern view." into tm-dev am: e87d18f780
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18169303

Change-Id: I905eaf4e7be25471c65caa248fd2ecbdef66b99d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 15:27:59 +00:00
Aaron Liu
4588524a5c Merge "[Bouncer] Force bouncer into portrait mode." into tm-dev am: b560e960bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18077199

Change-Id: I2829fe348c61a22360e45da8ce03d90b376dad12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 15:27:42 +00:00
Rob Carr
f371225580 Merge "ViewRootImpl/SurfaceView: Listen for queue stalls" into tm-dev am: 7a0ee72bff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17778270

Change-Id: Ic310d8a40d500494249932655534bb97e4256753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 15:27:22 +00:00
Rob Carr
3d3692b21d Merge "SurfaceView: Fix overlocking of mSurfaceLock" into tm-dev am: ec6577d13e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17808703

Change-Id: I6a5e4b0e613d3bfa418453defa5cd9bcc4b35aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 15:26:54 +00:00
Aaron Liu
e87d18f780 Merge "[Bouncer] Match spec for pattern view." into tm-dev 2022-05-05 15:13:01 +00:00
Aaron Liu
b560e960bc Merge "[Bouncer] Force bouncer into portrait mode." into tm-dev 2022-05-05 15:12:58 +00:00
Rob Carr
7a0ee72bff Merge "ViewRootImpl/SurfaceView: Listen for queue stalls" into tm-dev 2022-05-05 15:11:39 +00:00
Rob Carr
ec6577d13e Merge "SurfaceView: Fix overlocking of mSurfaceLock" into tm-dev 2022-05-05 15:09:15 +00:00
Caitlin Cassidy
37b4779314 Merge "[Media] Add some tests in ResumeMediaBrowserTest to ensure we're disconnecting old browsers." into tm-dev am: 5630265c02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144865

Change-Id: I70fe328a292ebdda70dd8e5fe73eafe9a9257c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 15:00:53 +00:00
Josh Tsuji
2f6acab1da Merge "Unocclude immediately so that the surface animation is visible." into tm-dev am: aa9e92c1a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18169504

Change-Id: Ibb102ae5fad0db13ba3b2d3537b05d668545a066
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 15:00:19 +00:00
Caitlin Cassidy
5630265c02 Merge "[Media] Add some tests in ResumeMediaBrowserTest to ensure we're disconnecting old browsers." into tm-dev 2022-05-05 14:38:52 +00:00
Josh Tsuji
aa9e92c1a0 Merge "Unocclude immediately so that the surface animation is visible." into tm-dev 2022-05-05 14:25:03 +00:00
Samiul Islam
c545627a16 Merge "Disallow external storage access without restricting other api calls" into tm-dev am: 5f0c868b6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17940795

Change-Id: I62f42122279fcbef58d144b05104baa2534f493c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 13:44:34 +00:00
Samiul Islam
5f0c868b6a Merge "Disallow external storage access without restricting other api calls" into tm-dev 2022-05-05 13:39:34 +00:00
TreeHugger Robot
4219739b2b Merge "[Panlingual] Add a flag to control opt-in/out" into tm-dev am: aaf912305b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18161842

Change-Id: I0a951bc0b4cf77d490e18999232a5677db38c180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 13:27:09 +00:00
Prabir Pradhan
16845bff63 Merge "IMS: Intialize static association map before initializing native service" into tm-dev am: fb2c1de5b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185202

Change-Id: Id577a9e84998e8d80077a5492abf2754bbacc187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 13:26:53 +00:00
Julia Reynolds
e10ae3cd31 Merge "Revert "Clocks were switching too frequently"" into tm-dev am: 203d94b1fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18178894

Change-Id: I1a267e797e1f5ebeac95e4b8451e90520f059a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 13:26:42 +00:00
TreeHugger Robot
aaf912305b Merge "[Panlingual] Add a flag to control opt-in/out" into tm-dev 2022-05-05 13:25:42 +00:00
Prabir Pradhan
fb2c1de5b7 Merge "IMS: Intialize static association map before initializing native service" into tm-dev 2022-05-05 13:06:27 +00:00
Julia Reynolds
203d94b1fa Merge "Revert "Clocks were switching too frequently"" into tm-dev 2022-05-05 12:57:05 +00:00
TreeHugger Robot
8c9e554436 Merge "Update wallet tile secondary label." into tm-dev am: 8ec931fd44
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18127905

Change-Id: I978ef10910cb84f4134d5969e3a26b651228f920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 12:41:12 +00:00