TreeHugger Robot
0f2524b6e3
Merge "[Provider Model] Show searching sub-title only when the Wi-Fi network is empty" into sc-dev am: a1bfc7daeb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14511218
Change-Id: I9b450f56fa4711a3578b216cb8a186daf5f56298
2021-05-12 07:09:15 +00:00
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
55f9c92e00
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: I391e5b838a70c431ecf31b51f032d6eb274602a6
2021-05-12 06:31:57 +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
dd601a2f78
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: I454a0a9e40007ffbcce78b5fbfb565373313ca6f
2021-05-12 06:22:29 +00:00
TreeHugger Robot
b3287c4461
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-05-12 06:06:51 +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
5bcf8834f8
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: Ia9ffc5337a3e9ef8c9335b730b18d541e54a7c98
2021-05-12 04:49:04 +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
001368fbbe
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: I6d6adbb8e3c22405b69eebfaf82fb09a91a46ec1
2021-05-12 04:27:23 +00:00
TreeHugger Robot
e45796e9af
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: I2790dbda4aa23d537e7b6868ae611ad5ceba699d
2021-05-12 04:26:12 +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
8b8ee73bad
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: Icfb7502b0e134abbfc30650452ee467be700c9cf
2021-05-12 03:34:00 +00:00
TreeHugger Robot
0bd88cc1bb
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: Id2d5db1fbf87e87be4c5239eaea3da7ef9b4c594
2021-05-12 03:33:37 +00:00
TreeHugger Robot
e42b6ef1b1
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: I54f1206fd3cc91cc1249f58b735eaa36175097ad
2021-05-12 03:32:00 +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
d2d3c0323c
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-05-12 03:24:59 +00:00
PETER LIANG
0ff0095ea7
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: I4cbd283a0c29e2794f9f815f04736f1690e5e618
2021-05-12 03:23:33 +00:00
TreeHugger Robot
0d3bfddd5b
Merge "Implements profile selection tab in Storage Settings"
2021-05-12 03:11:00 +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
9f75dd4497
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: I81fc484b8c48f04489868cca4a14b478d597f1c4
2021-05-12 02:44:13 +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
72885506b4
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: I2208e5f953a485aaa1d00d8d168b009269b65c9a
2021-05-12 01:30:17 +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
1a50cec60a
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: I3f4472878de17742fe6c5f2fb697cc5693b1af60
2021-05-11 22:55:07 +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
31873d44f7
[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: I9472b98e45e99eaf6ef87ea45015bd74d7224109
2021-05-11 15:05:06 +00:00
TreeHugger Robot
cc4d77afe4
[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: Ia2201c405daaec0590272ed7f5e69b895da10d8b
2021-05-11 15:05:02 +00:00
TreeHugger Robot
fc21d04c07
[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: I0bb4f8d01e76e7b2c2cc707f2ba59f64b6072140
2021-05-11 15:04:51 +00:00
TreeHugger Robot
dc546a21f5
[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: I6220ce32b9909330d9fa94b0da865371a7429a71
2021-05-11 15:04: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
55b8fb0e3a
[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: I9fa04958878b44d9e96b1bb4d0f63347db10977b
2021-05-11 14:30: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
3d64580531
[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: Ie856a3f0b3b52d4ff5a5c40dbf9916bbed0d741f
2021-05-11 14:30:42 +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