Vania Januar
53988c6fe7
Merge "Do not show a summary in Tail button preferences if no app found" into udc-qpr-dev am: 82c36c5cb5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23876589
Change-Id: I10586591c2e6f0ec8efe1ea57e3050463fc0e4a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 15:31:18 +00:00
Vania Januar
82c36c5cb5
Merge "Do not show a summary in Tail button preferences if no app found" into udc-qpr-dev
2023-07-19 14:57:54 +00:00
YK Hung
a386366550
Merge "Add support of RTL design for battery ussage chart." into udc-qpr-dev am: 448891b6bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24080658
Change-Id: I40198103d577465b1e0474b2ef1d5c46db57172a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 09:35:27 +00:00
YK Hung
9dcf5fde57
Merge "Provide a method to detect battery usage history(1/2)" into udc-qpr-dev am: e27abc04ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24074844
Change-Id: Icd04bde44d6c9ee0a3cb2aa8c77fbd0e05fd2eed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 09:35:05 +00:00
YK Hung
448891b6bc
Merge "Add support of RTL design for battery ussage chart." into udc-qpr-dev
2023-07-19 08:46:16 +00:00
YK Hung
e27abc04ac
Merge "Provide a method to detect battery usage history(1/2)" into udc-qpr-dev
2023-07-19 08:44:24 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
Chun-Wei Wang
dc02e7cbf2
Merge changes If96ac99a,I45ab17cf into udc-qpr-dev am: 394baf2919
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24059809
Change-Id: I6060123ce095b259e8b63b808eb0c7ef52463402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 23:06:02 +00:00
Chun-Wei Wang
394baf2919
Merge changes If96ac99a,I45ab17cf into udc-qpr-dev
...
* changes:
Remove invalid test
Remove invalid test
2023-07-14 22:18:19 +00:00
Bill Yi
3d87ba08ba
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24068200
Change-Id: I8b6b91b0968e865accab0e6075266b39cf4fa375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 21:06:33 +00:00
Bill Yi
1194c09396
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a4
-s ours am: a4f2a82d44
-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: I047c57ed74bb390d8f8613ca94a948877b4638e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 21:02:26 +00:00
Bill Yi
8695b7f2fa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2764a59fac
-s ours am: ef607acf40
-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: I6499598a26e7026aaf3d0c63d9635a6c58a72591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 21:02:04 +00:00
Bill Yi
d704d74ed9
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24068200
Change-Id: I0fbdc8ded00fb5c0178b3e8692d485f591288d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:58:03 +00:00
Automerger Merge Worker
8d18c44b4f
Merge changes from topic "am-c46e753e59a04ec0be6cb1735ffa925e" into udc-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2531d5736b
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f21bb3ba0
-s ours
2023-07-14 20:56:42 +00:00
Automerger Merge Worker
7a561f02d5
Merge changes from topic "am-6f9e4022de18455493ebda8b0cfe7548" into udc-d1-dev-plus-aosp am: b273d4ce5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069343
Change-Id: I2cecedafa4cadeb6d0b14a1df802dfc00793dab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:54:29 +00:00
Bill Yi
4bd8c55370
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a4
-s ours am: 4249011ef2
-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: If63f6a02d81c97c0e3e2bd144ccdace9493ffe8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:54:12 +00:00
Bill Yi
734ddee1de
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2531d5736b
-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: I478b0aaa6d46e0e6d5231a0375293d2647272b9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:54:03 +00:00
Bill Yi
8acb814c0a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f21bb3ba0
-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: I06369143cdc186b47a637fce5defbe5817bdcd69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:53:32 +00:00
Automerger Merge Worker
919797970e
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
2023-07-14 20:44:48 +00:00
Bill Yi
94d5c18859
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24068200
Change-Id: I2d429258bb7c7aaaf9685639719290a6cd8e674f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:44:18 +00:00