Yanli Wan
23560717c4
Update the string of Settings preference for device lock
...
Bug: 282040794
Test: build & test locally
Change-Id: Ic9139c061b8cbea08bf74d0462420bf3157c4477
2023-06-01 22:57:48 +00:00
Weng Su
ef81179538
Skip Wi-Fi hotspot in Settings Widgets
...
- Do not show Wi-Fi hotspots in Settings Widgets if the config is not set to show
Bug: 275268676
Test: Manual test
atest -c CreateShortcutPreferenceControllerTest
Change-Id: I5d86a78c9d48c9b63faff50d46f1254dbefd94cf
2023-06-02 04:54:59 +08:00
Justin Gross
d96911734c
Enable vendors to add preference controllers in mobile network settings
...
Implement AbstractSubscriptionPreferenceController so that vendor code
can add preference controllers to MobileNetworkSettings.
Bug: 280323952
Test: manual
Change-Id: I6b1916d8956ebd4163958155a448e7fb27942951
2023-06-01 20:33:23 +00:00
Pavel Grafov
fb15f59582
Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320
Change-Id: Id36ddfac67a9d2f4c8caf886e1db283f6aba4fe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 16:01:34 +00:00
Pavel Grafov
8e13abebc0
Merge "Avoid double quiet mode requests" into udc-dev
2023-06-01 15:31:13 +00:00
Chaohui Wang
9ab4ef224e
Hide Show System on SPA version App languages
...
To align with non-SPA version.
Fix: 285264906
Test: Visual check on App languages
Change-Id: I7f8b0aec0e33fcb46939075458a8b0a710fac640
2023-06-01 09:20:42 +00:00
Jason Chiu
2560c0df9b
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-01 16:07:53 +08:00
TreeHugger Robot
ee4a8af972
Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222
Change-Id: I8c6a3d9dfa2c4b19f618fc23442a11a1a4dbd822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 05:02:55 +00:00
ykhung
e2f19b7de9
Update incompatible charger checking rule
...
Bug: 278316711
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I8f720bcdf7c0efabc8278913ccf1c0427c857fac
2023-06-01 12:50:47 +08:00
TreeHugger Robot
f65da39f37
Merge "Fix TetherSettings crash issue" into udc-dev
2023-06-01 03:11:20 +00:00
TreeHugger Robot
4e65ffbd96
Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100
Change-Id: I44db076e1a03d58e69d1311da4cc6ecbc74830f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 22:34:45 +00:00
TreeHugger Robot
2484fa72d6
Merge "Add more search terms for WPP" into udc-dev
2023-05-31 22:02:49 +00:00
TreeHugger Robot
f0c36d834b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 672ba73070
-s ours am: d26db6ce5a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: I429ec06ae448b7ac086f429cb7422196f30d8479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:50:57 +00:00
Bill Yi
3833dde43a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c
-s ours am: 16f5f3cf3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: I6c07ec7899fa36f025ad7ff5608c08cf09b4a296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:50:54 +00:00
Bill Yi
8be8a453bf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9d26cfdce
-s ours am: 58162acd2e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467653
Change-Id: I3d00119e99f9c39f6e7beaf3f7d5e5a14d28c593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:50:25 +00:00
TreeHugger Robot
d26db6ce5a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 672ba73070
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: Ic4012aae2ed5a39fa30a765714bfcc3fa5f3dbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:30:10 +00:00
Bill Yi
16f5f3cf3d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: Ie5bbdf284bed5731ff348b7b86bdd008e09b6d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:29:59 +00:00
Bill Yi
58162acd2e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9d26cfdce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467653
Change-Id: I382bc02d9c504043841a8e67e304ca35fb893b18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:29:09 +00:00
TreeHugger Robot
6a6c2a88a0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399
-s ours am: 53a315463c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I7ed83e7e72ae4a16e3c861d3cef61c2c6f8ef7f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:16:19 +00:00
Bill Yi
4d798822fa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447
-s ours am: 5b8058c497
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I3d1e85fea1fee3d3eb05d88cd77fa3de39e15afe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:16:17 +00:00
TreeHugger Robot
53a315463c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I7a579cd60448e331cbdbdf709df9d851862ffe05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:16:00 +00:00
Bill Yi
5b8058c497
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I13e43682afabb06f4b6b2db967b6b3ab485f0ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:15:53 +00:00
Bill Yi
56c3675239
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221
-s ours am: 3365a09592
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467801
Change-Id: If0c6dc7970a16bd228b20fcc60e854f141f3f39d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:14:22 +00:00
TreeHugger Robot
c45a51a675
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6834cfffe4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467802
Change-Id: I3cfe230ebd8066424b6a3b369b414a1056047a29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:57 +00:00
Bill Yi
ee93346074
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57ebe9c3b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467802
Change-Id: Ibdcdefa96e87c4c3de2edd80e953c770e392ae18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:50 +00:00
TreeHugger Robot
6b256f399c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c2a92b394e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467800
Change-Id: I33c5dd5c803f0a45c383b4ebfffe87ddb4654152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:43 +00:00
Bill Yi
8e20373021
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2bcb8c25fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467800
Change-Id: I86727dd970e5bedffc10d04e37c3aaa1ed8a7b6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:30 +00:00
TreeHugger Robot
c51085eaa0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fef0572018
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467796
Change-Id: Iac5ba101171a7b726b83da8fda2c63190215caca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:10 +00:00
Bill Yi
3365a09592
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467801
Change-Id: Ida66b7c7e1e05bbab33e21143f9af1f812136dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:06 +00:00
Bill Yi
03fcb87f5c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e841794da4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467796
Change-Id: Ida756bda0b6cf8503f804210881c7ec4a76fdeb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:12:52 +00:00
TreeHugger Robot
672ba73070
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-05-31 16:55:16 +00:00
TreeHugger Robot
34ee142399
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-31 16:55:11 +00:00
Treehugger Robot
12f8414700
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-05-31 16:53:38 +00:00
TreeHugger Robot
6834cfffe4
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-31 16:52:26 +00:00
TreeHugger Robot
c2a92b394e
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-31 16:52:26 +00:00
TreeHugger Robot
fef0572018
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-31 16:52:26 +00:00
Treehugger Robot
5445cfaca3
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-05-31 16:48:50 +00:00
Pavel Grafov
8112fb3828
Avoid double quiet mode requests
...
Currently when "Work apps" the toggle is tapped in Settings it leads to
UM.requestQuietMode() being called twice via different routes.
Bug: 284915370
Test: atest WorkModePreferenceControllerTest
Change-Id: I5eeb7ecdb10245a32d947ae2430a865bd7a5a60a
2023-05-31 13:56:42 +01:00
Weng Su
086d062cb2
Fix TetherSettings crash issue
...
- When the user is a guest user, the UI will remove all preferences to restrict setting changes. If the ViewModel updates the UI in this situation, it will cause Settings to crash.
- Avoid to setup ViewModel when UI is restricted
Bug: 284435378
Test: Manual test
atest -c TetherSettingsTest
Change-Id: I52d4ea717c34eacc9cc2321e3950dc89408049f8
2023-05-31 20:38:36 +08:00
SongFerng Wang
e4807eb9b8
Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439
Change-Id: I4a3b5be0db3d818c413476ab8a26492b99e172bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 07:56:27 +00:00
SongFerng Wang
bbf55cafb9
Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev
2023-05-31 07:24:36 +00:00
Chaohui Wang
f0dc0933c3
Fix padding issue on Scan QR code screen
...
Fix: 284826809
Test: Manually when set Font and Display size to maximum
Change-Id: I3c67b5603d27cefdb4776a43d72264051f40246f
2023-05-31 06:41:34 +00:00
Julia Reynolds
4b37c06442
Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841
Change-Id: Ia4388df5e221bf68715414a4aa00c627bf6213ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 17:31:15 +00:00
Julia Reynolds
a171a9d426
Merge "Update string to be phone/tablet agnostic" into udc-dev
2023-05-30 16:48:52 +00:00
SongFerng Wang
daf2fdc6f5
Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cbe4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467967
Change-Id: I28c20f78b759b6fd08ace5d5de632d1030cdb8a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 12:43:12 +00:00
SongFerng Wang
c4ed48cbe4
Merge "Try to avoid the timing UI issue" into udc-dev
2023-05-30 12:00:39 +00:00
Zoey Chen
24b9862450
[Panlingual] Remove the large space when searching language am: 1f76872d78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442455
Change-Id: Ife8d5ebaf1567a4114a3d8266913442eeb8f91f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 10:26:56 +00:00
Edgar Wang
2917c0c1c0
Revert "Revert "Update theme for ChannelPanelActivity""
...
This reverts commit bbef903b88
.
Reason for revert: This CL is fixing notification panel theme issue.
Change-Id: I6bcd8c8f1e8d2f2bd2f7896ebf45d36f67f570b9
2023-05-30 08:28:30 +00:00
SongFerngWang
0f3f6086e9
Try to avoid the timing UI issue
...
Tester exit network scan interface and then enter network scan activity
immediately. The previous network scan stop command effect the current
network scan.
Move "stop network scan" to first at onStop.
Bug: 276679520
Test: Build pass.
Change-Id: Ib0125c3745537a82b7574a8580d2a02c4e3644a0
2023-05-30 15:18:28 +08:00
Zoey Chen
1f76872d78
[Panlingual] Remove the large space when searching language
...
Don't expand the tool bar when users search the language because they will see a large space on the top.
Bug: 284480214
Test: local test
Change-Id: Ie8653536117a999bd420ccfce961b17fe9349d35
Merged-In: Ie8653536117a999bd420ccfce961b17fe9349d35
2023-05-30 05:44:13 +00:00