Commit Graph

123822 Commits

Author SHA1 Message Date
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
4aef4043aa 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: I9eaafcb4e1ce813e8775cbce0c6eda5137e922fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 15:57:28 +00:00
Pavel Grafov
8e13abebc0 Merge "Avoid double quiet mode requests" into udc-dev 2023-06-01 15:31:13 +00:00
Cao Peng
38f1b45d50 Fix resource leakage caused by cursor
Change-Id: I9507658cc82a2b9760507530920a37044f7de2fd
Signed-off-by: Jia Jia <jia.jia@zte.com.cn>
2023-06-01 18:16:26 +08: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
28c9000bb7 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: I8d186dbc0615dd277d6bd2ffd0272beac0280a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 04:57:15 +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
Android Build Coastguard Worker
6fb0b708cb Snap for 10233678 from d26db6ce5a to udc-release
Change-Id: I6e3c685b6e5861898b83df89fb7d09921042c7f7
2023-05-31 23:21:55 +00:00
TreeHugger Robot
de73c2ff4f 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: I7473173f5cb5c326e472af2091dfd472e10d5a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 22:30:25 +00:00
TreeHugger Robot
2484fa72d6 Merge "Add more search terms for WPP" into udc-dev 2023-05-31 22:02:49 +00:00
Bill Yi
482e804031 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221 -s ours am: 2d3730c6e0 -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: I97e3326beded265be1c410580efc01077c73f3a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 19:56:50 +00:00
TreeHugger Robot
cc1e3a7a22 [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: I1b0095baee859ac3b3dfa4cdfaebb13277791f6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 18:41:13 +00:00
Bill Yi
e4de5ed4b8 [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: I5be6bca492488cab97da3e60e3d2b8b3f8a5c72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 18:41:08 +00:00
Bill Yi
fea2cb0758 [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: I21d97a78635752f7ba3adae52999aee4d4cad573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 18:32:17 +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
e665a6bb57 [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: I385978b643fca0743bf421c42c37b732327327c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 18:16:34 +00:00
Bill Yi
b0a242da0e [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: I714eab2049db6e8709067fb5282fcfa6d47ddcf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 18:16:30 +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
446ae41bbb [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: Ie8a161fcf159665d1741e7c058dc60d4e03c0a0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 18:15:05 +00:00
TreeHugger Robot
55ddd4aa31 [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: If959b9ca068f1c1cc6f0081a9bdf7aac40c119cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 18:14:39 +00:00
Bill Yi
c5b80e0c99 [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: I88f7826501fb79728b400c55b47f1cc9c2752b8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 18:14:35 +00:00
TreeHugger Robot
a93397786a [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: Ic209ddcfd7417e43f1bbb2934fb97d21086eaa61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 18:14:27 +00:00
TreeHugger Robot
dbe17de3a8 [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: Ib3956999b9a5c41d10ef04d10b0022f4894846a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 18:14:27 +00:00
Bill Yi
13df8b2d97 [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: I8bc84d7b3f6821476666db24e11855e15a103f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 18:14:23 +00:00
Bill Yi
c7d989394d [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: Idced454dc447d47a055395d13045712b7f1c5797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 18:14:10 +00:00
TreeHugger Robot
0c23e24eb8 [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: Ie20d4e1e662aa379c9fc128c19e193f3f5c24915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 18:13:51 +00:00
Bill Yi
e306564e29 [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: Idac10a099a63c691ef6b7e573a7ec8bde54b103d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 18:13:34 +00:00
Bill Yi
2d3730c6e0 [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: I80facf9912d1fccb9e1b9e6264d9bb699112d2f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 18:13:31 +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
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
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
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
2d2f90fa38 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: I569db5421a70731f2f0666e9ef187422cff712e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 07:57:05 +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
Android Build Coastguard Worker
13e9e3bf1b Snap for 10225371 from a171a9d426 to udc-release
Change-Id: Ifbe5058eec4b7a925d5fd3ed322b471193a2d4ac
2023-05-30 23:29:49 +00:00
Julia Reynolds
f842b7754b 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: I5d11d6500b35be8b59f9e298c701775638b60858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 17:31:26 +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
07d8970208 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: I5c9c9ef6d4d58542b7277ea67b16c222577967cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 12:38:53 +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
6c5b2f34cf [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: I319f8070f4cd02842f397789d6495a8f27e2ad5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 10:29:14 +00:00