Commit Graph

123807 Commits

Author SHA1 Message Date
Bill Yi
84b1429d7c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: 0a31322199 -s ours am: 0813a0de64 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibbbca673f028d22f7453a287ea54e99d1ed96834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:59:20 +00:00
TreeHugger Robot
0741621536 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f -s ours am: 8f5a0bc281 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d14b256b2f3ab3c1ea5aaa8c5a48245b703a03e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:58:50 +00:00
Bill Yi
556351d016 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0 -s ours am: a18807d9ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5def613da9cbba552a080f9091114950f8c44fbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:58:46 +00:00
Bill Yi
6f0fe3ef25 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237 -s ours am: aeacaaee64 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib2adb162afea02633fbdecf13b0f984b9769d0fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:37:16 +00:00
Bill Yi
0813a0de64 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: 0a31322199 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4792833097104a72e31f67733d77948812fcb699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:37:01 +00:00
TreeHugger Robot
8f5a0bc281 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie20278858c925933506dbd5bc6d71e486d45e89b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:19:27 +00:00
Bill Yi
a18807d9ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c3201ad1377bc074940b211483a7c0f76630d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:19:23 +00:00
Bill Yi
aeacaaee64 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie42f1d09d6218ba3350b6971370fd554ea10f719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:18:41 +00:00
Bill Yi
0a31322199 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaf4243052f0b3cf46d02ca11aa64f9e48e8c9a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:11:33 +00:00
TreeHugger Robot
719a4c645f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-06-05 19:35:48 +00:00
Justin Gross
e8e2f86c4c Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: I3463151328ed5ed16afb20616dd4f6e9653ac143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 19:27:32 +00:00
Justin Gross
0e3ea95a58 Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: Id08742370d36beeacedcad6538c8482c465b0324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 18:36:49 +00:00
Justin Gross
89e829e3dc Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev 2023-06-05 18:00:15 +00:00
Matías Hernández
173cc267e0 DO NOT MERGE Don't hide approved NLSes in Settings
Note that an NLS that shouldn't be approvable (because its name is too long) but was already approved (either before the max length check was introduced, or through other means) will disappear from the list if the user revokes its access. This might be somewhat confusing, but since this is a very-edge case already it's fine.

Bug: 282932362
Test: manual
Change-Id: Iccfe7b53d643d6c9f9516f91d3cee3309b11551e
2023-06-05 17:16:48 +00:00
Treehugger Robot
dbec7ba7fb Merge "Use custom action key icon" into udc-qpr-dev 2023-06-05 16:56:35 +00:00
Bill Yi
16b5dd96c2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I71ddf8ba696942441a9aba613960a7cbac4c1b28
2023-06-04 18:47:42 -07:00
Bill Yi
ea2e6b3670 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie7229c084aa7704cde5a57d7635bd0fb2113fca6
2023-06-04 18:46:55 -07:00
Bill Yi
1b5824f6c9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia19dd8b4893160c436ed2a4b548b1c0a18ac5642
2023-06-04 18:44:23 -07:00
Bill Yi
e1108d7d99 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6d9fb22b34aa948324f12dbd8421a53d3d180f11
2023-06-04 18:42:33 -07:00
Bill Yi
d152c7b1bf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4fe08ee7dc7f803451ff0389a2587a5c99d1023e
2023-06-04 18:40:52 -07:00
ykhung
53f48c4a97 Make the estimator cache logic is the same as SysUI flow
Ensure the remaining time estimator cache logic is the same as SysUI
https://source.corp.google.com/android/frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java;l=375-386

Test: presubmit
Fix: 285747156
Change-Id: If7218dc70792aafaec45c71018897bed80df7f3d
2023-06-05 01:39:41 +00:00
Bill Yi
506e105fdb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I61f515a3a5cd45df467240ef7cc38e098fd184ae
2023-06-04 18:39:29 -07:00
Bill Yi
f346881098 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I32cdd728af994f151117d2a96c1f5e27508eba9e
2023-06-04 18:38:42 -07:00
Bill Yi
7d99401b8e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I855db4675b33516b1bd38cb58406a9daa8ca188e
2023-06-04 18:37:48 -07:00
Bill Yi
fe27600237 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I00c2c563b2687f49c85e0774c1a8b279e8781ede
2023-06-04 18:36:19 -07:00
Bill Yi
b80d56cfc0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I359de73314ea608d66cdc8dc77fd3396a104dc02
2023-06-04 18:34:48 -07:00
Bill Yi
c66d6726f0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaf1f93706a94bc587237b4367b9ca4ddc629101a
2023-06-04 11:33:42 -07:00
Bill Yi
c96c00059d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I37bbb2e912db7d52298bf0143d6e087a26b421f2
2023-06-04 11:25:20 -07:00
Bill Yi
bd46bde1e6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6a4b1fcadd0684e5bcb46fcae5f58ba0e4bdd351
2023-06-04 11:21:16 -07:00
TreeHugger Robot
4834abe241 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I763e30e24d32f456b30bf174eeacc899149b0ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 22:23:17 +00:00
Taran Singh
45e2c72877 DO NOT MERGE: Prevent non-system IME from becoming device admin
Currently selected IME can inject KeyEvent on DeviceAdminAdd screen to
activate itself as device admin and cause various DoS attacks.

This CL ensures KeyEvent on "Activate" button can only come from system
apps.

Bug: 280793427
Test: atest DeviceAdminActivationTest
Change-Id: I6470d1684d707f4b1e86f8b456be0b4e0af5f188
(cherry picked from commit 70a501d02e)
2023-06-02 22:22:20 +00:00
Taran Singh
9260c67352 DO NOT MERGE: Prevent non-system IME from becoming device admin
Currently selected IME can inject KeyEvent on DeviceAdminAdd screen to
activate itself as device admin and cause various DoS attacks.

This CL ensures KeyEvent on "Activate" button can only come from system
apps.

Bug: 280793427
Test: atest DeviceAdminActivationTest
Change-Id: I6470d1684d707f4b1e86f8b456be0b4e0af5f188
(cherry picked from commit 70a501d02e)
2023-06-02 22:20:30 +00:00
TreeHugger Robot
f0503e2a51 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: Ifdc153ead7f9c45046bf5df96b1d44cd576f561b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 21:36:40 +00:00
TreeHugger Robot
25d24e0cf0 Merge "Restrict SimDialogActivity" into udc-dev 2023-06-02 20:41:47 +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
Treehugger Robot
d19f4f85fd 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: I9277de61513b892dee6517e2a6a393f77451e9c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 15:56:40 +00:00
Yanli Wan
d3516aa5d0 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: Iaf3158afffa27a9c8dac6862a1516019613852ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 15:56:33 +00:00
TreeHugger Robot
aac695129e 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: I5202aa1f9202a906ef197a0f60209edf73df7ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 15:56:27 +00:00
TreeHugger Robot
800256a4c7 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: I7ade14ddd9840d45d97f587828edc4cbe0403a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 15:56:17 +00:00
YK Hung
6f892d206b 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: I924fe9631af514f947d278f32e808938a9c4c72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 15:50:24 +00:00
Jason Chiu
a8142278e9 Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247

Change-Id: I8a7966fd9f3ee88683c35fd4f2bd7b60b475cbcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 11:05:34 +00:00
Jason Chiu
b2ed35b2ae Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev 2023-06-02 10:27:14 +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
122ba16792 Merge "Hide Show System on SPA version App languages" into udc-dev 2023-06-02 06:41:54 +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
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
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