PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,721 Commits 1 Branch 0 Tags
71a918dcf74ec2cabac0aa25bdf1b00d12c4ebb9
Commit Graph

81721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YUKAI HUNG
71a918dcf7 Merge "Should not show internal package entry in the usage list" into sc-dev am: 0d00ace0d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14511219

Change-Id: Icad944723e99b0fb8186cedb4bcbe779b599219d
 2021-05-12 06:30:08 +00:00
YUKAI HUNG
0d00ace0d2 Merge "Should not show internal package entry in the usage list" into sc-dev 2021-05-12 06:24:55 +00:00
Kevin Han
b166743a41 Merge "Fix "X unused apps" string to match w/ unused apps" into sc-dev am: 421c4e3efc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14471254

Change-Id: Ic8bef3f39bfa849c595317477a8bc45def892dff
 2021-05-12 06:22:29 +00:00
Kevin Han
421c4e3efc Merge "Fix "X unused apps" string to match w/ unused apps" into sc-dev 2021-05-12 06:06:49 +00:00
ykhung
28605dcf16 Should not show internal package entry in the usage list 
Bug: 187770266
Test: make SettingsRoboTests
Change-Id: I56897c8f91295ba2139b7fda8c59a863130ecd86
 2021-05-12 05:17:22 +00:00
YUKAI HUNG
b6caad5bee Merge "Remove unnecessary converting us to ms" into sc-dev am: 899845b1ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503323

Change-Id: I252e706637717539f4e4d203845d1979563c606c
 2021-05-12 04:48:57 +00:00
YUKAI HUNG
899845b1ee Merge "Remove unnecessary converting us to ms" into sc-dev 2021-05-12 04:34:57 +00:00
TreeHugger Robot
1b4b63a253 Merge "Add tests for guest user events" into sc-dev am: abd44a8a2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491474

Change-Id: I4b5d8b8b8784bbf837a5ba475958b07bf6a6914a
 2021-05-12 04:27:05 +00:00
TreeHugger Robot
d1e6384343 Merge "Fix color contrast problem for VPN page" into sc-dev am: bc4f3817da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14468618

Change-Id: I7c422603416dbf48c878c4ad3593e9616fccab03
 2021-05-12 04:25:53 +00:00
TreeHugger Robot
abd44a8a2e Merge "Add tests for guest user events" into sc-dev 2021-05-12 03:59:44 +00:00
TreeHugger Robot
bc4f3817da Merge "Fix color contrast problem for VPN page" into sc-dev 2021-05-12 03:50:14 +00:00
ykhung
c4f49166ed 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: I9b3847568100eb6b92bdb8bc8491f941fce9fd9d
 2021-05-12 03:34:46 +00:00
TreeHugger Robot
697d2da647 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: I15c9766ba5c3283e651f67ddbef30b986d9ced3b
 2021-05-12 03:34:25 +00:00
TreeHugger Robot
e6239a7571 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: I5064619658380c0dee1b407b65fcda53dd6de254
 2021-05-12 03:33:19 +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
ce6b1d35ec 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: I2c133f1cd3b130728fba3e5dd1632eb727027c75
 2021-05-12 03:23:48 +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
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
2cba3a3dbd 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: I7ed798b0b86420ba80cfb7c87757b488d2f7d06d
 2021-05-12 02:43:53 +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
82f0a27a61 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: I85dffd3a5c4f3e1525819e1aa82e584df8e4ad1d
 2021-05-12 01:30:04 +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
4da838e124 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: I423b78941d0e6b2121a6d57938cc855de6f519ad
 2021-05-11 22:48:29 +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
TreeHugger Robot
8426c52d77 [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: Ic9a33bc52bea8939c1d25b25d0c8f9c1f9485fa8
 2021-05-11 15:05:43 +00:00
TreeHugger Robot
b426fb7e37 [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: Ied0fb3a6f36e2b5a8ca4ca6cb017e14899b66147
 2021-05-11 15:05:39 +00:00
TreeHugger Robot
986469d9d1 [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: I42abf5a3157ce9687f3cd8e361be44d58f11232f
 2021-05-11 15:05:30 +00:00
TreeHugger Robot
c445e3b913 [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: I96941df103b90765f63c5ea8458832634340b02a
 2021-05-11 15:04:47 +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
e81db4e2f0 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-11 14:35:46 +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
f2aa2d1af3 [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: Id1ff9db5fc4e86797c68a0f03cb0e2aafb757c17
 2021-05-11 14:28:36 +00:00
TreeHugger Robot
52fcdc9981 [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: Ic73060758beeb15c2c4317df6e3b13212a0692e5
 2021-05-11 14:28:23 +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
Hai Zhang
6bf47f6274 Don't add SettingsLib to static_libs in Settings unit test. 
Adding them results in duplicate classes and causes conflict for the R
classes and resource loading.

Meanwhile, correctly removing the SettingsLibSettingsSpinner resulted
in the test failing to find the getSelectedItem() method which is
unused inside Settings app. This is an inherent issue when unit
testing an optimized (and shrunk) app, and since there's no other way
for the test to get the current selected item, this change simply
changes the Settings code to invoke getSelectedItem() as well. This
has exactly the same effect because SettingsSpinnerPreference updates
its mPosition right before calling the OnItemSelectedListener in its
implementation.

Bug: 183340630
Bug: 177638625
Bug: 183342958
Test: atest SettingsSliderPreferenceControllerTest
Test: atest PrivateVolumeForgetTest
Change-Id: Ia26ca923369b41291614fb9bd50dfbd2aac2f0fa
 2021-05-11 03:33:08 -07:00
Arc Wang
65d3f45606 Set storage volume spinner not clickable when only 1 volume 
Bug: 187801712
Test: manual
      Click the spinner when there is only default volume.
      Click the spinner when there is USB drive connected.
Change-Id: Ifbd26c96f467757ffcfef750bd80533834123f82
 2021-05-11 18:06:47 +08:00
ykhung
93039a52ba Refine graph top margin and expand/collapse icon theme color am: 525659c291 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493692

Change-Id: I1f26debc42ead0357f51a62ce5d3aafed36f7378
 2021-05-11 09:22:12 +00:00
Bill Yi
7218ff4ef6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0e280f8e60612add9cd19a47b4b01ac40d827977
 2021-05-11 09:08:53 +00:00