Ken Lin
b48d473d51
Merge "Settings crashed when changing the Screen Resolution" into udc-d1-dev am: a6f2464e8c am: 20c3a8ea29 am: 4bf3a373c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24109923
Change-Id: I6c1ce63018bec83b0eb6068e08a70a2eeb6e2a5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 06:34:48 +00:00
Ken Lin
4bf3a373c3
Merge "Settings crashed when changing the Screen Resolution" into udc-d1-dev am: a6f2464e8c am: 20c3a8ea29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24109923
Change-Id: If7f9f875c96678833b3727edc84f6a8296f9e6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 05:51:05 +00:00
Ken Lin
20c3a8ea29
Merge "Settings crashed when changing the Screen Resolution" into udc-d1-dev am: a6f2464e8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24109923
Change-Id: I41d1c839032341387bbe05bea462258fb9caef18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 05:05:28 +00:00
Angela Wang
14d35107e8
Merge "Show connecting hearing devices in A11y hearing devices page" into main
2023-07-19 03:19:25 +00:00
Joshua Mccloskey
eb7692e052
Merge "Implement basic Fingerprint functionality." into udc-qpr-dev am: 1412f391d5 am: 22b67802f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23480676
Change-Id: I981accee2b7f0f3742c98d1b352d3076d421dede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 17:28:29 +00:00
Joshua Mccloskey
22b67802f5
Merge "Implement basic Fingerprint functionality." into udc-qpr-dev am: 1412f391d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23480676
Change-Id: If0de6ed25832d88a049f82ad86485fb4b1d027e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 16:45:52 +00:00
Joshua Mccloskey
1412f391d5
Merge "Implement basic Fingerprint functionality." into udc-qpr-dev
2023-07-18 16:16:52 +00:00
Iván Budnik
5c44a4b751
Merge "Inline shouldDisableMediaOutput into Settings app" into main
2023-07-18 14:31:40 +00:00
Vincent Wang
855dc3b606
Merge "Remove ignore annotation @Ignore("b/282413778")" into main
2023-07-18 13:52:26 +00:00
Chaohui Wang
d9203370ff
Merge "Rename to AppListTwoTargetSwitchItem" into main
2023-07-18 11:39:37 +00:00
Zoey Chen
09294a4e49
Merge "[Language] Should show confirm dialog when deleting the system language and making the second language automatically become the system language" into udc-qpr-dev am: 7fd3730909 am: 6572d4d09e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069201
Change-Id: If40a1678b673aa4331fa3e9624f4c7b858da3ebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 10:03:00 +00:00
Zoey Chen
e9589de8e5
Merge "[Language] Do not back to previous page if dialog is displaying." into udc-qpr-dev am: 43bd9db3c6 am: 7cabb0d55f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23902484
Change-Id: Ief4ec36d8ebeb3085bb3cf7ee33f1160f151048d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 10:02:14 +00:00
Edgar Wang
29e0c470e6
Merge "Prevent screen capture for Desktop Backup Password" into main
2023-07-18 09:54:14 +00:00
Zoey Chen
6572d4d09e
Merge "[Language] Should show confirm dialog when deleting the system language and making the second language automatically become the system language" into udc-qpr-dev am: 7fd3730909
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069201
Change-Id: Ia4b899202fd8e56d64c20a8fc77d9175b8583aee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 09:20:59 +00:00
Zoey Chen
7cabb0d55f
Merge "[Language] Do not back to previous page if dialog is displaying." into udc-qpr-dev am: 43bd9db3c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23902484
Change-Id: I7aa4ed9306d567605aa6e64e5938e1f14b391254
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 09:20:43 +00:00
Vania Januar
a7d9944090
Merge "USB firmware update for stylus in Stylus USI Device Details" into main
2023-07-18 09:16:13 +00:00
Zoey Chen
7fd3730909
Merge "[Language] Should show confirm dialog when deleting the system language and making the second language automatically become the system language" into udc-qpr-dev
2023-07-18 08:34:37 +00:00
Zoey Chen
43bd9db3c6
Merge "[Language] Do not back to previous page if dialog is displaying." into udc-qpr-dev
2023-07-18 08:34:34 +00:00
Vincent Wang
91d6df7d60
Remove ignore annotation @Ignore("b/282413778")
...
Use FaceUdater.enroll to avoid Proguard remove this method
Bug: 291194547
Test: atest FaceUpdaterTest
Change-Id: I3b0c5557c4b4ebab6828fae831697a2b1a4daea5
2023-07-18 08:07:09 +00:00
Chaohui Wang
03959986c4
Rename to AppListTwoTargetSwitchItem
...
From AppListSwitchItem.
Bug: 201358903
Test: manual - on App Notification page
Change-Id: Ie2350e24b26a74040a29043e77d8b0b44df6b92a
2023-07-18 15:24:55 +08:00
Angela Wang
940e02b807
Show connecting hearing devices in A11y hearing devices page
...
We only show connected hearing devices in the hearing devices page now.
When user pairing a device from pairing page and back to the hearing
devices page after the device is bonded, it's confusing no device shown
in the list because the device is still connecting to profiles. We
should show the connecting device to avoid confusion.
Bug: 283268686
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DeviceListPreferenceFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableHearingDeviceUpdaterTest
Change-Id: Id3b29c12b80c282736a3e6ca73bcf317e0652b89
2023-07-18 04:30:59 +00:00
Shawn Lin
b30887fff4
Merge "Revert "Fix lock pattern is truncated during SUW in folded state"" into udc-qpr-dev am: c23c6164bb am: 0e404ee882
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24100906
Change-Id: I8603c84920403b90f46e63ce0bd6d6a23a90a7df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 04:28:31 +00:00
Shawn Lin
0e404ee882
Merge "Revert "Fix lock pattern is truncated during SUW in folded state"" into udc-qpr-dev am: c23c6164bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24100906
Change-Id: I540233d2c45f5f8b079a630df3ccb59cf6e818c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 03:45:15 +00:00
Shawn Lin
c23c6164bb
Merge "Revert "Fix lock pattern is truncated during SUW in folded state"" into udc-qpr-dev
2023-07-18 03:18:12 +00:00
Chun-Wei Wang
56d26ff56c
Merge changes from topic "simplify_pw" into udc-qpr-dev am: e414d40e60 am: 3f4b3fdce8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23840849
Change-Id: I3e2974a91c86aecf459ce51f9afdbf6175b8faed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 02:36:44 +00:00
Ken Lin
c655c82ada
Settings crashed when changing the Screen Resolution
...
Check if index is out of bound
Bug: 288256336
Test: Change to Full resolution, set Smallest width to 426 dp, then
switch to High resolution
Test: atest ScreenResolutionFragmentTest
Change-Id: Ida4128e76e097050b01deae91c9d669e58ab9e8f
2023-07-18 02:30:09 +00:00
Chun-Wei Wang
3f4b3fdce8
Merge changes from topic "simplify_pw" into udc-qpr-dev am: e414d40e60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23840849
Change-Id: I900a6743122d4c9d514cfb2d406aafb793faead3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 01:49:43 +00:00
Chun-Wei Wang
e414d40e60
Merge changes from topic "simplify_pw" into udc-qpr-dev
...
* changes:
Handle EXTRA_KEY_REQUEST_WRITE_REPAIR_MODE_PW
Extract common code to SaveChosenLockWorkerBase
2023-07-18 01:17:13 +00:00
Chun-Wei Wang
c726bd48b4
Handle EXTRA_KEY_REQUEST_WRITE_REPAIR_MODE_PW
...
So the new password can be saved per caller's request.
This will remove the additional step to ask the user
to enter the new credential again and thus simplifying
the UI flow.
Bug: 271968977
Bug: 277561275
Test: atest SettingsUnitTests:SaveAndFinishWorkerTest
Test: atest ChooseLockPasswordTest
Change-Id: I20232619225b17edda0a72dad43b120d5a249203
2023-07-17 23:04:45 +00:00
Treehugger Robot
56a76c7038
Merge "Show LE audio toggle in Device Detail by default" into udc-qpr-dev am: 2fdc9c943b am: f07e5f7520
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002323
Change-Id: I642988621d5e208cf5acbab6e88ecd3fdae45e41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 22:18:35 +00:00
Shivangi Dubey
b5a6c7a020
Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev am: 8c68b0e7e2 am: 32d914ea56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23832963
Change-Id: I340d008ea78939a614e8b33f83c212421d4388d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 16:48:24 +00:00
Vania Januar
f04363547a
USB firmware update for stylus in Stylus USI Device Details
...
Bug: 288850921
Test: StylusUsbFirmwareControllerTest, UsbStylusBroadcastReceiverTest
Change-Id: Ic7cb35799ff00f9998ca569eb4ae091f8010780a
2023-07-17 13:49:30 +00:00
Shawn Lin
072a0e0068
Revert "Fix lock pattern is truncated during SUW in folded state"
...
This reverts commit a2e032bb8e .
Reason for revert: b/290721507
Change-Id: Ifaaecde6c168ebe22d3b2245df1fd5b0a9c1b8c2
2023-07-17 12:20:42 +00:00
Iván Budnik
470b661c82
Inline shouldDisableMediaOutput into Settings app
...
This allows the removal of a MediaRouter2Manager reference in
SettingsLib. Eventually, the inlined methods should be replaced with an
appropriate long-term alternative through SettingsLib.
This is a non-functional change.
Bug: 192657812
Test: Presubmit
Change-Id: I9f5dd6720fd95389335fec9e0689a40d88d30d46
2023-07-17 10:16:42 +00:00
Treehugger Robot
f07e5f7520
Merge "Show LE audio toggle in Device Detail by default" into udc-qpr-dev am: 2fdc9c943b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002323
Change-Id: I7006714cd6b249f8dc791703c3daaddb0ade2f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 03:42:18 +00:00
Treehugger Robot
2fdc9c943b
Merge "Show LE audio toggle in Device Detail by default" into udc-qpr-dev
2023-07-17 03:34:51 +00:00
Chaohui Wang
9e62a492f4
Merge "[BT] Correct the filter when addCachedDevices" into udc-qpr-dev am: 683296f180
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025004
Change-Id: I342823c900601345cd622bf7e0b0aab0879b9799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 03:18:43 +00:00
Chaohui Wang
683296f180
Merge "[BT] Correct the filter when addCachedDevices" into udc-qpr-dev
2023-07-17 02:36:29 +00:00
Zoey Chen
4900bcfa5c
[Language] Should show confirm dialog when deleting the system language
...
and making the second language automatically become the system language
Bug: 286508825
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleListEditorTest
Change-Id: I556eecc9eec1ddcdb8947d5ba69d0db2c016e33c
2023-07-14 16:06:40 +00:00
Shivangi Dubey
32d914ea56
Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev am: 8c68b0e7e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23832963
Change-Id: I1bd342d5e2649e13734aa504f461bf12a141c819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 14:22:00 +00:00
Shivangi Dubey
8c68b0e7e2
Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev
2023-07-14 13:35:55 +00:00
Zoey Chen
088bb6a35e
[Language] Do not back to previous page if dialog is displaying.
...
Bug: 288827218
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleDialogFragmentTest
Change-Id: I914b1e1d96aacf5369e5149f34968ef625548525
2023-07-14 09:05:10 +00:00
Chaohui Wang
0b48ffdd6e
Merge "Remove context from powerUsageFeatureProvider" into main
2023-07-14 08:36:27 +00:00
Xinyi Mao
891cb2acb4
Merge "Add 25% and 75% lines to improve the readability of the battery level as a short-term fix." into udc-qpr-dev am: 6c12390bab am: a5e2586018
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24037114
Change-Id: I0d8e4445a1a55ecc58c428dde05fb69cc35e9583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 07:45:52 +00:00
Xinyi Mao
a5e2586018
Merge "Add 25% and 75% lines to improve the readability of the battery level as a short-term fix." into udc-qpr-dev am: 6c12390bab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24037114
Change-Id: Ia9abd00ab92335a2752b053e06861e2cedcf0b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 07:07:56 +00:00
Xinyi Mao
6c12390bab
Merge "Add 25% and 75% lines to improve the readability of the battery level as a short-term fix." into udc-qpr-dev
2023-07-14 06:31:30 +00:00
Treehugger Robot
3b7abccc6e
Merge "Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest" into udc-qpr-dev am: b544871b38 am: 486451e9cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002332
Change-Id: I470e36951003125f6a97dca2c71d655b2904abcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 06:16:48 +00:00
mxyyiyi
881d625b25
Add 25% and 75% lines to improve the readability of the battery level as a short-term fix.
...
[Screenshot]
Before: https://screenshot.googleplex.com/5WDToTZsRcosbjC
After: https://screenshot.googleplex.com/C4XJ4Mnigxa27gq
Bug: 260498797
Fix: 260498797
Test: Manual
Change-Id: I08c8ec3b2868c59d341ce34d93b6e010e3440cf5
2023-07-14 13:51:56 +08:00
Chaohui Wang
512caa568a
[BT] Correct the filter when addCachedDevices
...
In Change Ia9750adb6b4c1424d084381e9d7c2ca8e7912391, addCachedDevices()
becomes async, but the filter is set outside of addCachedDevices(),
which makes the filter not apply to addCachedDevices().
Direct pass the filter to addCachedDevices() to fix this issue.
Also migrate the test to Kotlin so we can test coroutine.
Fix: 289876965
Test: manual - check BT pairing page
Test: m RunSettingsRoboTests
Change-Id: I95b16840881747ec9f69e5cd778e456bcc8a7626
(cherry picked from commit 8dd32ab07d )
Merged-In: I95b16840881747ec9f69e5cd778e456bcc8a7626
2023-07-14 05:40:03 +00:00
Treehugger Robot
486451e9cf
Merge "Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest" into udc-qpr-dev am: b544871b38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002332
Change-Id: I67b7e296e56e50c9745ca36e5994f06663ccb56d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 05:14:04 +00:00