Commit Graph

81544 Commits

Author SHA1 Message Date
TreeHugger Robot
a1bfc7daeb Merge "[Provider Model] Show searching sub-title only when the Wi-Fi network is empty" into sc-dev 2021-05-12 06:54:02 +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
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
899845b1ee Merge "Remove unnecessary converting us to ms" into sc-dev 2021-05-12 04:34:57 +00:00
Weng Su
04ec0e0929 [Provider Model] Show searching sub-title only when the Wi-Fi network is empty
- Screenshot:
  https://screenshot.googleplex.com/7Z5r5AnpAZb6GfQ

Bug: 187886636
Test: manual test
atest -c InternetConnectivityPanelTest

Change-Id: Ib4769746819a5863e4a4981d0c73dda838ae3ae2
2021-05-12 04:09:49 +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
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
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
16e8c767f1 Merge "[Material Next] Move “main switch” right below illustration" into sc-dev 2021-05-12 02:28:25 +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
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
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
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
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
Bill Yi
c41ebbc1f5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I95ae7049d4ab0bfb41198277cd351f2c3f0e12d7
2021-05-11 09:01:32 +00:00
Bill Yi
90b6d35a97 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic4a811f25ada99c36d1a521a6086cc940d81449c
2021-05-11 08:57:23 +00:00
Bill Yi
99513c4e86 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I72187de3a8b04a71d8ea473d599dc33258717b2f
2021-05-11 08:54:08 +00:00
Bill Yi
1049f62bbc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia2f4a6a4eae5398fa27312f5791430b3e5f69e09
2021-05-11 08:51:33 +00:00
Bill Yi
3cb47bf569 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I78ee3396d3507915233d96c294a22077a1c196bf
2021-05-11 08:48:18 +00:00
ykhung
525659c291 Refine graph top margin and expand/collapse icon theme color
Bug: 187767343
Test: make SettingsRoboTests
Change-Id: I5084affd49169de1f43a308acbe192f55454d0f7
2021-05-11 08:22:38 +00:00
TreeHugger Robot
d31c3649ba Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315 am: 9724c735da am: fc721d09cb am: 94e5b18951 am: 045aa65893 am: 9ebe07d216 am: 63cc6f167a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: Iedfec3d03168c06279513180f28364c19ff66523
2021-05-11 07:24:14 +00:00
Hugh Chen
0f74d4831c [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours am: 53ff99b8b4 -s ours am: 9bbcb55a23 am: fe87f1ac34 -s ours am: 8dbc94fcbe am: e90fdbf747 am: 445869a724 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0fc9fa40c357c059669a175580a16a12b01ed4be
2021-05-11 07:24:12 +00:00
TreeHugger Robot
9ff09ba818 Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 am: 38a2b32e94 am: 24ef90eaaa am: e5e19dd41a am: 0e37bc27a2 am: a6f32496f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: Idb3b2d6fa662277e1fe0a47fc2c0318d50e20fa3
2021-05-11 07:24:03 +00:00
Hugh Chen
33228acc37 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours am: 392fb7a4f7 am: 425430345d am: 47666c2d15 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I41d8312c0be058fe9d94f1fa4e745bfa0e4e3002
2021-05-11 07:24:02 +00:00
TreeHugger Robot
e492441e16 Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e am: 256de04464 am: 3942491a7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I19201e368b99d8306c34643bfbc8fe6297965968
2021-05-11 07:23:53 +00:00
Hugh Chen
0bc5e289a4 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours am: effac8a0c1 am: 6fee770ea0 am: 8bf67a7f4b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3a9cabe53576b44a9a42f75b5db72099b96f4771
2021-05-11 07:23:51 +00:00
TreeHugger Robot
dff59b4188 Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 am: e790b378c3 am: 8be84e5e36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: I73cf736a109fcfd867136e5869953194fb32e5e2
2021-05-11 07:23:40 +00:00
Hugh Chen
5d7d1a6b38 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955 -s ours am: 933f807885 am: c740d7ad82 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iebf5692b629b1b52107c622fe1987898b0cc2369
2021-05-11 07:23:38 +00:00
TreeHugger Robot
2097ca6a73 Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315 am: 9724c735da am: fc721d09cb am: 94e5b18951 am: 045aa65893 am: 8b76d88e55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: I3ca562a87d5c650d7ef347bccb70483f14f05fe6
2021-05-11 07:07:32 +00:00
Hugh Chen
628a92c252 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours am: 53ff99b8b4 -s ours am: 9bbcb55a23 am: fe87f1ac34 -s ours am: 8dbc94fcbe am: 68f4157827 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6aeb0de955b997191148bead7794af66ee3bfa94
2021-05-11 07:07:31 +00:00
TreeHugger Robot
8cea64eae5 Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 am: 38a2b32e94 am: 24ef90eaaa am: e5e19dd41a am: b2c3b4f4cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: Idaa69e727648cf5a8083078b23c4905d347a2e87
2021-05-11 07:07:23 +00:00