PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,688 Commits 1 Branch 0 Tags
693711469df15506b1467d71b84686f3acb6bae2
Commit Graph

113688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Lucas Silva
de1d043b8a Merge "Move "when to dream" settings upwards for greater visibility" into tm-qpr-dev am: 3535dcfdf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19484508

Change-Id: Ib01930dd073684fa8cf6e549368a208bf26d29fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-03 01:09:00 +00:00
Lucas Silva
3535dcfdf4 Merge "Move "when to dream" settings upwards for greater visibility" into tm-qpr-dev 2022-08-03 00:39:32 +00:00
Menghan Li
6fd05aa80a Merge "Unify the caption preference class naming" 2022-08-02 22:15:31 +00:00
Tiffany Nguyen
5ecb1a1d69 Add Apps > Battery optimization page implementation. 
Moving the old restricted page to the new optimization page will happen
in a follow-up CL.

Test: Unit, manual
Bug: 238026672
Change-Id: I5fee9ebe03284a013da6bfca9ada8b166c6af91c
 2022-08-02 18:43:53 +00:00
Eric Biggers
7b0c71fdbc Merge "UserCredentialsSettings: remove unneeded checks for locksettings keys" 2022-08-02 18:07:47 +00:00
Jason Chang
57435d65e9 (1/n) Fix Face Unlock LottieAnimationView IllustrationViewView 
ImageView truncate in GlifLayout (face_enroll_education.xml)

Adjust layout margin and scale type to fulfil different
Display & Font size on device.

Bug: 233835795

Test: manually change different Display & Font size to test UI.
Change-Id: Ia54bc6a2b0cc4522416bda3d051730d3cbd349f5
 2022-08-02 21:16:38 +08:00
Bonian Chen
a03efb7701 Merge "[Settings] Remove unused code from AOSP" 2022-08-02 09:30:57 +00:00
Jason Chang
72a1fed542 Merge "Fix RTL issue on fingerprint setup screens in landscape mode" into tm-qpr-dev am: 7546b87a17 am: 0e7374b7ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19337646

Change-Id: I822db7f74147805a6cd51cf236d2acf1279df023
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 08:44:09 +00:00
Jason Chang
0e7374b7ef Merge "Fix RTL issue on fingerprint setup screens in landscape mode" into tm-qpr-dev am: 7546b87a17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19337646

Change-Id: Icd787eea9cc845e7ce7a2a102fce09c8e6491fd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 08:17:53 +00:00
Jason Chang
7546b87a17 Merge "Fix RTL issue on fingerprint setup screens in landscape mode" into tm-qpr-dev 2022-08-02 07:58:08 +00:00
Robert Luo
b7666d1eab Merge "Allow advanced VPN to manage connection status via its UI" 2022-08-02 07:24:34 +00:00
Bonian Chen
aef21d40d0 [Settings] Remove unused code from AOSP 
Code refactor.

Bug: 239114165
Change-Id: Id6afd81ad8e7d4a005044602bcdd1918898a864b
Test: auto testing
 2022-08-02 05:03:40 +00:00
Arc Wang
79042f2d28 Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 am: 6945e70c02 am: c80890c7dd am: 85768c5916 am: ee4c9b6a11 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: Icfbb8218dcba3ad95d6d0ba8f9995c4cceb53f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 04:49:01 +00:00
Arc Wang
ee4c9b6a11 Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 am: 6945e70c02 am: c80890c7dd am: 85768c5916 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: I2ca9ead163513a72e73d10af44df5112c05b61b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 04:30:17 +00:00
Arc Wang
85768c5916 Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 am: 6945e70c02 am: c80890c7dd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: I615d41ee10fd988b6e91685b7ac3f32a9ddf5f5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 04:04:26 +00:00
Arc Wang
c80890c7dd Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 am: 6945e70c02 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: Ib4fcff818a81a38c08f31d552706fc567ec00daa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 03:45:28 +00:00
Arc Wang
6945e70c02 Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: I70b0ae924d8a4410cc29e7f494e85a9b8a7d3abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 03:26:39 +00:00
Arc Wang
671fa153e8 Merge "Crash happens if back button is pressed during "Format as Portable"" 2022-08-02 03:11:13 +00:00
Himanshu Rawat
d67cef4078 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev am: 221c09d8df -s ours am: 27ce614bf2 -s ours am: 47f97471a2 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I611d743e77813473d71d23321d42a78b01dc3fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 02:36:24 +00:00
Himanshu Rawat
090de10295 [automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd50 -s ours am: 6076d3acc2 -s ours am: 225958b5b9 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I861a0a13f9e966196688497a4b97fa558389895f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 02:36:23 +00:00
Himanshu Rawat
4c8cd12416 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev am: 221c09d8df -s ours am: c6d15199d7 -s ours am: 67f88122a1 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 dc7aa0e87f is already in history

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

Change-Id: Iced0e7e2f1a7940143f0a95464d7ce20d7be48a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 02:36:12 +00:00
Himanshu Rawat
8062d6d8df [automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd50 -s ours am: 5dd2f5e3ee -s ours am: f56b361567 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 dc7aa0e87f is already in history

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

Change-Id: I56fd60fac838230eb57e2d1908b359d946e78db1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 02:36:08 +00:00
menghanli
e57125650d Unify the caption preference class naming 
Bug: 197695932
Test: make RunSettingsRoboTests
Change-Id: Ice244442ad21e6d9f006d488992e9f58cf5c8fb0
 2022-08-02 10:25:15 +08:00
Himanshu Rawat
47f97471a2 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev am: 221c09d8df -s ours am: 27ce614bf2 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I06b25f57987d0fe989e685058728574e9146f3d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 02:18:24 +00:00
Himanshu Rawat
225958b5b9 [automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd50 -s ours am: 6076d3acc2 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I6667d097a83ba4572f34786225fe6e6f4cbd1a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 02:18:11 +00:00
Himanshu Rawat
67f88122a1 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev am: 221c09d8df -s ours am: c6d15199d7 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 dc7aa0e87f is already in history

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

Change-Id: I61f476145079fc1c972b5b9dbf3ba95dbfdf3bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 02:17:54 +00:00
Himanshu Rawat
f56b361567 [automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd50 -s ours am: 5dd2f5e3ee -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 dc7aa0e87f is already in history

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

Change-Id: I3e258177d5ffd9802279dc74032992fb7981f479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 02:17:51 +00:00
Himanshu Rawat
27ce614bf2 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev am: 221c09d8df -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I0ea9b45a24b621b6d2496bc394dd5036309fa6b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 02:01:17 +00:00
Himanshu Rawat
6076d3acc2 [automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd50 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I8c5189fccea87548e4395ae69f6fdb325377e5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 02:01:16 +00:00
Himanshu Rawat
c6d15199d7 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev am: 221c09d8df -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 dc7aa0e87f is already in history

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

Change-Id: Ibf7d266960a44c030e707282b04b693627c21197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 02:01:14 +00:00