Betty Chang
d76d734a91
Merge "[GAR] Remove the registerForContextMenu for getting the correct TalkBack feedback" into sc-dev am: d3cbec6488
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493684
Change-Id: Ibb2be02a34f3c3471c186987b0364facf21fc00f
2021-05-12 09:02:32 +00:00
Betty Chang
d3cbec6488
Merge "[GAR] Remove the registerForContextMenu for getting the correct TalkBack feedback" into sc-dev
2021-05-12 07:42:37 +00:00
TreeHugger Robot
3509ae87e4
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: I5685379c15000523eac23d2aa22c89be29d7b9e8
2021-05-12 07:13:03 +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
25ec1568ab
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: I8a30320b2f529c46bab0b588f65a780bb2083cba
2021-05-12 06:26:34 +00:00
Kevin Han
db595f288e
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: Ie28358f8059a4a96662589c00080984fa3287124
2021-05-12 06:26:29 +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
b239ded129
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: I329fab1dc7a960f729b207e64aa0160aaa32dcaa
2021-05-12 04:50:59 +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
20b1faef62
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: Icfaad10807e7d0b796bc6d7a6a7fb657a018097b
2021-05-12 04:28:43 +00:00
TreeHugger Robot
32bc62503c
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: I97fe64353d08c6e9bf4289e780dd279d21fab080
2021-05-12 04:28:30 +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
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
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
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
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
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
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
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