Bob Badour
f2f318f18d
[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: Id5e73600ab2dc3bd9c0c99b03f22f012c1160614
2021-02-26 02:44:34 +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
c0b3bfb286
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: I3735572be27b93e00691de662f0b9e44ba5fe29b
2021-02-25 21:00:00 +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
f556b0b1cd
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: I14d475ef01e3697b96b40da9ee189779da12311e
2021-02-25 17:20:55 +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
7e050923f1
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: Iff978ed14dd30503261ea93620e2ef7646e2d1cf
2021-02-25 14:47:37 +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
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
66ddd40687
[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: Ibbdead75a5ae52eec268d6275c2964a8e6f00a6e
2021-02-25 11:03:42 +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
TreeHugger Robot
06d7a4a13d
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: I03850c15c2765037205c7165ba493c40814f6b17
2021-02-25 08:20:02 +00: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
Pasty Chang
ba5e25e3b1
Set ConfirmDeviceCredentialActivity non-external in FRP
...
FRP ConfirmDeviceCredentialActivity launched in initial setup flow should belong to internal flow, so it needs to set the external flag to false. It can transmit setup intent extra to the stencil library to make the screen be applied to the stencil and BC layout.
Bug: 171950236
Test: Manual test & RunSettingsGoogleRoboTests
Change-Id: Ia98d1bb4fc3a1687992b202b1e58afc1463efaf4
2021-02-25 08:05:07 +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
Paul Hu
a4c893363c
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: If11af2f063a4707af9ff9eba2a7c563cd53a5a8d
2021-02-25 04:31:37 +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
f73bf9218e
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: I0260967c990f164a9f4c4e1363b41d19f3a104b8
2021-02-25 02:42:30 +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
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
13d548bbe6
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: I0cabfaa2a06c217b9d01333b5464d3d09ec0d2c2
2021-02-24 21:18:28 +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
2dd4c3b2fd
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: I5e2058078359d1545bfb6d7ef5ad73e27901de1a
2021-02-24 18:28:52 +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
576c2a9ea2
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: I8a971dee1aee3a124a2a15dbf3c7309fe0393946
2021-02-24 15:57:48 +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
49e8f66cfa
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: Ic69d644ee3ec46944e61725205eb9bd2c810bbd8
2021-02-24 13:47:00 +00:00
TreeHugger Robot
80efd17dc7
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: Id7d82d3d6069ea25b90a75c728e8ae02f8c6b7fd
2021-02-24 13:46:26 +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
80f413f99d
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: I79130f3ee87929b2ea417fc03196aa1df7ddd9cc
2021-02-24 11:40:21 +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