Menghan Li
a346b68566
Merge "Fix style in "Vision Settings" is inconsistent" into sc-dev am: fd05966f4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493677
Change-Id: I643cba80260833999556743e65fc10bce85f3727
2021-05-12 09:01:01 +00:00
Menghan Li
dbfa9a70d6
Merge "[Material Next] Support "Learn more" for help link" into sc-dev am: 7bdf791e6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486196
Change-Id: I4369b173b2c030bfa00caea1eb5243fed73b2f9d
2021-05-12 09:00:55 +00:00
TreeHugger Robot
7ef815494c
Merge "Implements profile selection tab in Storage Settings" into sc-dev am: 0b43270035
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352146
Change-Id: Ide616df3f9cf81da3a36a082096df18b474bcd1b
2021-05-12 09:00:50 +00:00
Betty Chang
fcac4211c4
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: I790fc73b33f770cd7d454a52cc2cd47a96ca7a73
2021-05-12 09:00:31 +00:00
Menghan Li
fd05966f4f
Merge "Fix style in "Vision Settings" is inconsistent" into sc-dev
2021-05-12 08:49:55 +00:00
Menghan Li
7bdf791e6c
Merge "[Material Next] Support "Learn more" for help link" into sc-dev
2021-05-12 08:44:30 +00:00
TreeHugger Robot
0b43270035
Merge "Implements profile selection tab in Storage Settings" into sc-dev
2021-05-12 07:48:43 +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
menghanli
11a0700847
Fix style in "Vision Settings" is inconsistent
...
Root cause: "Accessibility button" page apply BC style but other pages in SUW didn't. It causes page style inconsistency.
Solution: Don't show annotation link to make user open "Accessibility
button" page during SuW.
Bug: 187658718
Test: Manual testing
Change-Id: I6cc3da9a72b68829efd5537ae93fc329ef716fb4
2021-05-12 07:16:05 +00:00
TreeHugger Robot
76fb754bb8
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: I6fe29e6f95c274112214fefaa59fa92a1f3a40ee
2021-05-12 07:11:23 +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
034d7f194a
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: I4423449061e3187f8a15c1ece2635707c3928ec3
2021-05-12 06:32:10 +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
ec06881420
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: Ia6b59847846800f30237c9945f5bd7d5d4613e14
2021-05-12 06:24: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
menghanli
7979d9337a
[Material Next] Support "Learn more" for help link
...
Allow CaptionManager, Magnification, Color correction, Color inversion,
Time to take action, and Autoclick.
Bug: 187671696
Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=AccessibilityFooterPreferenceTest
Change-Id: I9d753243d4f61b6b3d58b50425b7a75a812a481d
2021-05-12 13:53:44 +08: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
c391dfb60b
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: I98e4528db08e0b4969047cb7cf57f5230abc6596
2021-05-12 04:49:14 +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
9729b6f0ce
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: I4e7738735fc41239c00892b998c40d14fee0dfb1
2021-05-12 04:27:48 +00:00
TreeHugger Robot
7c3d23a713
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: I6986dcb6d3a871ee0384f3906e20eb42bdd13b5c
2021-05-12 04:27:23 +00:00
ykhung
d4a51f750e
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: If79b26014af46db41b26a92235e099061ad43183
2021-05-12 04:26:31 +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
1036b2d281
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: I70fe0badecddd5f278eedbbef1dd015d4262422d
2021-05-12 03:26:09 +00:00
TreeHugger Robot
f2a7c865eb
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: Id8da3881874ee6cf38d7f39047daf67b0b1968e4
2021-05-12 03:25:57 +00:00
PETER LIANG
4523f9d04b
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: I10aa8bd95792425a712d23837476c4e6baa7c944
2021-05-12 03:24:51 +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
2b30d7202d
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: Id3202eaa113c9596c966ae22c0d3a1657fe70221
2021-05-12 02:44:43 +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
efa6c8c940
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: Ida521b3a3ccde9ba6d3524e174c392f1ab249d0b
2021-05-12 01:30:29 +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
b65e2e6bed
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: Icd22baa7d575b32b1aa7adbcc2f55b4ee5ac9297
2021-05-11 22:48:56 +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
44811a1021
[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: Iaf9544b4ed4da990b7583a0668865af5b21d6c1b
2021-05-11 16:37:02 +00:00
TreeHugger Robot
d890e42ee0
[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: Icdb8d887988e25ca30effc87789a0688204a709d
2021-05-11 16:36:58 +00:00
TreeHugger Robot
b801911c43
[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: I928cd70da93c3e27f8cd0093680261ee147db8b0
2021-05-11 16:36:54 +00:00
TreeHugger Robot
0fb191316e
[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: Ib40f87132819eaccf7fd1952c6e6c09d5aa42177
2021-05-11 16:36:50 +00:00
TreeHugger Robot
83d38a6e5c
[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: I5dc2b00f2be3cadc44181875b1c7af437cf8af64
2021-05-11 16:36:31 +00:00
TreeHugger Robot
d48c64d321
[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: I2c9bdf3f771fd4fa5411c9e17266ae4f56a029e9
2021-05-11 16:36:24 +00:00
ykhung
c17823dacf
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: Ibc62ebdd10b69cd562c6f9bf1a418a2e82218fbb
2021-05-11 16:35:50 +00:00
TreeHugger Robot
6d1e8eed2f
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
am: 045aa65893
am: 9ebe07d216
am: 63cc6f167a
am: d31c3649ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I2ceb77a463d8ca4e50735e67dc949d4f4889e5cf
2021-05-11 16:35:25 +00:00
Hugh Chen
aa53cfb0c1
[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: 0f74d4831c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I95f8f22595071978512a4927148d335319dc54ab
2021-05-11 16:35:24 +00:00