Commit Graph

129359 Commits

Author SHA1 Message Date
Chun-Ku Lin
c7cd3783ba Fix ToggleFeaturePreferenceFragmentTest#setupFragment_getExpectedPreferenceScreenResId
**Root cause**
Robolectric doesn't like to launch a spy'ed fragment. You will get an
error like java.lang.IllegalStateException: Can't access ViewModels from detached fragment

Since the test itself doesn't require launch a fragment, I removed the
setup part and renamed the test.

Bug: 279082331
Test: atest ToggleFeaturePreferenceFragmentTest
Change-Id: Iafc431fd8c9cf7812ea99164e5e85683f3e0c121
2023-06-02 22:52:13 +00:00
Chaohui Wang
aeb630b1f5 Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 2f3132c132 am: 27000f18aa am: 6186231aa9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: Id95986075fffe9b5ea74188e942138b3db46ee21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 19:42:15 +00:00
Chaohui Wang
05f1ec0685 Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2 am: 64d1cc6a13 am: 5ba8511fc7 am: a310e7235d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426

Change-Id: I29a78c5bfeb2f388534dda31024c421c153f4a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 19:42:06 +00:00
Chaohui Wang
498acf1628 Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 3916082b8a am: 6a8c87c194 am: e334639a8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: I0a91d10f602ecdbe59674586acfe232316b06a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 19:41:39 +00:00
Chaohui Wang
dd4c639517 Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2 am: 129e80c7d8 am: 623f93a963 am: d6819273ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426

Change-Id: I118be416c46f4b322f6765a5de6ede84b5bf3f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 19:41:30 +00:00
Treehugger Robot
7f3fd90d15 Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 3b13b37028 am: 0339f763b9 am: 425c4da7d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: I0a5ad0e04318769d7ff78ffaa899f66ffbca6a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 19:41:20 +00:00
Yanli Wan
11d3da27c0 Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678 am: 4764e9a4da am: 41b7cb56c7 am: 1d471854ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457

Change-Id: I1e1b12579cef140684f1eca223541494a2253d67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 19:41:13 +00:00
Treehugger Robot
7ea0951b61 Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 91737c0b3b am: da647c56cf am: 73147518c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: Ic0b2ebd6342c6ca11fe16e70afde3c61c79c4b34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 19:41:05 +00:00
Yanli Wan
d4276a8a12 Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678 am: f120e3d563 am: c7ba6daae6 am: cdffe9016b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457

Change-Id: I055bfef3a63b6b848662b548c684fd2bd8c4e7ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 19:40:57 +00:00
TreeHugger Robot
f3dc050a3a Merge "Default show LE audio toggle in Device Detail" into udc-d1-dev am: df23aab9bf am: f2e08c31a5 am: 1b59061046
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486040

Change-Id: I6613e5c5ba5937d782af96220588061091f75637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 19:40:47 +00:00
TreeHugger Robot
cddd329f80 Merge "Fix ToggleScreenMagnificationPreferenceFragmentTest" 2023-06-02 19:39:07 +00:00
TreeHugger Robot
f58dccad49 [automerger skipped] Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e am: 07366fc787 -s ours am: e523ee97f3 -s ours am: d286605885 -s ours
am skip reason: Merged-In I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841 with SHA-1 7a8602dce9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324

Change-Id: Ic443ca027b87d8864ce4f5d5855144f31d8cc53a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 19:34:06 +00:00
YK Hung
ec8690deed Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: 2bfdf17d69 am: 439c0b0057 am: 0441e7a70d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: If95d73a1a59fdfdc7552b8fae7599dddb7fe5baa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 19:27:18 +00:00
TreeHugger Robot
94322a289b [automerger skipped] Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e am: 01360b3729 am: 4d22ed26ff -s ours am: 0c91d2948e -s ours
am skip reason: Merged-In I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841 with SHA-1 7a8602dce9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324

Change-Id: I56ef29a811f76ae93f9e8ca314ea6604251bf653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 19:27:07 +00:00
YK Hung
ac94084be6 Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: 4eabcdea6d am: 9ec0a502ac am: 5ceb227f59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: I4590f3b406299ce78f9ed7c5e3e7d1863272dc53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 19:11:29 +00:00
Jason Chiu
312088859d Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: 809d641517
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247

Change-Id: Id5ae9644d58f4f0fac157e9cd3518189e0133b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 18:52:13 +00:00
Jason Chiu
a655b96c28 Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: a8142278e9 am: d48ba61155 am: 3812b37db7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247

Change-Id: Icfcbba42c812f93f7ee960f7f4aa46ba1d337c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 18:28:38 +00:00
Chaohui Wang
2eb4c7400f Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 3916082b8a am: d9efea9f79 am: 7804e5a59c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: I435128614cb5f80755cbc223c997d999f1aebd40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 18:11:21 +00:00
Chaohui Wang
4ac5fb616b Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2 am: 129e80c7d8 am: 317ca924a0 am: cbb127a4e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426

Change-Id: I877ab9d59455f29f980342e61713b178cb224b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 18:11:10 +00:00
Treehugger Robot
703523a375 Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 91737c0b3b am: d19f4f85fd am: 5a718028b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: I4cc6017dca94c1d50f048e41e96f2a425fabf928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 18:11:03 +00:00
Yanli Wan
2d37b582cd Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678 am: f120e3d563 am: d3516aa5d0 am: 859df29cf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457

Change-Id: Id94acad7703cb28f200f950539d8ba0e66b7b21a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 18:10:54 +00:00
TreeHugger Robot
b4409c9bf3 Merge "Default show LE audio toggle in Device Detail" into udc-d1-dev am: df23aab9bf am: aac695129e am: 374aefc2d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486040

Change-Id: I5c6a6d3c6b3698c07585e06c00073e7c7c76e19a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 18:10:46 +00:00
TreeHugger Robot
25b154d2ea [automerger skipped] Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e am: 01360b3729 am: 800256a4c7 am: 0663defcd3 -s ours
am skip reason: Merged-In I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841 with SHA-1 7a8602dce9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324

Change-Id: I9a96122b62491014b0af7962e84ea51cadba53c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 18:10:37 +00:00
Chaohui Wang
14f7f6c818 Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 3f05e59982
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: I0837bd1fd686f4d77c148a2405fe5ae8a644ac99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 18:04:47 +00:00
Treehugger Robot
249107bc45 Merge "Fix AccessibilityHearingAidPreferenceControllerTest" 2023-06-02 17:48:23 +00:00
Chaohui Wang
6186231aa9 Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 2f3132c132 am: 27000f18aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: I19477cb7eeef63d2a9d027cf373295100c0c010f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 17:46:02 +00:00
Chaohui Wang
a310e7235d Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2 am: 64d1cc6a13 am: 5ba8511fc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426

Change-Id: I4a3aaeeccc8f00536aaaee57d2d1941e1816c0ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 17:45:50 +00:00
Chaohui Wang
e334639a8d Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 3916082b8a am: 6a8c87c194
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: I2eddb5749e516e0ce2cbf73ec9469a7ab53b62a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 17:45:19 +00:00
Chaohui Wang
d6819273ca Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2 am: 129e80c7d8 am: 623f93a963
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426

Change-Id: I21125bdcaa1ff6b6b90dc3692f08021efec5896e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 17:45:07 +00:00
Treehugger Robot
425c4da7d2 Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 3b13b37028 am: 0339f763b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: Ie34377a0e1a0a64316e332d1cf3bd499eaa31097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 17:45:00 +00:00
Yanli Wan
1d471854ed Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678 am: 4764e9a4da am: 41b7cb56c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457

Change-Id: I962e90adab7d3b7907b60792e3f58e36d8e8a23f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 17:44:50 +00:00
Treehugger Robot
73147518c9 Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 91737c0b3b am: da647c56cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: I698ef6a1545d96394c7031d188e975aa06ccd27c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 17:44:41 +00:00
Yanli Wan
cdffe9016b Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678 am: f120e3d563 am: c7ba6daae6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457

Change-Id: Ie4bf3dc092e64cdf6777544866c7cd1a08fad6d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 17:44:33 +00:00
TreeHugger Robot
1b59061046 Merge "Default show LE audio toggle in Device Detail" into udc-d1-dev am: df23aab9bf am: f2e08c31a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486040

Change-Id: I3d54d75cb4163cdfd36fb4fdd5f955953ea13619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 17:44:22 +00:00
TreeHugger Robot
d286605885 [automerger skipped] Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e am: 07366fc787 -s ours am: e523ee97f3 -s ours
am skip reason: Merged-In I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841 with SHA-1 7a8602dce9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324

Change-Id: I720b5bda9dead7b447583f98e33d055da9d9542b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 17:44:14 +00:00
YK Hung
0441e7a70d Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: 2bfdf17d69 am: 439c0b0057
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: Iacc6b876579d3b22b90be5fdf3ca634e00c51c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 17:09:06 +00:00
TreeHugger Robot
0c91d2948e [automerger skipped] Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e am: 01360b3729 am: 4d22ed26ff -s ours
am skip reason: Merged-In I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841 with SHA-1 7a8602dce9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324

Change-Id: Iba9a25b829a1b3a22aa41801279c593f01ee1d05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 17:08:55 +00:00
YK Hung
5ceb227f59 Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: 4eabcdea6d am: 9ec0a502ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: Ic98d4c1d3d945b669725abdda95b8668c15232d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 17:02:00 +00:00
YK Hung
7e0dab25a9 Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: 4eabcdea6d am: 6f892d206b am: 748a9d228f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: Ia69a096a12861d0fb97e293e46b6dfe823d9f6f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 16:51:12 +00:00
Jason Chiu
3812b37db7 Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: a8142278e9 am: d48ba61155
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247

Change-Id: I068fb33918911b727b529dd80db9f7f138c17b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 16:40:13 +00:00
Chaohui Wang
7804e5a59c Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 3916082b8a am: d9efea9f79
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: Ia0eed492961c046e1e3a0c6e531d4ddd9af10880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 16:25:18 +00:00
Chaohui Wang
cbb127a4e5 Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2 am: 129e80c7d8 am: 317ca924a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426

Change-Id: Ic66add1ebadccd7d86a842f6dd42a2f1332fbf68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 16:25:09 +00:00
Treehugger Robot
5a718028b0 Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 91737c0b3b am: d19f4f85fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: I748f8989347cc703c941e6bb41008f22e70d7627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 16:25:02 +00:00
Yanli Wan
859df29cf0 Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678 am: f120e3d563 am: d3516aa5d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457

Change-Id: Ibf748080f7c2f753e7156831b0d15c156367dcdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 16:24:55 +00:00
TreeHugger Robot
374aefc2d7 Merge "Default show LE audio toggle in Device Detail" into udc-d1-dev am: df23aab9bf am: aac695129e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486040

Change-Id: I559c2dc8f9ba35a434d58551c33f6b10eec1d4c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 16:24:46 +00:00
TreeHugger Robot
0663defcd3 Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e am: 01360b3729 am: 800256a4c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324

Change-Id: I28b4583ff719cd6d5064b405917f8c392e821ad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 16:24:39 +00:00
YK Hung
748a9d228f Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: 4eabcdea6d am: 6f892d206b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: I836fd07341a8817fd2d267f4aed049b345e2469e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 16:19:49 +00:00
Jason Chiu
d48ba61155 Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: a8142278e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247

Change-Id: I0b0a3ae052e682bef38eb55c72fce82c3072a209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 15:58:22 +00:00
Chaohui Wang
d9efea9f79 Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 3916082b8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: I51a7c6cf0387b9dbe8a470a8aa2afa5b5695745f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 15:56:53 +00:00
Chaohui Wang
317ca924a0 Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2 am: 129e80c7d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426

Change-Id: I11733e5f2be96e9ac6fc5278d45fa58b5f5e44c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 15:56:46 +00:00