Lin Yuan
2ead04b76a
[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: Id6c5d54610e3c03f47bc59871007b98bde306e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 02:22:57 +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
Treehugger Robot
cfaa877732
[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: I37ea2d6ace89cf4a09ef6ccc220ee538e9261a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 00:59:55 +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
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
Bill Yi
82c92ce15c
Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE
...
Merged-In: Ib0806c0bf18797da3e44dbe4800283430120b49a
Merged-In: I865cc944ab660f47b40b48af32a7aef389551963
Merged-In: I4d39e88aca6e31c3e897a0d16ec45124906d63cc
Change-Id: Idb27df03638d87ca39b150dd618cbb5ade831f4c
2023-05-03 15:54:48 -07:00
Bill Yi
4417b47eea
[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: I65d3f08825319157056700fe4772e40d57b04efb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:38:21 +00:00
Treehugger Robot
f2fa6d46d8
[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: I76a13454b9220e1abf2e48818020d5c4d5a63585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:37:01 +00:00
Bill Yi
a67463b464
[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: I0462300af2ab83e0f16b0aecadc5fb5da91791b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:36:59 +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
Treehugger Robot
48f8eecbd1
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: Icd9d889138000530c5c65b80fcc14ebe5ccc6e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:51:13 +00:00
Bill Yi
20a33c9bdd
[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: I6a9899e46f5a1aaf40b3d370489f840717a0b20b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:51:08 +00:00
Treehugger Robot
f84817da57
[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: I028f01235fb9987619c52e11b5579aaae20f708c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:48:33 +00:00
Bill Yi
cf281ffe95
[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: Ia1f7a76768949b396f244eec1b574bac7b0837c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:48:17 +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
71f2e23696
[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: Idee576985392329e29e4c01129da49d5b476723b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:06:05 +00:00
Bill Yi
c2df5abd3c
[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: Iff4d8a8b9430238b395bb39ce30b3d55a5b4e169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:05:51 +00:00
TreeHugger Robot
178d880667
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: I0405b07dcd7cd97a732f5297bc540b2f92ecb3b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:03:58 +00:00
Bill Yi
cdfa21f8d7
[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: I7bc53c5b42619d6942daa8823d0b902d6c14084b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:03:53 +00:00
Treehugger Robot
03d406e123
Merge changes from topic "tc_change_23050307_54" into udc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e23f6ea87c
2p: e28505b1f9
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e23f6ea87c
Import translations. DO NOT MERGE ANYWHERE
2023-05-03 20:59:02 +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
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
0624c88484
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: If3d83edcabc4249b963666b8d1d83a2eab0e45e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 19:37:39 +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
e156e0d96c
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: If571038f3ffb62336ad97e16e7030b14446b2c43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 16:37:22 +00:00
Becca Hughes
6f600f1ddf
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: I563b006d6eccc442dd63a39bca10a8bd82eb690e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 16:36:54 +00:00
David Gutierrez
570943637c
Merge "Revert "Disable Settings large-screen optimization"" into udc-dev
2023-05-03 16:17:31 +00:00
Becca Hughes
21733fa106
Merge "Align settings with new mocks" into udc-dev
2023-05-03 16:14:12 +00:00
Priyanka Advani
77f76267d2
Revert "Disable Settings large-screen optimization"
...
Revert submission 22926596-disable_large_screen_opt
Reason for revert: b/280606740
Reverted changes: /q/submissionid:22926596-disable_large_screen_opt
Change-Id: Ib918705206dc6b8bcbce21f83494d1108c6b8393
2023-05-03 16:05:25 +00:00
danielwbhuang
0b79c92348
[Fixed] Reverse scrolling setting is reversed
...
If useTouchpadNaturalScrolling is false, "Reverse scrolling" should be on.
[The API value]
useTouchpadNaturalScrolling: false
[The expected UX behavior]
Reverse scrolling: on
fingers upward, scroll up, content moves down
The description of "useTouchpadNaturalScrolling":
Returns true if moving two fingers upwards on the touchpad should scroll down, which is known as natural scrolling.
The description of "Reverse scrolling":
Content moves up when you scroll down.
Bug: 280047007
Test: manual and passed atest TrackpadReverseScrollingPreferenceControllerTest
Change-Id: Ia5e30fa14b599ddcffae99005114f10412ccad3c
2023-05-03 23:59:55 +08:00
Bill Yi
e6d51e5378
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e23f6ea87c
2p: e28505b1f9
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964412
Change-Id: I4862afc62e1ea42bb54d6d53fbdf63b7dcec91eb
2023-05-03 14:42:16 +00:00
Bill Yi
56b01ab110
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dc96a91fff
2p: 98c8d85c26
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823
Change-Id: Ib76cee01fd90bd1a9c70e2231bb2ef31c1506573
2023-05-03 14:42:09 +00:00
Bill Yi
98c8d85c26
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dc96a91fff
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823
Change-Id: I53c99ead2dccfee605d40413f971d4fb5a938854
2023-05-03 14:41:38 +00:00
Bill Yi
e28505b1f9
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e23f6ea87c
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964412
Change-Id: Iaeee5cf9b0ea850439b39487d4edaf77fa7e89ed
2023-05-03 14:39:38 +00:00
Bill Yi
aa9489179b
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: Id55759bbc4a708d789a8b83421a3d82ea24b8d32
2023-05-03 14:36:07 +00:00
Bill Yi
7951afa544
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: Ic53f6ad80da0a5e3f66bebd86e970ee2cce04f14
2023-05-03 14:36:02 +00:00
Jigar Thakkar
0e8b8ec57f
Modify clone profile accounts info section
...
This change renames clone profile accounts header on the account
management dashboard to "Clone" from "Personal" by using the newly added
clone category header config. This also includes changes to remove the
add account preference from the clone profile accounts.
Bug: 260181765
Test: Flashed on a sunfish device and tested
Change-Id: Iff8b75119d85d2cd8ab065ed1057fb2b35e64650
2023-05-03 14:20:48 +00:00
danielwbhuang
bd2d0de0b3
Fix testNonIndexableKeys_existInXmlLayout
...
This test is for LanguageAndInputSettings UI.
Hence, we should set flag "SETTINGS_NEW_KEYBOARD_UI" to false
Bug: 280018738
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=LanguageAndInputSettingsTest
Change-Id: Ida91a23bb576c81f9618406d54c1d892b23eb4fa
2023-05-03 20:40:53 +08:00