Bill Yi
5e574a1301
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff
-s ours am: c7e5bc37f1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823
Change-Id: Ice3700e5fe6795063d056cea175775c10c8565c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 05:06:10 +00:00
Treehugger Robot
c537439f3a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823
Change-Id: I19e3f9ad92a238698ffce7cad4d08c3d90199df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 05:04:04 +00:00
Bill Yi
c7e5bc37f1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823
Change-Id: Id79f748013e887d8a73f16f386675844449512d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 05:03:44 +00:00
Tom Hsu
9f47d30cd2
Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342
Change-Id: Ic51542e97d348936e3c5cfceb3cfc0a5945bf140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 04:56:44 +00:00
Treehugger Robot
11ba47eebb
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-04 04:36:13 +00:00
Tom Hsu
99e03458fa
Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev
2023-05-04 04:21:51 +00:00
TreeHugger Robot
43e329e463
Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477
Change-Id: I43d1b9a2f326aea6a8ad8d40f3f5cd024120d75f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 04:21:28 +00:00
TreeHugger Robot
7bf4c8f9f5
Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev
2023-05-04 04:09:13 +00:00
Treehugger Robot
b3d65a57af
Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573
Change-Id: I12332396bed68d97d711926f8d3dc076864ca1d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 04:00:30 +00:00
Treehugger Robot
e71643efac
Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev
2023-05-04 03:15:40 +00:00
Chaohui Wang
f51e1422f3
Update for getSystemPackageNames
...
Param showInstantApps is removed.
Bug: 280280596
Test: Unit Tests
Change-Id: Ib58176d9beefb2d2bdf8c7c969e2cc96bb64f8e7
2023-05-04 02:33:10 +00:00
Lin Yuan
ec574d6fe5
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
am: f86d507407
am: d8321f5df7
am: ae2dd3d513
am: 9e84690fb7
am: dac4ef66d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: Ifc9575413c7025833b2e95de281f16f7b8197537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 02:29:36 +00:00
Lin Yuan
5a099fab45
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
am: f86d507407
am: d8321f5df7
am: eb3be1fa5b
am: d2ddc84c14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I0b8452b48f8581b117580dfbf92de545aba578e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 02:28:46 +00:00
Lin Yuan
dac4ef66d9
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
am: f86d507407
am: d8321f5df7
am: ae2dd3d513
am: 9e84690fb7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: Ia36438aa214a976c0b98eeecec0db054298a8bb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 02:25:07 +00:00
Lin Yuan
9e84690fb7
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
am: f86d507407
am: d8321f5df7
am: ae2dd3d513
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I0521342515969ccb2d46b9e9159d29b998713cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 01:41:25 +00:00
Lin Yuan
d2ddc84c14
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
am: f86d507407
am: d8321f5df7
am: eb3be1fa5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I69571348ce67c5a5572a5fb5c15d31c88fb26a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 01:37:49 +00:00
Lin Yuan
ae2dd3d513
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
am: f86d507407
am: d8321f5df7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I3a9a9ef33b0a7fd985861a85d63d5078d3fe5aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 00:53:38 +00:00
Lin Yuan
eb3be1fa5b
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
am: f86d507407
am: d8321f5df7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: Iff01dd3f1528b2ded54b281c1f810293093f2ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 00:52:56 +00:00
Treehugger Robot
ddb36c89f2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704
-s ours am: a1b3c500fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I65d76144eb2ddd9894a5a769d7524ac6f2e8b5c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 00:28:07 +00:00
Lin Yuan
d8321f5df7
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
am: f86d507407
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I23d09d7f0c376493ba30ac38577d196b69d46335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 00:02:52 +00:00
Treehugger Robot
a1b3c500fd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I17e41ec494a5893cb8eb1f3b8dfbeb46e28d7310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:46:47 +00:00
Lin Yuan
f86d507407
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I7884ced3a0a1d29508127fbc263197c20f6ff0d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:23:36 +00:00
Lucas Silva
ccabc4e880
Update DreamAdapter to set icon tint colors in xml
...
Setting in xml makes it easier to customize the colors in the SUW vs
normal views.
Bug: 279914654
Test: opened dream settings and verified colors
Change-Id: I367677426b8b538cca19dfdc5d343f66b8f89dba
2023-05-03 18:22:58 -04:00
Bill Yi
17b8ec6606
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e23f6ea87c
-s ours am: 8b08d034f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964412
Change-Id: I7f29e00db86f98d7064693faaed3020a5c390cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:12:26 +00:00
Treehugger Robot
d3bacd3b3f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1c79500a0d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974865
Change-Id: Id674e33c6669f28bb7d2d500e0f9ea24306cfa01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:11:45 +00:00
Bill Yi
2563f766bd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86c5b0816b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974865
Change-Id: I870baff4c2afb23f2bdf0b6cf7c1b207e43fead5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:11:39 +00:00
Treehugger Robot
abd70c74dd
Merge changes from topic "tc_change_23050307_28" into udc-dev am: 954afa9586
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I8294a945e09535da34c11b15ec24b6a2eaa4c897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:52:10 +00:00
Bill Yi
d363db4937
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f
am: aa9489179b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I1c46c47b52f71c63cf6344d2cc2b3210e6c46d7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:52:05 +00:00
Treehugger Robot
aae4f655d4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974870
Change-Id: Ie6dfae854dee478fd3b972a205fd577ea812111b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:51:17 +00:00
Bill Yi
1e1ad8a6db
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c7368b683
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974870
Change-Id: I13ba538dde1973fad3cadc157e627487d301a407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:51:03 +00:00
Bill Yi
8b08d034f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e23f6ea87c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964412
Change-Id: Icd9523da2593ab59557125aa5c996230e2589030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:46:45 +00:00
Treehugger Robot
1c79500a0d
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-03 21:31:19 +00:00
Treehugger Robot
7b5293a704
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-05-03 21:31:16 +00:00
Treehugger Robot
954afa9586
Merge changes from topic "tc_change_23050307_28" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f
Import translations. DO NOT MERGE ANYWHERE
2023-05-03 21:31:16 +00:00
Treehugger Robot
f4ca8c6033
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-03 21:27:41 +00:00
David Liu
6ff8643e82
Add Tapjacking Protection for all screens extends StorageWizardBase in Settings.
...
Add/remove the SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS flag into/from all screens extends StorageWizardBase with lifecycle.
Bug: 255305175
Test: manual test with make RunSettingsRoboTests
Change-Id: I7ed9e2bf9bbebf6cd6b7e76ad47a6d4155eb2eb2
2023-05-03 21:11:35 +00:00
Treehugger Robot
087bc6aae1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 30fe673ac9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975077
Change-Id: Iad94247084170625d4a3f63614da8a5affcb1c0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:05:16 +00:00
Bill Yi
eb73e3db2d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6096cceb3c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975077
Change-Id: Ib0c4fe784fe274b9ce9f7f31cd86b09a3c40da18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:05:01 +00:00
Treehugger Robot
30fe673ac9
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-03 20:55:59 +00:00
TreeHugger Robot
aa8a040424
Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: I4769684c969f0aaab4fa577a45b5e136343c566f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 20:54:18 +00:00
Bill Yi
301f60a2d2
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe
am: 7951afa544
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: Ifeed0de4817c78c8b47f98f0f7d9e60874e51c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 20:54:04 +00:00
TreeHugger Robot
0848931c62
Merge changes from topic "tc_change_23050307_27" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe
Import translations. DO NOT MERGE ANYWHERE
2023-05-03 20:46:29 +00:00
SongFerngWang
706257c57a
Hide the LE audio toggle by flag
...
Bug: 280021500
Test: build pass.
Change-Id: I3f4a821c50dfb9d2de73919945334b42c59b3309
2023-05-04 03:43:28 +08:00
Treehugger Robot
69dcb19d2d
Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400
Change-Id: I66b056b1e770fba5324eb7f828d253b1b71efd63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 19:37:50 +00:00
Derek Jedral
5a75cd54d4
Change preference title if Active Unlock enabled
...
Change the title of the preference to reflect that Active Unlock can
also be used to unlock the device.
Test: make RunSettingsRoboTests
Bug: b/271782800
Change-Id: Ie227e6dddfc024235fc3568899ef151f14f17696
2023-05-03 12:37:01 -07:00
Treehugger Robot
7244f3a0ae
Merge "Update auto_rotate_summary string for different product" into udc-dev
2023-05-03 19:09:07 +00:00
Patty Huang
f05615f1e8
Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details
...
Bug: 280020008
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Change-Id: I559f34f2b0764c4f566fe1e0c1357929e2c88fb6
2023-05-04 01:26:15 +08:00
David Gutierrez
e5e72d1729
Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391
Change-Id: Iefef809ceebb3c84cb311e4bfbdcf35a1c36b32e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 16:36:55 +00:00
Becca Hughes
1022918da5
Merge "Align settings with new mocks" into udc-dev am: 21733fa106
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923
Change-Id: I0f2e492e45177a5ac7e2e76dc1957f74d73f9781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 16:36:26 +00:00
David Gutierrez
570943637c
Merge "Revert "Disable Settings large-screen optimization"" into udc-dev
2023-05-03 16:17:31 +00:00