Commit Graph

113922 Commits

Author SHA1 Message Date
Bill Yi
fdf95d710f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72fe892fc6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iea80c3cb8196cd59fce903048f7551186da69b46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-07 05:14:27 +00:00
Bill Yi
17d747ac65 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08ec847877 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iac0dac73ef8ad72aa68e69b40a2fe5d8637831b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-07 05:14:21 +00:00
TreeHugger Robot
5548f250c7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-08-07 04:54:35 +00:00
TreeHugger Robot
48224eca28 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-07 04:54:21 +00:00
TreeHugger Robot
9288eb878a Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-08-07 04:51:08 +00:00
Thomas Nguyen
874e9def60 Merge "Provide useful hint when invalid SIM PIN is entered during changing SIM PIN" 2022-08-05 20:08:13 +00:00
TreeHugger Robot
52ac9bea7e Merge "Updates battery usage messages from last 24hr to last full charge. (Part2: non-V2 files)" 2022-08-05 18:34:48 +00:00
András Kurucz
8c66423583 Merge "Fix overlapping text in NotificationHistoryActivity" into tm-qpr-dev am: 9ba2443661 am: b795e3c0a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19457453

Change-Id: Ibaab09e3b8051e82c868121f6f0145fdccfac883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 07:42:09 +00:00
András Kurucz
b795e3c0a7 Merge "Fix overlapping text in NotificationHistoryActivity" into tm-qpr-dev am: 9ba2443661
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19457453

Change-Id: Icc7805eeefb09d9a9c40f6b3c840c33c5ca587d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 07:20:45 +00:00
András Kurucz
9ba2443661 Merge "Fix overlapping text in NotificationHistoryActivity" into tm-qpr-dev 2022-08-05 07:00:07 +00:00
Zaiyue Xue
693711469d Updates battery usage messages from last 24hr to last full charge. (Part2: non-V2 files)
Test: manual
Bug: 236101166
Change-Id: Id5ad3e859a01d3288a950bf6288eafc6144a23d6
2022-08-05 10:52:38 +08:00
Menghan Li
ddfb5f5cb4 Merge "Fix insufficient contrast for the strings "Dimmer" and "Brighter" in the light theme" 2022-08-04 21:52:57 +00:00
Omer Osman
cb075f9f53 Merge "Add support for selection of Opus in Developer Options" into tm-qpr-dev am: cb930bc0ff am: c0209a6e7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17901372

Change-Id: Id5a9bd7295c995b2e653480d86c6054763766303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 20:03:56 +00:00
Omer Osman
c0209a6e7a Merge "Add support for selection of Opus in Developer Options" into tm-qpr-dev am: cb930bc0ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17901372

Change-Id: I5f3658d3d580858c502c8b44ff540723118c2021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 19:00:13 +00:00
Thomas Nguyen
a2b0146d07 Provide useful hint when invalid SIM PIN is entered during changing SIM PIN
Bug: 241441049
Test: Manually tested with Pixel 6 Pro

Change-Id: Ie7239ad397dfeacd59f1483953392ee7935cfd07
2022-08-04 18:58:42 +00:00
TreeHugger Robot
1c3aeeae97 Merge "Revert "Refactor BiometricEnrollBase::onStop()"" 2022-08-04 18:49:20 +00:00
Xinyi Zhou
0e69d78c6f Merge "Revert "Delete Fast Pair Settings"" 2022-08-04 18:01:37 +00:00
Omer Osman
cb930bc0ff Merge "Add support for selection of Opus in Developer Options" into tm-qpr-dev 2022-08-04 17:40:21 +00:00
Chaohui Wang
f9d10b6610 Merge "Clean up unused Fingerprint Settings strings" 2022-08-04 15:30:48 +00:00
Sayak Dutta
2d00647cd6 Merge "Update back FooterButton visibility for navigation instead of back button" 2022-08-04 10:29:47 +00:00
Edgar Wang
63b0689171 Apply phrase based line breaking on most of preference. am: 7924108893 am: 300473cea1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394738

Change-Id: If72ecbe25be1a10003c4ea630d2fd73c6180c73f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 09:55:01 +00:00
TreeHugger Robot
85b03538d0 Merge "Update the selected period message in battery chart" 2022-08-04 09:51:07 +00:00
TreeHugger Robot
753888bed9 Merge "Show one SIM only for EAP-SIM when dual SIMs have the same carrier ID" 2022-08-04 09:50:27 +00:00
TreeHugger Robot
bc52343473 Merge "Updates battery usage messages from last 24hr to last full charge. (Part1: V2 files)" 2022-08-04 09:45:50 +00:00
Edgar Wang
300473cea1 Apply phrase based line breaking on most of preference. am: 7924108893
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394738

Change-Id: Id9c984d0d79c25e2b0bb87ab59e3b9642d325b66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 09:35:56 +00:00
Milton Wu
da7f6fca7a Revert "Refactor BiometricEnrollBase::onStop()"
This reverts commit 6b6d8c0d6d.

Reason for revert: Should use shouldFinishWhenBackgrounded() to
control the behavior during onStop()

Bug: 197717071
Change-Id: I6aeacd5fb0d4400911a2e3d1567db660a0f1798a
2022-08-04 09:29:26 +00:00
Bill Yi
81b949bbd0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2dcbbf96274099824349e6469e0d9ff80e2a6a69
2022-08-04 02:12:16 -07:00
Bill Yi
9d03b14bd2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I194ebb751ea7fe7b31022360dc4aa138633d1b66
2022-08-04 01:41:33 -07:00
Bill Yi
08ec847877 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1a9b32d7d649ef38268cbe5de9db73dc0e5a2de7
2022-08-04 01:36:59 -07:00
Bill Yi
444ead6a2e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6da0818ca33daaf08bf8f6d3f508d594d32a519a
2022-08-04 01:32:29 -07:00
Bill Yi
a98a6d5a00 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7093be5bfbde5f958b65ef10d42d74884add0687
2022-08-04 01:27:22 -07:00
Bill Yi
72fe892fc6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6cd9698629063b3c10f043f57a0e5b3df6780a8c
2022-08-04 01:19:33 -07:00
Bill Yi
658d1cfd1a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1800bfc93af5e569ebbb5fa4d1eb81fa41e5d4ba
2022-08-04 01:14:22 -07:00
Zaiyue Xue
49e67c9f33 Updates battery usage messages from last 24hr to last full charge. (Part1: V2 files)
Test: manual
Bug: 236101166
Change-Id: I0aa9a1a4c902764bb9937e422e5e7f60b6e86859
2022-08-04 14:59:58 +08:00
Zaiyue Xue
e2087bb5f3 Update the selected period message in battery chart
screenshots: https://drive.google.com/drive/folders/1pxyrmaerZbD2FdEJohnsgqACXXno1Ve5?resourcekey=0-SXu6D9TLvmXDVgVKkZge8Q&usp=sharing
Next cl will change "last 24hr" to "last full charge".

Test: manual
Bug: 236101166
Change-Id: If850d65056add04f0b2ecb6aed418e799ae15fb6
2022-08-04 14:54:53 +08:00
sayakiitg
40e436ff3b Update back FooterButton visibility for navigation instead of back button
Bug: 201252175
Change-Id: I6c99b1173bd8ef90b89dedc49745fdb2bcf11318
2022-08-04 06:23:24 +00:00
Xinyi Zhou
6db89c73d6 Revert "Delete Fast Pair Settings"
This reverts commit 3438e20da1.

Reason for revert: Fast Pair Project is resumed

Test: loaded on device
Change-Id: I54f68794be9c527c5c873e301aada51bcdb6e298
2022-08-03 22:07:07 -07:00
menghanli
a8b9c805a2 Fix insufficient contrast for the strings "Dimmer" and "Brighter" in the light theme
Apply same the sub text style from seekbar preference

Bug: 219752953
Test: Manual testing
Change-Id: If107452b942e23dee17c73873f4aedc3a25c7f5d
2022-08-04 11:57:53 +08:00
PETER LIANG
1fa91563b2 Merge "Fix that the padding top/bottom of the preview was wrong when display size is smallest." 2022-08-04 02:43:03 +00:00
Peter Liang
5d4f28d65a Fix that the padding top/bottom of the preview was wrong when display size is smallest.
Add the padding from settingslib into.

Bug: 241247826
Test: manual test
Change-Id: Ia5f72bc6d6591a6245e623a10bdd3656935a38c4
2022-08-04 00:21:22 +08:00
Tiffany Nguyen
0e37ac8d7a Merge "Add Apps > Battery optimization page implementation." 2022-08-03 15:02:11 +00:00
TreeHugger Robot
8d1c50b4dc Merge "Support showing app usage list for two battery charts" 2022-08-03 11:49:26 +00:00
Kuan Wang
b6b6ae4ef0 Always do interpolation for battery level data in daily chart.
Bug: 236101687
Test: make RunSettingsRoboTests
Change-Id: I07ca512ceb7a74da4256f5d6fffed6d2432f89e0
2022-08-03 09:32:22 +00:00
Zaiyue Xue
ba6c435eff Support showing app usage list for two battery charts
Test: manual
Bug: 236101166
Change-Id: I29b4615bd5a967bcfd0a4ab378fec4e700dfc7f0
2022-08-03 08:57:48 +00:00
Edgar Wang
7924108893 Apply phrase based line breaking on most of preference.
Bug: 232992171
Test: manual
Change-Id: I5104e9d30f744f892bd921bffa168488e1c1e625
2022-08-03 04:40:23 +00:00
Weng Su
66922f4870 Show one SIM only for EAP-SIM when dual SIMs have the same carrier ID
- Because the wifiConfiguration save the carrier ID only for EAP-SIM authentication

- If multiple SIMs have the same carrier ID, the Wi-Fi framework will use the default data SIM for EAP-SIM authentication

- To avoid user confusion, show one SIM only when dual SIMs have the same carrier ID

Bug: 233765468
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test

Change-Id: I56f956d20053d314f082ba185d661d8e0a0ef3cb
2022-08-03 03:33:00 +00:00
Jason Chang
ab8624c6ef Merge "(1/n) Fix Face Unlock LottieAnimationView IllustrationViewView ImageView truncate in GlifLayout (face_enroll_education.xml)" into tm-qpr-dev am: 271a57d91b am: c1db187646
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19354194

Change-Id: Ifa88cdb887550248711b25df496191ef232634ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 03:32:48 +00:00
Jason Chang
c1db187646 Merge "(1/n) Fix Face Unlock LottieAnimationView IllustrationViewView ImageView truncate in GlifLayout (face_enroll_education.xml)" into tm-qpr-dev am: 271a57d91b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19354194

Change-Id: If257f448347eb5caabea551b3180709c86f93942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 03:13:45 +00:00
Jason Chang
271a57d91b Merge "(1/n) Fix Face Unlock LottieAnimationView IllustrationViewView ImageView truncate in GlifLayout (face_enroll_education.xml)" into tm-qpr-dev 2022-08-03 02:56:30 +00:00
Lucas Silva
ef344cda78 Merge "Move "when to dream" settings upwards for greater visibility" into tm-qpr-dev am: 3535dcfdf4 am: de1d043b8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19484508

Change-Id: I9adfb47e82034146619dbb0423ac5945c599d573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 01:25:57 +00:00