Commit Graph

79815 Commits

Author SHA1 Message Date
Treehugger Robot
e0e483aec1 Merge "Add OWNERS" am: f69f3ed7dc am: 5e85b6b2a9 am: 181abccf09 am: 4357b14563
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1580364

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9cbfce6d31251b1679553f9b49fa3f2ec3d1aec7
2021-02-25 17:20:26 +00:00
Treehugger Robot
4357b14563 Merge "Add OWNERS" am: f69f3ed7dc am: 5e85b6b2a9 am: 181abccf09
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1580364

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51c83010ba124a058173dbeec07465b243a366e4
2021-02-25 16:36:25 +00:00
Treehugger Robot
181abccf09 Merge "Add OWNERS" am: f69f3ed7dc am: 5e85b6b2a9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1580364

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib879a1f6e28ca9d97391aedea77b064632330b75
2021-02-25 15:22:31 +00:00
Treehugger Robot
5e85b6b2a9 Merge "Add OWNERS" am: f69f3ed7dc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1580364

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46ab676806c0a211818a2f0465a28dc97d3a64d3
2021-02-25 14:47:30 +00:00
TreeHugger Robot
83293a9d3f Merge "Fix talkback will speak "disabled" when select empty preference" into sc-dev am: b24d222e71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13693476

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49ea2727798086a5fe59850af067c6fdaa4739f3
2021-02-25 14:46:53 +00:00
Treehugger Robot
f69f3ed7dc Merge "Add OWNERS" 2021-02-25 14:19:48 +00:00
TreeHugger Robot
b24d222e71 Merge "Fix talkback will speak "disabled" when select empty preference" into sc-dev 2021-02-25 13:35:14 +00:00
Paul Hu
2b4987a6d3 [automerger skipped] Merge "Replace ConnectivityManager hidden symbols on Settings" am: cbcea32087 am: 995581e856 am: 155d4d6cd3 -s ours am: 8af9ea6bf1 -s ours
am skip reason: Change-Id Iba4b121a4ddf3f04252aa0355e0e6494a593682a with SHA-1 6151c227e0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I728dab3d67cdffaee86e3847e956a391d6834c8d
2021-02-25 11:03:36 +00:00
Paul Hu
8af9ea6bf1 [automerger skipped] Merge "Replace ConnectivityManager hidden symbols on Settings" am: cbcea32087 am: 995581e856 am: 155d4d6cd3 -s ours
am skip reason: Change-Id Iba4b121a4ddf3f04252aa0355e0e6494a593682a with SHA-1 6151c227e0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icdd83bd4c20e65149fd09e7364cb8f7f37946dd5
2021-02-25 10:22:12 +00:00
Paul Hu
155d4d6cd3 Merge "Replace ConnectivityManager hidden symbols on Settings" am: cbcea32087 am: 995581e856
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cd486a47be45f68ad7b0db82dcb030a62edb0da
2021-02-25 09:37:00 +00:00
Mill Chen
e31fcb6dda Avoid double-badging application icon in the dialog
When creating a confirmation dialog for removing work profile, it will
fetch an icon from ApplicationInfo and badge the icon. However, the
cases of double-badging icon are happening in the some devices with
higher density, which means the icon has already had a badge after
getting it from ApplicationInfo. So this change attempts to directly use
the icon.

Bug: 148137991
Test: visual, manual
1. Install Test DPC from Play Store
2. Setup work profile
3. Settings -> Security -> Device admin apps
4. Click Test DPC item which has the badged icon -> Remove work profile
5. Observe the icon of the confirmation dialog
Change-Id: I126bb799e37e168fb5fbc76107c0c897a6be2f9a
2021-02-25 09:24:40 +00:00
Mill Chen
1e607904c3 Update UI for factory reset flow
After applying a collapsing toolbar in the Settings app, the factory
reset screen is not displayed correctly. This is because
1) the factory reset page should not essentially have a toolbar since it
has different UI layout form other pages.
2) this page was launched previously as a SubSettings so it applied a
wrong theme.

This change is mainly updating the inheritence structure and specifying
the right theme for the factory reset page in order to have a correct
layout.

Bug: 179457252
Test: robotests and visual verified
Change-Id: I91aec65a120d5a288507d89ace7c9298acdca42b
2021-02-25 16:32:50 +08:00
Paul Hu
995581e856 Merge "Replace ConnectivityManager hidden symbols on Settings" am: cbcea32087
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5fe3e26c5bdda32edf656b4d7e94d2dc17c14e06
2021-02-25 08:19:44 +00:00
TreeHugger Robot
67c21f6bea Merge "[Provider Model] Remove the footer of WFC" into sc-dev am: 18eeaad6e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13694190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f609830ca5587c60f284b4521dac371ac11a146
2021-02-25 08:19:28 +00:00
TreeHugger Robot
18eeaad6e3 Merge "[Provider Model] Remove the footer of WFC" into sc-dev 2021-02-25 08:01:24 +00:00
Paul Hu
cbcea32087 Merge "Replace ConnectivityManager hidden symbols on Settings" 2021-02-25 07:44:50 +00:00
Hugh Chen
848ce26373 Fix talkback will speak "disabled" when select empty preference
Set empty preference as not selectable to make talkback
not to detect it.

Bug: 178068585
Bug: 178067426
Test: manually test
Change-Id: Id293a61494cd0bdd79d104918502101cb5caf050
2021-02-25 15:17:06 +08:00
Zoey Chen
fec2fce744 [Provider Model] Remove the footer of WFC
Reason: Cannot pass the GAR, so UX decides to remove it
https://screenshot.googleplex.com/3Ktq9EBxqUhWivj.png

Bug: 180670301
Test: make
Change-Id: I56d84a45826e14e6cc9093553f1bcfd9c54f70ec
2021-02-25 06:26:49 +00:00
Jeremy Goldman
47e1c78343 Merge "PrivateVolumeOptionMenuControllerTest converted to JUnit" 2021-02-25 05:43:56 +00:00
Jeremy Goldman
3098ea1274 Merge "BrandedAccountPreferenceControllerTest converted to JUnit" 2021-02-25 05:43:29 +00:00
Paul Hu
dbcd0ba8c8 Merge "Replace ConnectivityManager hidden symbols on Settings" into sc-dev am: e6f2889e01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13668411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib93bbaa05a9ddf13a6dc45ea06883544ff0fb452
2021-02-25 04:30:38 +00:00
Paul Hu
e6f2889e01 Merge "Replace ConnectivityManager hidden symbols on Settings" into sc-dev 2021-02-25 03:43:50 +00:00
Meng Wang
0203f5b33c Merge "Use string "Carrier settings version"" am: 2161d17f32 am: 0b31d30218 am: 3b19347431 am: 69720d62a3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia36445bff49763cd21bd63647399a64f2da8bb66
2021-02-25 02:13:09 +00:00
Meng Wang
69720d62a3 Merge "Use string "Carrier settings version"" am: 2161d17f32 am: 0b31d30218 am: 3b19347431
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If84a42f0d51cfa758dd9bca7847d2ca178c86627
2021-02-25 01:41:08 +00:00
Jeremy Goldman
9ec80bb8b0 Merge "TopLevelStoragePreferenceControllerTest converted to JUnit" 2021-02-25 01:31:20 +00:00
Meng Wang
3b19347431 Merge "Use string "Carrier settings version"" am: 2161d17f32 am: 0b31d30218
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03542ee476ebff7bfae2a8f54894f00f69578744
2021-02-25 00:44:42 +00:00
Meng Wang
0b31d30218 Merge "Use string "Carrier settings version"" am: 2161d17f32
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cbb0cd3d4c4726587082ecc4cbbfa2957e60467
2021-02-25 00:10:09 +00:00
Meng Wang
2161d17f32 Merge "Use string "Carrier settings version"" 2021-02-24 23:17:20 +00:00
Suprabh Shukla
9f566fe469 Merge "Adding alarms and reminders activity" into sc-dev am: a78849982d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13633051

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic41874282654b015c7fa450af9b3066b19c72e1a
2021-02-24 21:18:15 +00:00
Yanting Yang
b8479ff1af Clean up RestrictedHomepagePreference
Extend the RestrictedTopLevelPreference to clean up the same logic in
RestrictedHomepagePreference.

Bug: 177213699
Test: visual and test with TestDPC
Change-Id: I287cd1973baebfaf73c09b626177be983651987c
2021-02-25 05:16:30 +08:00
Meng Wang
3f9db799e5 Use string "Carrier settings version"
.. instead of "Settings version".

Bug: 160843335
Change-Id: Ie98b9f2c62627c1e34dfa807357625b483577305
Test: make
2021-02-24 21:15:08 +00:00
Suprabh Shukla
a78849982d Merge "Adding alarms and reminders activity" into sc-dev 2021-02-24 20:06:56 +00:00
TreeHugger Robot
43490276ac Merge "Revert "Revert "Use location access for recent location apps.""" into sc-dev am: 69fab4bdaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13679462

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaedd2ae21c4308504ed4d17d62da3b0b9a6dc726
2021-02-24 18:28:14 +00:00
TreeHugger Robot
69fab4bdaa Merge "Revert "Revert "Use location access for recent location apps.""" into sc-dev 2021-02-24 18:06:41 +00:00
TreeHugger Robot
e2e8219452 Merge "Fix the higlighted settings not work properly from search" into sc-dev am: 3e2a7f6186
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13495590

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67ff291f78c9cbc0322a98cae9797b782dad5111
2021-02-24 15:58:07 +00:00
TreeHugger Robot
3e2a7f6186 Merge "Fix the higlighted settings not work properly from search" into sc-dev 2021-02-24 14:41:25 +00:00
Ryan Lin
0d0b5127aa Merge "Add uninstall option in the capabilities confirm dialog" into sc-dev am: 296c42e4ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13660508

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4662653f72f14826137e467ae8a5aca2008e5e43
2021-02-24 13:46:36 +00:00
TreeHugger Robot
9b2b0dcffb Merge "[Bug] Private DNS shows odd message about Bluetooth" into sc-dev am: 588c4e1508
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13622529

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4781c62bb219050d67cbe7f58debd1847b8cb19b
2021-02-24 13:46:05 +00:00
Ryan Lin
296c42e4ce Merge "Add uninstall option in the capabilities confirm dialog" into sc-dev 2021-02-24 13:12:45 +00:00
TreeHugger Robot
588c4e1508 Merge "[Bug] Private DNS shows odd message about Bluetooth" into sc-dev 2021-02-24 13:03:13 +00:00
Menghan Li
062c0ea933 Merge "Add general grouping title into accessibility settings" into sc-dev am: 21f790c68e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13675177

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I248e600501f925cc12cefee0f07136e7ef196555
2021-02-24 11:40:37 +00:00
Menghan Li
21f790c68e Merge "Add general grouping title into accessibility settings" into sc-dev 2021-02-24 11:07:17 +00:00
menghanli
da07d7a6c2 Add general grouping title into accessibility settings
Bug: 174829936
Test: atest TextAndDisplayFragmentTest, atest AccessibilitySettingsTest
Change-Id: I7455c3d369c3a28b9c64e9a9498a2d6ce5a0ae08
2021-02-24 17:24:17 +08:00
Tsung-Mao Fang
ef87755c34 Fix the higlighted settings not work properly from search
Since the Andorid S, we introduce the CollapsingToolbarLayout
, the highlighted funcation might break for unkown reason.
I observed that broken cases with overlapping issue on tool bar.
The possible root cause is the interation bwtween
CoordinatorLayout v.s CollapsingToolbarLayout v.s Recycler
view.

This cl is definetly a workaround to prevent this issue.
I try to collapse the tool bar with an animation before
we start to scroll the list. This makes the overall transition smooth
but always collapse the tool bar.

Fix: 177968297
Test: Click a lot of search results, and screen should highlight
settings correctly.

Change-Id: Id9c32b642433dcc39c179a2cc83a06e77cc47888
2021-02-24 16:46:08 +08:00
Jeremy Goldman
899eb7282d TopLevelStoragePreferenceControllerTest converted to JUnit
Helper function composed to return thread future, to guarantee
concurrent function finishes before test condition is checked.
Additionally a @VisibleForTesting helper function is used rather than
robolectric reflection helpers to set a class variable.

Test: atest -c TopLevelStoragePreferenceControllerTest
Change-Id: Ia22ebac4baec60f72b8516e9e79998cd788266ab
2021-02-24 16:24:19 +08:00
Treehugger Robot
70a046ed8d Merge "Grant BatteryStats OWNERS for FakeUid.java" am: d8137193ae am: 59f43e5299 am: c7bd662dee am: e05e8065e7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1584225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39d6fa9b74c5bffa8dbea9adc45277d987982293
2021-02-24 08:14:41 +00:00
Wei Wang
22399153dc Revert "Revert "Use location access for recent location apps.""
This reverts commit 5da4f381a6.

Reason for revert: Fixed the crash and roll forward

Test: Manual - tested with work profile.
Change-Id: I8b500b8fddc58cc0d0e5e7f4e54d8bb5cb6b3022
2021-02-24 00:08:04 -08:00
Treehugger Robot
e05e8065e7 Merge "Grant BatteryStats OWNERS for FakeUid.java" am: d8137193ae am: 59f43e5299 am: c7bd662dee
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1584225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied3dab4b389ba8a83ccf8630eeb04c2fce962e48
2021-02-24 07:39:00 +00:00
Stanley Wang
6c45d16509 Merge "Replace the SwitchBar with MainSwitch." into sc-dev am: beefb25b48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13472947

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5378d834b478d5abec20d9cc1b25d0c52fbe0c7b
2021-02-24 07:00:04 +00:00
Treehugger Robot
c7bd662dee Merge "Grant BatteryStats OWNERS for FakeUid.java" am: d8137193ae am: 59f43e5299
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1584225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1d87849cf4c8c85f19858164faff1d17cf32d43
2021-02-24 06:59:58 +00:00