Commit Graph

80546 Commits

Author SHA1 Message Date
Janis Danisevskis
e2bfcf88b7 Address nits from ag/13702356
Test: N/A
Bug: 171305607
Bug: 171305388
Change-Id: I044beb29ad84b1b016075997979766035e8be49d
2021-02-26 08:13:12 -08:00
Janis Danisevskis
e067adcce7 Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." into sc-dev 2021-02-26 16:05:13 +00:00
Mill Chen
dc92d9e4c4 Make sucUsePartnerResource configurable
The sucUsePartnerResource attribute should be able to configure
seperately. In order to make it happen, we created a config for
sucUsePartnerResource.

Bug: 179882711
Test: robotests
Change-Id: I755ea30f52d58167ab377277f7181696e72e184c
2021-02-26 23:53:54 +08:00
Naga Venkata Durga Ashok Mutyala
f76cd69793 Wellbeing Package needs to be enabled by default
Add the wellbeing application to keepEnabledPackages.
so, it will prevent the users to disable explicitly.

Test: NA
Bug: 180078180
Change-Id: I2645f30fac60106410eaf2126c10d8ab804fd1b7
2021-02-26 15:09:55 +00:00
jasonwshsu
93ef33655c Setup basic layout and resources for the accessibility button settings page
Bug: 173940869
Test: atest AccessibilityButtonFragmentTest
Change-Id: I3f1d8b161d1baadeead36f49f18f00a91fd40b4c
2021-02-26 18:32:28 +08:00
Treehugger Robot
3296755ff9 Merge "Keystore 2.0: Update credential settings to use public Keystore API." am: 7086917968 am: 08bea2183d am: a409521a64 am: 4e10002367
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e1974eb69cbdfb0e5323e594ff01e82b69168c2
2021-02-26 06:04:13 +00:00
Treehugger Robot
4e10002367 Merge "Keystore 2.0: Update credential settings to use public Keystore API." am: 7086917968 am: 08bea2183d am: a409521a64
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cbc5fd554cd49ffb52c0852a8537f53cf5e0f54
2021-02-26 05:28:17 +00:00
Treehugger Robot
a409521a64 Merge "Keystore 2.0: Update credential settings to use public Keystore API." am: 7086917968 am: 08bea2183d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72543a317bfd1302e5f2226516658f61e7f4547a
2021-02-26 04:33:43 +00:00
Treehugger Robot
08bea2183d Merge "Keystore 2.0: Update credential settings to use public Keystore API." am: 7086917968
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31b4a6e88530092dc2849dc4fb7e09c0d5463db3
2021-02-26 03:55:00 +00:00
Bob Badour
82798df54a [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings am: a73a67240c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13701598

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iada5fa90a369fc0476be9a58facf465778622f20
2021-02-26 02:45:14 +00:00
Treehugger Robot
7086917968 Merge "Keystore 2.0: Update credential settings to use public Keystore API." 2021-02-26 01:50:16 +00:00
Janis Danisevskis
93af3137fc Keystore 2.0: Update Wifi settings to use mostly public keystore API.
Test: N/A
Bug: 171305607
Bug: 171305388
Merged-In: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
Change-Id: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
2021-02-25 17:40:19 -08:00
Janis Danisevskis
a05bd65cb6 Keystore 2.0: Update credential settings to use public Keystore API.
Test: N/A
Bug: 171305607
Bug: 171305388
Change-Id: I377115aca6b2df8052ae118f986c2f713535b6ec
2021-02-25 15:58:22 -08:00
sallyyuen
c5de80db1c Fix capitalization error for Reduce brightness
Bug: b/181265718
Test: n/a
Change-Id: Iceaac4c701dc382e62764bab42e4f3768fa7d0cf
2021-02-25 15:11:20 -08:00
Bob Badour
a73a67240c [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings
Added SPDX-license-identifier-Apache-2.0 to:
  Android.bp
  protos/Android.bp
  tests/anomaly-tester/Android.bp
  tests/componenttests/Android.bp
  tests/legacy_unit/InstrumentedEntitlementApp/Android.bp
  tests/perftests/Android.bp
  tests/robotests/Android.bp
  tests/uitests/Android.bp
  tests/unit/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I58a85aced69923fa9a8e5a2b89ecfdd33de5e05c
2021-02-25 15:05:14 -08:00
Bob Badour
2984c04968 Revert "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings" am: 18e9723489
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13701074

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iabca0d70cea8407f465a6cfcfc2854407a68595b
2021-02-25 20:57:38 +00:00
Bob Badour
18e9723489 Revert "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings"
This reverts commit 0e73d05c74.

Change-Id: I627be6c5355eda9602b1cb201806fce4548fc951
2021-02-25 11:52:32 -08:00
sallyyuen
ade7bd8627 Call into ColorDisplayManager for RBC slider range
Test: atest ReduceBrightColorsIntensityPreferenceControllerTest
Bug: b/179805222
Change-Id: I0927f41fad27e6b9b54c374e2c6a7cc6e0c5240d
2021-02-25 10:34:16 -08:00
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
Jeremy Goldman
5a36305aae StorageProfileFragmentTest converted to JUnit
Looper and UIThreadTest added.

Test: atest -c StorageProfileFragmentTest
Change-Id: Ib561a0e87a0b5034f7692f2567c8617e7f5f763e
2021-02-25 15:20:12 +08: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