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
Menghan Li
6fd05aa80a
Merge "Unify the caption preference class naming"
2022-08-02 22:15:31 +00:00
Eric Biggers
7b0c71fdbc
Merge "UserCredentialsSettings: remove unneeded checks for locksettings keys"
2022-08-02 18:07:47 +00: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
Himanshu Rawat
5dd2f5e3ee
[automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd50
-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: Icd75fc8def2e27698b2ee0d2f9b622d5cb7c3f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 02:01:11 +00:00
Himanshu Rawat
221c09d8df
Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev
2022-08-02 01:41:58 +00:00
Automerger Merge Worker
0e6eaf06a5
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df
-s ours am: 015915736f
-s ours" into tm-qpr-dev-plus-aosp am: e5b6d1e219
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19472171
Change-Id: I895eff7ba4874192bafcbbe815b9b4953c2aa422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-01 17:59:28 +00:00
Bill Yi
145d855b2a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df
-s ours am: 015915736f
-s ours am: 2e312fd609
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19472171
Change-Id: I91333ba27db89c6eb6430535ee207bcdcbff5aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-01 17:59:06 +00:00
Bill Yi
8b91487fde
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df
-s ours am: 62fe245c46
-s ours am: 93082d95fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19472171
Change-Id: I26701ef9d4dce849b686a6d4551b529e2d9006bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-01 17:54:33 +00:00
Automerger Merge Worker
e5b6d1e219
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df
-s ours am: 015915736f
-s ours" into tm-qpr-dev-plus-aosp
2022-08-01 17:23:39 +00:00
Bill Yi
2e312fd609
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df
-s ours am: 015915736f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19472171
Change-Id: I7fa2d47c1267092dac9642b0febe9e1cdf58ed45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-01 17:22:30 +00:00
Bill Yi
93082d95fd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df
-s ours am: 62fe245c46
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19472171
Change-Id: I6d1a7698ced5c35d4aacf68bf9bc117491621bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-01 17:20:55 +00:00
TreeHugger Robot
71800b3f69
Merge "Refactor BiometricEnrollBase::onStop()"
2022-08-01 17:13:55 +00:00
Bill Yi
015915736f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19472171
Change-Id: I59274c79e4f571eebd99498d9bafcf6588142c58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-01 16:59:35 +00:00
Bill Yi
62fe245c46
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19472171
Change-Id: I0e3092590b7dc1d052a5d6bb4a695dcb7b661cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-01 16:58:13 +00:00
Jason Chang
88c49e3257
Fix RTL issue on fingerprint setup screens in landscape mode
...
1. Add an RTL layout dimension for enrolling page.
2. Handling device rotation landscape 270/90 degrees with
layout dimension in LTR or RTL language.
Bug: 237104754
Test: manually verified on Settings > Security > Face & Fingerprint
Unlock > Fingerprint Unlock > Touch & Hold fingerprint sensor page
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.fingerprint
.FingerprintEnrollEnrollingTest"
Change-Id: If4770d885d97c6bf4cfebefdf9cfa0b4ee0b995b
2022-08-01 19:02:50 +08:00
Kuan Wang
0dc8d58de5
Add the async task to compute diff usage data and load labels and icons.
...
Bug: 236101687
Test: make RunSettingsRoboTests
Change-Id: Ie24ea89fa6cfd351c73e64de40e2c9315867af9a
2022-08-01 18:45:00 +08:00
YK Hung
a0d8b1fbc6
Merge "Improve X axis labels in battery chart (2)"
2022-07-31 16:07:05 +00:00
TreeHugger Robot
ebb5a056d2
Merge "Improve X axis labels in battery chart (1)"
2022-07-31 02:52:19 +00:00
Menghan Li
0494c4540c
Merge "Minor change for CaptionAppearanceFragment"
2022-07-30 22:45:28 +00:00
Zaiyue Xue
a14c9dfc4f
Improve X axis labels in battery chart (2)
...
Support showing different numbers of labels for different count of
trapezoids.
screen_record: https://drive.google.com/file/d/1CIgppQllHlKC3BGG7hBvOjGDGVOs6OYC/view?usp=sharing&resourcekey=0-mbofu5KOO2dqCwL7K0zakg
Test: manual
Bug: 239491373
Bug: 236101166
Change-Id: I865dae760b491bdd7c93bbd29fd7dbc33204a60a
2022-07-30 15:24:06 +00:00
Zaiyue Xue
e9ab2f5365
Improve X axis labels in battery chart (1)
...
Support showing labels under the trapezoids instead of between the
trapezoids. For daily chart, the labels are under the trapezoids, for
hourly chart, the labels are between the trapezoids.
Test: manual
Bug: 239491373
Bug: 236101166
Change-Id: I2efb5192d4baafc7745ce269224639511848293e
2022-07-30 15:23:28 +00:00
Sayak Dutta
9e6c889abe
Merge "Revamp SD card UX"
2022-07-30 13:04:25 +00:00
TreeHugger Robot
eb1f39499b
Merge "Support daily and hourly battery chartview."
2022-07-30 09:00:29 +00:00
Zaiyue Xue
eaf4d1bb50
Support daily and hourly battery chartview.
...
https://drive.google.com/file/d/1vjt6FPFAiFakb158t1IBku1IQNzVPW46/view?usp=sharing&resourcekey=0-f5m2eUKWbth6gdEFh5lOIQ
Test: manual
Bug: 236101166
Change-Id: I47d899b936742514801cd4fa7a82ddaea5d21c31
2022-07-30 14:44:41 +08:00
Bill Yi
4a547374df
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic8c471db2d76a88f53565f86acf582afa5fa302f
2022-07-29 15:21:32 -07:00
Bonian Chen
db4a6cf215
resolve merge conflicts of 81d1cd0871
to stage-aosp-master am: 4ec8323bad
am: 244f21d9d7
am: 8097546f46
am: 1e744b4e66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627
Change-Id: I056de36c838732748f0cf445075ae87f4269a2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 11:09:22 +00:00