Commit Graph

129398 Commits

Author SHA1 Message Date
Chaohui Wang
27000f18aa Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 2f3132c132
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

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

Change-Id: I96a88c6ad033aef04e8c47a9f491167f9f88480d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 07:22:58 +00:00
Chaohui Wang
6a8c87c194 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: I800b807485952a0bc8cababa4b7664787acee356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 07:20:41 +00:00
Chaohui Wang
623f93a963 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: I24ef6e92b15ca3087752db52ed9244446a680aaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 07:20:25 +00:00
Chaohui Wang
2f3132c132 Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

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

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

Change-Id: I9edc0a5310147ad385df5e7fab30136fb01f94c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 07:00:16 +00:00
Chun-Ku Lin
0aea3ddb33 Fix AccessibilityHearingAidPreferenceControllerTest
**Root cause**
When adding a feature flag on showing different hearing aid page on
 click, the tests were not executed because they were marked as @Ignore.

In order to execute the test, we need to turn the feature flag off, so that the test run in the same scenario where the feature flag was not introduced.

Bug: 279082331
Test: atest AccessibilityHearingAidPreferenceControllerTest
Change-Id: If11ac40a7ea3926578992f7c0577e7cbb1bb3273
2023-06-02 06:47:38 +00:00
Chaohui Wang
122ba16792 Merge "Hide Show System on SPA version App languages" into udc-dev 2023-06-02 06:41:54 +00:00
Chaohui Wang
64d1cc6a13 Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426

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

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

Change-Id: Ie2e298e17a01dcb246c50610653855afa18d2018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 06:36:56 +00:00
Chaohui Wang
68995792c2 Merge "Fix padding issue on Scan QR code screen" into udc-dev 2023-06-02 05:52:16 +00:00
Chaohui Wang
a96e08ad5c Merge "Unify the strings for Erase eSIM / eUICC" into udc-qpr-dev am: 28300d5340 am: 4775a69214
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23510726

Change-Id: I73abb8dec94f34578ea087dd3d25e82fa751a9c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 05:51:10 +00:00
Chaohui Wang
4775a69214 Merge "Unify the strings for Erase eSIM / eUICC" into udc-qpr-dev am: 28300d5340
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23510726

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

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

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

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

Change-Id: I892da352fea5f362892c14b61e61a3b90a7ff4dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 05:06:45 +00:00
Jason Chiu
2225729ce2 Do not init dashboard categories when SetupWizard isn't finished yet
The generated category cache during SetupWizard flow is invalid.

Bug: 261885832
Test: manual
Change-Id: Id2108b2cc4ab557b086c4dbbd5dc7722c73e74d3
2023-06-02 04:55:20 +00:00
Treehugger Robot
3b13b37028 Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

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

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

Change-Id: I272844e63ff78dc9ef730c04b768ee2dc1634e73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 04:24:57 +00:00
Treehugger Robot
88a51ef8be Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

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

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

Change-Id: Iea9a8510ca11d9f8ae4bea20479c3ae8144507d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 04:24:41 +00:00
Treehugger Robot
47d3cfe635 Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev 2023-06-02 04:19:22 +00:00
Chaohui Wang
28300d5340 Merge "Unify the strings for Erase eSIM / eUICC" into udc-qpr-dev 2023-06-02 04:17:23 +00:00
Yanli Wan
7cc3625678 Merge "Update the string of Settings preference for device lock" into udc-dev 2023-06-02 03:52:00 +00:00
Chun-Ku Lin
c8c67d731f Fix ToggleScreenMagnificationPreferenceFragmentTest
- Prevent mocking ToggleScreenMagnificationPreferenceFragment for test
- Use Robolectric's way to launch the fragment so that the fragment
  contains necessary setup

**Root cause**
- We called onCreateView directly in the test without the necessary setup
  in onCreate, which causes the FooterPreferenceController not being
  initialized.
- We created a spyContext that returns a mock PackageManager, however,
  in the test execution, we didn't mock the context used by the fragment
  under test. Hence, the fragment didn't use the mock PackageManager in
  test.

Bug: 284209879
Test: atest ToggleScreenMagnificationPreferenceFragmentTest --iterations
5

Change-Id: I7e71a03177526f5bb0c20a58855a7dfdffc2a22f
2023-06-02 03:04:37 +00:00
Treehugger Robot
dc707da616 Merge "Fix resource leakage caused by cursor" am: 662ba59a47 am: 381ac521bd am: 2ccf9d9560 am: 8bae3a88a3 am: 8ee04c3503 am: 5893274b08
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608471

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

Change-Id: Ib0523add5d3a5b2961d0e5c42d7dfdad13e38459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 02:31:02 +00:00
TreeHugger Robot
e523ee97f3 [automerger skipped] Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e am: 07366fc787 -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: I2cf0be2335825ecb4f448b0b1db7aa1b92346fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 02:11:41 +00:00
TreeHugger Robot
df23aab9bf Merge "Default show LE audio toggle in Device Detail" into udc-d1-dev 2023-06-02 02:11:08 +00:00
YK Hung
439c0b0057 Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: 2bfdf17d69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: I5b72555272e415807732c18e636ff1f49c061178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 02:10:10 +00:00
Treehugger Robot
8517a41908 Merge "Prevent non-system IME from becoming device admin" 2023-06-02 02:09:02 +00:00
TreeHugger Robot
4d22ed26ff Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e am: 01360b3729
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324

Change-Id: Ia17423d04dd300569d950a309b9a6928f4f5cfa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 02:07:15 +00:00
Treehugger Robot
5893274b08 Merge "Fix resource leakage caused by cursor" am: 662ba59a47 am: 381ac521bd am: 2ccf9d9560 am: 8bae3a88a3 am: 8ee04c3503
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608471

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

Change-Id: Ia022e43707b71187ac98c2a9aea6d6f772cab162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 01:43:57 +00:00
TreeHugger Robot
07366fc787 Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324

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

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

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

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

Change-Id: I7a3133f83570a82bb5e87dd1096d5d47f85f3390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 01:22:21 +00:00
YK Hung
466e7c56b2 Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: I31562e4f787130bbb460030cc3cb7ad78604f21e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 01:22:04 +00:00
TreeHugger Robot
641d07244e Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev 2023-06-02 01:15:00 +00:00
Chun-Ku Lin
7a8602dce9 Set textDirection=locale and layoutDirection=locale for alert dialog
It's strongly recommended by internationalization team to set
android:textDirection="locale" and android:layoutDirection="locale" to
tackle a text that consists of RTL and LTR characters.

Bug: 279491415
Bug: 283608580
Bug: 283608637
Test: manual

Merged-In: I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841
Change-Id: I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841
(cherry picked from commit 219d4e6ca1)
2023-06-02 01:07:11 +00:00
Treehugger Robot
8ee04c3503 Merge "Fix resource leakage caused by cursor" am: 662ba59a47 am: 381ac521bd am: 2ccf9d9560 am: 8bae3a88a3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608471

Change-Id: Ic40dcd37c21585e0b02c8fbc4af6596d1d0c57d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 00:59:14 +00:00
YK Hung
bfc4637d09 Merge "Update incompatible charger checking rule" into udc-dev 2023-06-02 00:50:17 +00:00
Treehugger Robot
8bae3a88a3 Merge "Fix resource leakage caused by cursor" am: 662ba59a47 am: 381ac521bd am: 2ccf9d9560
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608471

Change-Id: Ib8122df16de9af8f26cb9f2d6d666cad9a27c482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 00:12:28 +00:00