Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
763,570 Commits 3 Branches 0 Tags
146a2e1a2f4df431a42800ea883f4a0d5e99cd5d
Commit Graph

763570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shawn Lin
146a2e1a2f Merge "Don't create unexpected display cutout or rounded corners" into tm-dev am: 17267e883a am: 3026c72f44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18179577

Change-Id: I30e7ad51936782f2ed029c5aa674e9585f86aef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:54:53 +00:00
TreeHugger Robot
c1dd3c2782 Merge "Attempt to fix LaunchAppShowImeOnStartTest" into tm-dev am: 0a6445f43b am: b4d6b2cd8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157813

Change-Id: I387f1543a09d521746495927764fee582584cc84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:54:36 +00:00
TreeHugger Robot
8cda0aa38c Merge "Updating TrustManagerService to react to keyguard visible changes." into tm-dev am: bd5592e65b am: b0075d1b1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18102036

Change-Id: I9ce9298441da726e69d054ea7429666a95b7feb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:54:26 +00:00
Vincent Wang
87306bd5db Merge "DO NOT MERGE: Fix Budget bakers wallet app's fingerprint icon doesn't line up with sensor" into tm-dev am: 021ef9a6f8 am: 7a450c60b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130745

Change-Id: Ibc20c065eaea2488940647844d70266a267a6985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:54:12 +00:00
Vincent Wang
ad34cc486e DO NOT MERGE: Fix Budget bakers wallet app's fingerprint icon doesn't line up with sensor am: 29f4d11428 am: fedde47d82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130745

Change-Id: I1e957616fe62d0aefe96cee717d1db6742cebf54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:54:10 +00:00
Dave Mankoff
bb8fce0b6a [automerger skipped] Merge "Remove Dependency#get calls from NavigationBarView" into tm-dev am: bd9fe6ce24 -s ours am: 90343a4299 -s ours 
am skip reason: Merged-In I956e943504966fcecfd3da477535937a2aba7a9d with SHA-1 c6999a6640 is already in history

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

Change-Id: Ia951565d709bb4cfc062a19160acaa988cbcd063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:53:56 +00:00
Dave Mankoff
1f16fd192d [automerger skipped] Remove Dependency#get calls from NavigationBarView am: ab0ee99c7b -s ours am: 8f062bd901 -s ours 
am skip reason: Merged-In I956e943504966fcecfd3da477535937a2aba7a9d with SHA-1 c6999a6640 is already in history

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

Change-Id: I09bdd07a64042a714c6adb1bd8f24fd32d632179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:53:54 +00:00
Jackal Guo
dfc7dbdb65 Merge "Fix dumping empty queriesPackages" into tm-dev am: dbd5719b68 am: 2e7d0bd1f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18178886

Change-Id: Icaedc9b47dd5673402c4711cc5c00fc0e3339370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:53:45 +00:00
TreeHugger Robot
c76e53c640 Merge "Rollback dropdown or inline suggestions when cancel fill dialog" into tm-dev am: d2c53f65f6 am: 59402af653 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17937857

Change-Id: Ib78efafdb3b2ef488a239d825ad2bd82547a9384
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:53:30 +00:00
Jerry Chang
7fb69a9993 Merge "Consider adjacent launch target when recycling an existing task" into tm-dev am: a5619e3ff3 am: ae770b3465 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17686876

Change-Id: I5bf91338178477146f6f1e91f542eff45a3be063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:52:00 +00:00
Avichal Rakesh
9dcb3dfa9c Merge "Ensure that two threads cannot simultaneously close SurfaceImage" into tm-dev am: 2a3064a28f am: e8bffd4dbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152523

Change-Id: I19cd299d2e4b303c2516b30a30514a982bb8d8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:50:37 +00:00
Jing Ji
a8a2da8686 Merge "Turn off the verbose logging in the AppBatteryTracker" into tm-dev am: abeb3828cb am: e615ba7f40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18181706

Change-Id: I7c61d5db7c292e21413120fd7b4c63b12c6970fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:50:25 +00:00
TreeHugger Robot
86b0c3e673 Merge "Camera: Propagate extension results in case of dropped frames" into tm-dev am: 4d2ae2655e am: 284657d0ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104867

Change-Id: Id93832728ee684631cf21d3e8bd1a7b198d6a84d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:50:12 +00:00
Peter Kalauskas
a432f655d6 Merge "Cache SHOW_MEDIA_ON_QUICK_SETTINGS" into tm-dev am: f944c4856f am: 76b22b3ee2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18151331

Change-Id: I338ce6dcd769e1c3b2503a9e2c9e746c27fe36b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:50:00 +00:00
TreeHugger Robot
74a7065a6d Merge "Fully migrate tv to notification permission" into tm-dev am: 3c59d6c155 am: 9f46c9e343 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18122121

Change-Id: I95437f35f737f31f6a76a3f0a60ed98c2231e2f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:49:39 +00:00
TreeHugger Robot
fb328a7166 Merge "Add traces of the size of HWUI shader cache in RAM" into tm-dev am: b8b3c2d6f3 am: 9719bb8970 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18149800

Change-Id: I99c514bc5efa493c267d5042110441a610bb53c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:49:27 +00:00
TreeHugger Robot
9da482ba58 Merge "Add tracepoints for monitoring HWUI's (persistent) ShaderCache" into tm-dev am: 78020a0196 am: 9c77cf5084 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18149799

Change-Id: I1a5bc59dee0d429c99615b337cea032016eea22c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:49:02 +00:00
Prabir Pradhan
e8075590ea Merge changes from topics "presubmit-am-e1ccffb4201944be9e638acb9f6f4dfc", "presubmit-am-e6236e948fb14688bc4afb3adb9e745b" into tm-dev am: dd2c72a65d am: 4601c17fe1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17351976

Change-Id: If72a483944f3be3a4c71328825f4fca8003db8ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:48:19 +00:00
Prabir Pradhan
57957c7c2e Make virtual input device creation synchronous am: eb2d1e65b5 am: 785a118f1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17475784

Change-Id: Iffc09edf2c82b278390ffb8fe976c26712d33ee0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:48:16 +00:00
Miranda Kephart
80567740bf Merge "Hide sensitive clipboard content" into tm-dev am: f87bf04abd am: f912bc1851 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17891363

Change-Id: Iecf84f3fd33dedf7e661094d2252c2e54b2a954e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:47:36 +00:00
Dave Mankoff
3571174d39 [automerger skipped] Merge "Remove Dependency#get calls from NavigationBarView" into tm-d1-dev am: 2b7d70be22 -s ours 
am skip reason: Merged-In I956e943504966fcecfd3da477535937a2aba7a9d with SHA-1 940433e0b4 is already in history

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

Change-Id: I539cdc57225db4e74b9091c4e46b5f25808422ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:47:21 +00:00
Dave Mankoff
225d16ae03 [automerger skipped] Remove Dependency#get calls from NavigationBarView am: c6999a6640 -s ours 
am skip reason: Merged-In I956e943504966fcecfd3da477535937a2aba7a9d with SHA-1 940433e0b4 is already in history

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

Change-Id: I12a3ce3047938204a5600be8470dc43a1f0d4e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:47:19 +00:00
Matt Pietal
5f3a566e7b Merge "Revert "Revert "Clocks were switching too frequently""" into tm-dev am: 0aa4fa442c am: bd588d165c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185203

Change-Id: I1b2be45e1d533a0f3c059e6846caea1ab8e2933b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:46:39 +00:00
Edgar Arriaga García
c0b21eb94c Merge "Revert "Resend remaining VMAs on partial compaction due to failure"" into tm-dev am: 118798375d am: bd287e8ea3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18174406

Change-Id: I54ce28df5a71b29e2de2028651c2515cf2989130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:46:00 +00:00
Grace Jia
1e849171da Merge "Add USER_MISSED_NEVER_RANG to cover the case for call reported as miss even before it get the chance to ring." into tm-dev am: 28232fc90e am: 2888ffd052 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17968712

Change-Id: Iba4029219e356174a071a4f8007e21533ac517b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:45:00 +00:00
TreeHugger Robot
6f5f323f7d Merge "[Fgs Manager] Increase contrast between text and background" into tm-dev am: f81c41aaee am: cf8d94aa9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18150832

Change-Id: I11d6c29cfd4d40f21a0cd10e30f6b66c104e7592
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:44:47 +00:00
Jacqueline Bronger
091eb24c8c Merge "Close the TV PiP menu when losing window focus." into tm-dev am: 3448bcdbfc am: 2f17d91075 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18179543

Change-Id: Ibee181773c7ec0e0a417bcd565493298e3b4d7d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:44:34 +00:00
Alexander Roederer
3e24956557 Merge "Adds explanation of MessagingStyle fields" into tm-dev am: d7356c9e08 am: 9d1e6d5493 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18008166

Change-Id: Ie010c99cb8194b2620584ac7662860d439d421a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:44:23 +00:00
TreeHugger Robot
e6c8cb8548 Merge "Don't prepare in-window animations if leaveKeyguardOpenOnHide." into tm-dev am: 6cd395206c am: e81cf38c6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18169506

Change-Id: I16d48ad2d1985477ae99387182eb1c7bf2c705b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:44:10 +00:00
Evan Severson
f9a58d889d Merge "Make the authentication requirement configurable for toggles" into tm-dev am: 7935bf8b27 am: 2f067d2f62 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17769812

Change-Id: I6b5deca27bc01816cc6e09a164a3440b01394c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:43:48 +00:00
Ahaan Ugale
a388f84abc Merge "Fix Autofill dialog does not work" into tm-dev am: f58911cf35 am: 6500b2efc4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17775843

Change-Id: I986d1a13099e5d0533e7543695bcd7789292309e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:43:25 +00:00
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