PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,182 Commits 1 Branch 0 Tags
d2bc02746ef310041c7b11066d4e2aa9eaa29e11
Commit Graph

82182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ykhung
503d21a786 Keep selected time slot and expand state when device is rotate am: 9ef9e1ee0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503317

Change-Id: Ifbd206432a0962e5c3e92a2c07b903c3d9fb0e05
 2021-05-12 03:35:28 +00:00
TreeHugger Robot
92bf5c4876 Merge "Set storage volume spinner not clickable when only 1 volume" into sc-dev am: 2853e766f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14495884

Change-Id: Ifba32b886f9f373d8b31d4422388c9e927a0398d
 2021-05-12 03:35:14 +00:00
TreeHugger Robot
54d5defb28 Merge "Disable the info icon" into sc-dev am: 0fa1e491f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493678

Change-Id: I41e67e3ea6117f4f0f08f66813a8e476f88ffba1
 2021-05-12 03:33:59 +00:00
ykhung
8343fe8b0a Remove unnecessary converting us to ms 
The class "Estimate" has the menber estimateMillis and
the unit of batteryUsageStats.getBatteryTimeRemainingMs() is
millisecond,so converting from us to ms is unnecessary.

Bug: 187379252
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryInfoTest
Test: manual
Change-Id: If7c1092c1b7e5f74f8907ffe0248eccf3535ac0c
 2021-05-12 03:29:23 +00:00
ykhung
9ef9e1ee0c Keep selected time slot and expand state when device is rotate 
Bug: 187772493
Test: make SettingsRoboTests
Change-Id: If70abf06825a88f0ad0add37ef8d4f46a0aad1e9
 2021-05-12 03:28:59 +00:00
PETER LIANG
9c8507fe11 Merge "Provide a way to Accessibility button settings via intent." into sc-dev am: f2d70ab320 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14008225

Change-Id: Ic8c76f64bbf2edef845742c52e6b858469deeddb
 2021-05-12 03:26:28 +00:00
TreeHugger Robot
2853e766f5 Merge "Set storage volume spinner not clickable when only 1 volume" into sc-dev 2021-05-12 03:10:53 +00:00
TreeHugger Robot
0fa1e491f8 Merge "Disable the info icon" into sc-dev 2021-05-12 03:10:36 +00:00
Menghan Li
b984a552b0 Merge "[Material Next] Move “main switch” right below illustration" into sc-dev am: 16e8c767f1 am: 6476b523ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486917

Change-Id: I58c5d8987c83d8ecac176e94e3f61d48b7486efd
 2021-05-12 02:59:45 +00:00
PETER LIANG
f2d70ab320 Merge "Provide a way to Accessibility button settings via intent." into sc-dev 2021-05-12 02:59:10 +00:00
Menghan Li
6476b523ef Merge "[Material Next] Move “main switch” right below illustration" into sc-dev am: 16e8c767f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486917

Change-Id: Ia625d89c9662df0903c07233989aaebe0ce06c87
 2021-05-12 02:47:07 +00:00
changbetty
86d957ae0b [GAR] Change the text color for "Airplane mode is on" message to follow 
the GAR

Bug: 179001230
Test: manual test by Accessibility Scanner
Change-Id: Ib1a09a28c2b4ff3d5dbee13b7d85a973e760bc36
 2021-05-12 02:36:12 +00:00
Menghan Li
16e8c767f1 Merge "[Material Next] Move “main switch” right below illustration" into sc-dev 2021-05-12 02:28:25 +00:00
Joe Bolinger
525bc0c4b3 Merge "Add userId parameter to all uses of challenge in settings." into sc-dev am: 93f6a257e9 am: 5ab48dc412 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14472474

Change-Id: I98bcfe92915d552639f7b4a6e42e3252b936705e
 2021-05-12 01:39:34 +00:00
Joe Bolinger
5ab48dc412 Merge "Add userId parameter to all uses of challenge in settings." into sc-dev am: 93f6a257e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14472474

Change-Id: I363128ac19edf1713a430671c6a41a47b0013f2b
 2021-05-12 01:31:46 +00:00
Joe Bolinger
93f6a257e9 Merge "Add userId parameter to all uses of challenge in settings." into sc-dev 2021-05-12 01:25:39 +00:00
menghanli
1949a5d69f [Material Next] Move “main switch” right below illustration 
Bug: 187688296
Test: Manual testing
Change-Id: Ic36b6deaad410fce49dcc19861a11307fb479f55
 2021-05-12 00:56:50 +00:00
Kevin Han
53aaab09b8 Fix "X unused apps" string to match w/ unused apps 
This fixes an issue where there is some discrepancy between the "X
unused apps" string in Settings and the actual number of unused apps in
PermissionController due to the Settings logic not taking into account
the usage time.

Bug: 187464720
Test: atest HibernatedAppsPreferenceControllerTest
Test: hibernate app and revoke permission, open app, number of unused
apps matches up

Change-Id: Ifc30280e582e4183c61d421dd5378d627a80baf9
 2021-05-11 17:04:55 -07:00
Hai Zhang
23055a10a7 Merge "Don't add SettingsLib to static_libs in Settings unit test." into sc-dev am: 8a7f55246f am: e3f92d924d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491512

Change-Id: I7c634d792342515fe8d0a7125440769602ad9b33
 2021-05-11 22:50:14 +00:00
Hai Zhang
e3f92d924d Merge "Don't add SettingsLib to static_libs in Settings unit test." into sc-dev am: 8a7f55246f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491512

Change-Id: I3e9df6b5be13919be4e580cc3b7442060e4265ac
 2021-05-11 22:49:38 +00:00
Hai Zhang
8a7f55246f Merge "Don't add SettingsLib to static_libs in Settings unit test." into sc-dev 2021-05-11 22:44:09 +00:00
Kevin Chyn
219b919ba5 Update fingerprint introduction "Keep in mind" section 
Bug: 187068239
Test: manual
Change-Id: I203f1c52c50dea9cfb1045726f3f2bb4b04435ff
 2021-05-11 14:27:51 -07:00
Julia Reynolds
748b61ce2e Fix NPE on guest user 
Test: RoboTests
Fixes: 187548511
Change-Id: I86219bc5e2cf285fcc86f5c8456d7d2afcbe2c0f
 2021-05-11 15:08:57 -04:00
Julia Reynolds
fef73ef82a Don't show DND access settings in managed users 
Test: launch direct intent in a managed user
Fixes: 187304252
Change-Id: I1cfcf8c147fc47b4e2fb2a725cba9846e4f09055
 2021-05-11 16:35:42 +00:00
TreeHugger Robot
05c76c0e44 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9d3c9dd867 -s ours am: cefbb1d83a -s ours am: 82c1e0ae12 -s ours am: 9b2cecdd05 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6cd6f9addcd93d29bf9a423ee5683a6ddfd7680f
 2021-05-11 15:37:19 +00:00
TreeHugger Robot
a0f2972d87 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 842c67d794 -s ours am: 84ed78af0a -s ours am: d1625e0793 -s ours am: c664eb135c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icfec38990ff0e72e5d26031e63957feac3985963
 2021-05-11 15:37:14 +00:00
TreeHugger Robot
6b9a23b8f3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e81db4e2f0 -s ours am: 647e0ee2ad -s ours am: 3ac61d217a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86830b27622cbf8b1dc689b370fbf639783bf3b6
 2021-05-11 15:37:09 +00:00
TreeHugger Robot
8dbdb07e04 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 860318bab8 -s ours am: 2231cba3d1 -s ours am: ea888d7275 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I707551739dedfc1f44281fe8c08f3d2a43d76b69
 2021-05-11 15:36:34 +00:00
TreeHugger Robot
9b2cecdd05 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9d3c9dd867 -s ours am: cefbb1d83a -s ours am: 82c1e0ae12 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I40a2159c541eecce401a6cafcd819f72d5df8c06
 2021-05-11 15:07:07 +00:00
TreeHugger Robot
c664eb135c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 842c67d794 -s ours am: 84ed78af0a -s ours am: d1625e0793 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8ff3cd39d0838d8c13df910c3e05199512cd066
 2021-05-11 15:07:03 +00:00
TreeHugger Robot
3ac61d217a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e81db4e2f0 -s ours am: 647e0ee2ad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d29a4d40bb3e57fbf49b70b760640087b736260
 2021-05-11 15:06:52 +00:00
TreeHugger Robot
ea888d7275 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 860318bab8 -s ours am: 2231cba3d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9b3bc81d20a1708291b76b627cdefc1be078676
 2021-05-11 15:06:27 +00:00
TreeHugger Robot
82c1e0ae12 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9d3c9dd867 -s ours am: cefbb1d83a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifaad1baedb515d91ef2d899059dabbfd5b2ae291
 2021-05-11 14:50:10 +00:00
TreeHugger Robot
d1625e0793 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 842c67d794 -s ours am: 84ed78af0a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I189470dc12111e6ddb088611a94419485e266231
 2021-05-11 14:50:06 +00:00
TreeHugger Robot
647e0ee2ad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e81db4e2f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic234fd718791b2790665336914b24c0b6f63c957
 2021-05-11 14:49:26 +00:00
TreeHugger Robot
2231cba3d1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 860318bab8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2204c47b4e3e25cd42fd35aff1bbad56514d39a8
 2021-05-11 14:49:20 +00:00
TreeHugger Robot
5625e4b302 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3772f9137a -s ours am: 2da86a6163 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I096999a06b89d5b62b98dae0fe49ee500b078a1c
 2021-05-11 14:48:35 +00:00
TreeHugger Robot
ed056a81f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 126fc5b912 -s ours am: 4e5a16a7d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4130b3637dbc5a404d2611c4b8324037501bee4f
 2021-05-11 14:48:30 +00:00
ykhung
1422ab8a4c Refine graph top margin and expand/collapse icon theme color am: 525659c291 am: 8febb17220 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493692

Change-Id: I5e80b84bf0cfe7b085119a8a2ece1b5fe14bfc2e
 2021-05-11 14:48:19 +00:00
TreeHugger Robot
e81db4e2f0 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-11 14:35:46 +00:00
TreeHugger Robot
2da86a6163 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3772f9137a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icd3e8bf11cb721b29e66cce799a0670f1c90a50f
 2021-05-11 14:32:53 +00:00
TreeHugger Robot
4e5a16a7d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 126fc5b912 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If725b62001c4de8538c44c69d26dd45f8eda4934
 2021-05-11 14:32:43 +00:00
TreeHugger Robot
860318bab8 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-11 14:31:55 +00:00
TreeHugger Robot
cefbb1d83a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9d3c9dd867 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I402572a820a93daf549d86a3345d3d861205d302
 2021-05-11 14:30:51 +00:00
TreeHugger Robot
84ed78af0a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 842c67d794 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife34138bc4382a1f63098546ffa67047d6a8e9c5
 2021-05-11 14:30:44 +00:00
TreeHugger Robot
9d3c9dd867 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-11 14:17:52 +00:00
TreeHugger Robot
842c67d794 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-11 14:17:11 +00:00
TreeHugger Robot
3772f9137a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-11 14:16:42 +00:00
TreeHugger Robot
126fc5b912 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-11 14:10:55 +00:00
Wesley.CW Wang
c0fe8f2246 Update battery state string 
- Update battery saver state string
 - Update app usage active time string

Bug: 187779948
Bug: 187778616
Test: make SettingsRoboTests
Change-Id: Ifc4e5528f0f2d17c0461a83f250fb9c4acba042d
 2021-05-11 12:12:30 +00:00