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
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
Oli Thompson
6d16151639
Change icon in settings work challenge
...
Screenshots in bug
Test: manually tested
Bug: 279559156
Change-Id: If3c9415db476f0ca0d26e74311e7bcd8d7e33dbb
2023-05-03 12:39:27 +00:00
Treehugger Robot
7c92bd1fa4
Merge "Reducing slice requesting logging" into udc-dev am: 8060347ec6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568596
Change-Id: I16952db9b2bc59a630e7f30fb42e26ba9ac2c90c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 11:17:36 +00:00
Treehugger Robot
8060347ec6
Merge "Reducing slice requesting logging" into udc-dev
2023-05-03 10:37:24 +00:00
Edgar Wang
9a976829ea
Merge "Add new page enum for Account detail" into udc-dev am: 089217a19c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22986436
Change-Id: I0c777a2eeec7de02c0d11fc7bb5ff479bd21ad11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 10:14:38 +00:00
Edgar Wang
089217a19c
Merge "Add new page enum for Account detail" into udc-dev
2023-05-03 09:49:11 +00:00
Edgar Wang
e416e27543
Update auto_rotate_summary string for different product
...
Bug: 279769863
Test: presubmit
Change-Id: I98ceddc54bf5ea27cf862e96fe6358b3b885db0b
2023-05-03 17:44:42 +08:00
Vania Januar
9c9b8afd26
Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev am: e78b1f377e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945
Change-Id: I01556c0442565babb72c2f879f109ee8e12ba277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 09:31:49 +00:00
Edgar Wang
fae664c79c
Reducing slice requesting logging
...
Bug: 253684322
Test: rebuild
Change-Id: If0e884875e09bd43b88f6b5f205ad450de488552
2023-05-03 17:04:38 +08:00
Vania Januar
e78b1f377e
Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev
2023-05-03 09:00:56 +00:00
Chaohui Wang
e548290d95
Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae1c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981558
Change-Id: I475da5b3c533b950a466af49e4ea9af7b5e32622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 07:26:40 +00:00
Chaohui Wang
d66335ae1c
Merge "Use correct App info screen's trash can icon" into udc-dev
2023-05-03 07:01:57 +00:00
Wenhui Yang
2755f17587
Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471
Change-Id: I9c48161c5f1a85251daee07af18f8d1f128c468c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 06:24:02 +00:00
Wenhui Yang
25de3b2b9c
Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev
2023-05-03 06:11:23 +00:00
Charles Chen
f8d75358ea
Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038
Change-Id: If45c374a6db9f383dad8f0e169f083e6acef9a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 05:48:59 +00:00
Charles Chen
cb5a240361
Merge "Disable Settings large-screen optimization" into udc-dev
2023-05-03 05:44:08 +00:00
Edgar Wang
b663f17d31
Add new page enum for Account detail
...
Bug: 260054568
Test: rebuild
Change-Id: I332bebf4f4ce725759860f937f50c8a6f21d8648
2023-05-03 13:06:28 +08:00
SongFerngWang
0d36d37590
Shows main_battery information for not untethered device
...
The metadata have main_battery and device is not untethered device,
then UI show battery by metadata.
Bug: 273907230
Test: atest AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: I73d8a69c81fe234a5c576ca3769c1b079ac0ceb4
2023-05-03 04:23:50 +00:00
Chaohui Wang
2aca9d40f8
Use correct App info screen's trash can icon
...
Fix: 280120259
Test: Visual
Change-Id: I954c344c3f5fdd256de7519f1534c982c084a521
2023-05-03 11:59:43 +08:00
Chaohui Wang
80462c370b
FRP bypass defense in the Settings App for SPA
...
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.
Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.
Fix: 280154358
Test: Unit test
Change-Id: I06e73386711d5ad13c89d033cf0fe3164781c0ef
2023-05-03 10:53:27 +08:00