Bill Yi
77e56766c3
[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: I583569809810380cb5a34088d216e84f001b41ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:06:37 +00:00
Treehugger Robot
d2605f6f6a
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-03 21:01:27 +00:00
TreeHugger Robot
b5773f95c7
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-03 20:57:21 +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
61f1af73e6
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: Ic8d79dfaa411f3293f1a2905d834f731a69711ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 20:51:39 +00:00
Bill Yi
44d28ab6f5
[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: I3f702284b57f224f55eb10f49cbabdd030f92aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 20:51:24 +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
Treehugger Robot
00efff2f18
Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae
am: c3d6820ffd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400
Change-Id: I6e2b48adfd124bd1d7aa67cc975fb6dc2e4d3350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 20:23: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
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
c3d6820ffd
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: Id1f507633ad33b5b0719dba4bc507e73ce7832e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 19:36:46 +00:00
Treehugger Robot
7244f3a0ae
Merge "Update auto_rotate_summary string for different product" into udc-dev
2023-05-03 19:09:07 +00:00
David Gutierrez
19da9aeb52
Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c
am: 6a8a9492d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391
Change-Id: Ie27314bb320132fe579c48099fa34f4508c77ccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 17:41:55 +00:00
Becca Hughes
b20744c9fc
Merge "Align settings with new mocks" into udc-dev am: 21733fa106
am: 454cfbf2cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923
Change-Id: I535bbe38e6ac91ed1c635c5ac8d8a399d4f701ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 17:41:11 +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
6a8a9492d7
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: I71a855eb9c082e8c32d6a56c07722c08984b019e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 16:37:22 +00:00
Becca Hughes
454cfbf2cc
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: I2a423b8a0a96ebcc51f04f0603e73e4f2fd24bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 16:36:56 +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
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
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
1b72fd9f3c
Merge "Reducing slice requesting logging" into udc-dev am: 8060347ec6
am: 67215bb0db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568596
Change-Id: I0e7b334b914601a10e7adb452c29eccaeb01ece2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 12:02:52 +00:00
Treehugger Robot
67215bb0db
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: I1e231a4a909a1fa48034107e62a62f4ef75421ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 11:21:47 +00:00
Treehugger Robot
8060347ec6
Merge "Reducing slice requesting logging" into udc-dev
2023-05-03 10:37:24 +00:00
Edgar Wang
f6b49a0204
Merge "Add new page enum for Account detail" into udc-dev am: 089217a19c
am: 2c1ad2142f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22986436
Change-Id: I7dcdc2a450761ee48b7439e66c3d28cedf858afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 10:18:31 +00:00
Vania Januar
c584bfae60
Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev am: e78b1f377e
am: 3f449e0c49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945
Change-Id: Ieec3b8affc3f6f1226aacf214a458ea5cd2ec48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 10:18:03 +00:00
Edgar Wang
2c1ad2142f
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: Ibd7bcc5f3bc4c2abc79f30c8b4a93cd2503167d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 09:57:21 +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
3f449e0c49
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: Id38d54a83868152b6267b83b5292d9e251fb8381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 09:35:59 +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
046d7356c2
Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae1c
am: a90bbde69f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981558
Change-Id: I20704202fa0e85f67dfb56e17a808e25ed30f343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 08:13:07 +00:00
Chaohui Wang
a90bbde69f
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: Iaf2a725e7dea566fe1bff5dd805598587482b1d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 07:30:56 +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
66defa99d9
Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c
am: 4e4941480f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471
Change-Id: Ie44e01786c43a3989e8076b7bf19654407f067ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 06:29:44 +00:00
Charles Chen
497393ed85
Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361
am: 2258dd83cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038
Change-Id: Ieb1404f5045c6a32d35e045381dedb217cc93097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 06:28:47 +00:00
Wenhui Yang
4e4941480f
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: I0a7131567f578e045d20bc92fa50b1e4fb3f85cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 06:28:24 +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
2258dd83cd
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: I38c795e9729694e7720387dde7e8c2d5ece5e3ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 05:48:14 +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