Angela Wang
079ac4f3a5
Merge "Enable scrolling in screen flash color selector dialog" into udc-qpr-dev am: 81a3646462
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23875506
Change-Id: Ifd3337358a62ba1eb28095e8111b673fc1fb7043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 07:43:30 +00:00
Chaohui Wang
80744abb37
Remove context from BluetoothFeatureProviderImpl
...
Which is not used.
Bug: 286764889
Test: m Settings
Change-Id: I3f82d53f667d9802585f67f0e028ca52114a055e
2023-07-19 15:14:44 +08:00
Angela Wang
81a3646462
Merge "Enable scrolling in screen flash color selector dialog" into udc-qpr-dev
2023-07-19 07:07:04 +00:00
Ken Lin
03acd52067
Merge "Settings crashed when changing the Screen Resolution" into udc-d1-dev am: a6f2464e8c
am: face5b6c2a
am: 27c4b3b6c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24109923
Change-Id: I568a4b65a08e4e0fbf6dcdf597c38f77c18312a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 06:35:53 +00:00
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
Angela Wang
653ff8a485
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
Merged-In: Id3b29c12b80c282736a3e6ca73bcf317e0652b89
2023-07-19 06:29:11 +00:00
Ken Lin
27c4b3b6c6
Merge "Settings crashed when changing the Screen Resolution" into udc-d1-dev am: a6f2464e8c
am: face5b6c2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24109923
Change-Id: I8b3db99ccc9a7f137a59d6a45257e9055673f25b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 05:51:26 +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
face5b6c2a
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: I5554e3263baf46c64ba2286a80e5cb83da5d4098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 05:08:37 +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
Wesley Wang
e3d5e38834
Provide a method to detect battery usage history(1/2)
...
Bug: 290893324
Test: make SettingsRoboTests
Change-Id: Ief4e11b2c3afddb99a50c9d0148d78d4d581d34f
2023-07-19 11:59:56 +08:00
Ken Lin
a6f2464e8c
Merge "Settings crashed when changing the Screen Resolution" into udc-d1-dev
2023-07-19 03:58:47 +00:00
Bill Yi
3947a0ba6c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1832da3618
-s ours am: bdd072d1a1
-s ours am: 72e7b9a688
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24120725
Change-Id: I24b2143fc0d50f2fc880d50b9ace44fa74b7e451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 03:55:11 +00:00
Bill Yi
72e7b9a688
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1832da3618
-s ours am: bdd072d1a1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24120725
Change-Id: I3c9e765b183c9d2fe4d01d5425d1a1d889685110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 03:43:59 +00:00
Bill Yi
418ddd11bb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1832da3618
-s ours am: 6da21a6726
-s ours am: 583852d475
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24120725
Change-Id: I5b4444d43820bf23df22551645bb8124e9507e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 03:38:41 +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
Bill Yi
583852d475
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1832da3618
-s ours am: 6da21a6726
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24120725
Change-Id: I17a0f27bb6e6993a5235697980e2eb83348b5c19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 02:54:10 +00:00
Bill Yi
bdd072d1a1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1832da3618
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24120725
Change-Id: Iace76c484a807732f8ce8325ff140d46b148c082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 02:39:30 +00:00
Bill Yi
6da21a6726
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1832da3618
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24120725
Change-Id: I2f38d70ec0287b0a965b897b7eb471d037e7aadd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 02:34:21 +00:00
mxyyiyi
fe667193d1
Add support of RTL design for battery ussage chart.
...
[Screenshots]
English(LTR): https://screenshot.googleplex.com/8nHkVNHnGajP9Lh
Hebrew (RTL): https://screenshot.googleplex.com/BrFSwEKq3xPmbnY
Bug: 250682309
Fix: 250682309
Test: Manual
Change-Id: I0b1b6a6e28af1d60c3d81a7b8bca58996fab313d
2023-07-19 10:20:02 +08:00
Bill Yi
1832da3618
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic74eb981990ec4d4855818cf41b6ce2da99311dc
2023-07-18 14:41:23 -07: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
Vania Januar
986fe4ebc1
USB firmware update for stylus in Stylus USI Device Details
...
Bug: 288850921
Test: StylusUsbFirmwareControllerTest, UsbStylusBroadcastReceiverTest
Change-Id: Ic7cb35799ff00f9998ca569eb4ae091f8010780a
Merged-In: Ic7cb35799ff00f9998ca569eb4ae091f8010780a
2023-07-18 14:09:05 +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
Yanting Yang
91d18534a3
Merge "Update the about device warning message" into main
2023-07-18 07:44:58 +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
Yanting Yang
65f22b9b18
Update the about device warning message
...
Apply a common warning description for all products as per the product
and UX review.
Bug: 282233849
Test: visual
Change-Id: I6e4939fca8cf6c67c400e5a417fb370495cb15e0
2023-07-18 12:14:19 +08: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