Commit Graph

132563 Commits

Author SHA1 Message Date
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
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
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
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
Chaohui Wang
55aa137321 [automerger skipped] Merge "[BT] Correct the filter when addCachedDevices" into udc-qpr-dev am: 683296f180 am: 9e62a492f4 -s ours
am skip reason: Merged-In I95b16840881747ec9f69e5cd778e456bcc8a7626 with SHA-1 8dd32ab07d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025004

Change-Id: I8cc27a9fc1f31fcadd7822acbc04e766b7839ff5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 22:15:49 +00:00
Chun-Wei Wang
80d348e343 Merge changes If96ac99a,I45ab17cf into udc-qpr-dev am: 394baf2919 am: dc02e7cbf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24059809

Change-Id: I413fd5b6323c32438574ec609edc1a80ae0094cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:52:16 +00:00
Bill Yi
df022f13ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 1e86da303c -s ours am: c4fdbfe95d -s ours am: 3d87ba08ba -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24068200

Change-Id: Iab5ecf41988d182f7f3f32e3d62161a3674961dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 20:20:35 +00:00
Bill Yi
43b55a3d8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a4 -s ours am: a4f2a82d44 -s ours am: 1194c09396 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069343

Change-Id: I773624c7c289e6c717239d661bd30f2e0038c844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 19:51:00 +00:00
Bill Yi
50c2cf042a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2764a59fac -s ours am: ef607acf40 -s ours am: 8695b7f2fa -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069343

Change-Id: If10e4dfcd075ed56e2d6e060b9efd335af3e7f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 19:50:41 +00:00
Bill Yi
ed4769a083 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 1e86da303c -s ours am: 72295da2e5 -s ours am: d704d74ed9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24068200

Change-Id: Ia3f70f7c3f954f00ca7c76ef8e1c943a06b7a86a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 19:32:37 +00:00
Automerger Merge Worker
8d8ecf1051 Merge changes from topic "am-c46e753e59a04ec0be6cb1735ffa925e" into udc-qpr-dev-plus-aosp am: 8d18c44b4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24075805

Change-Id: Idd02a3b67ec36a2f785819d0565c174cd0c99cca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 19:29:02 +00:00
Bill Yi
3661791ece [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2531d5736b -s ours am: 734ddee1de -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24075805

Change-Id: I95bd92435a6099ea0c583ac5346cde9503750697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 19:28:42 +00:00
Automerger Merge Worker
729874bb31 Merge changes from topic "am-6f9e4022de18455493ebda8b0cfe7548" into udc-d1-dev-plus-aosp am: b273d4ce5e am: 7a561f02d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069343

Change-Id: I48322962b6936c2af84f2bf7cb74d2e84a188fff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 19:08:25 +00:00
Bill Yi
d0953b8aaa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a4 -s ours am: 4249011ef2 -s ours am: 4bd8c55370 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069343

Change-Id: I5912f18bf6e6f454e12232d6525a896fa9d3595f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 19:08:05 +00:00
Automerger Merge Worker
511f747194 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 208c74fa3c -s ours am: 25fabc93a5 -s ours" into udc-qpr-dev-plus-aosp am: 919797970e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24068200

Change-Id: I82ab482da6cc85e2089c75945a982636562f20b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 19:02:42 +00:00
Bill Yi
a4934cbb9a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 208c74fa3c -s ours am: 25fabc93a5 -s ours am: 94d5c18859 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24068200

Change-Id: I5972120a9efacba665102e29fc028854f4c14008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 19:02:28 +00:00
Bill Yi
75ee9ec4da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours am: 0cc5a16f95 -s ours am: 797d51f7cb -s ours am: 324f9dc0ee -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069363

Change-Id: I48eeb3347548026671429943809138822d1d9d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 18:42:43 +00:00
Bill Yi
b28521a13a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours am: f74197dd3c -s ours am: c69e38797c -s ours am: 7c58a2edb3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069363

Change-Id: I82a0d9b807eebb758a0db098259abb848c87baba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 18:40:16 +00:00
Bill Yi
53f84aea6f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours am: 0cc5a16f95 -s ours am: a5dc181d3c -s ours am: 05aa8c0efd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069363

Change-Id: Ic329539026d3a1033ad94378c1d046e4c339a7d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 18:19:13 +00:00