Commit Graph

35533 Commits

Author SHA1 Message Date
Bonian Chen
d929097128 Merge "[Settings] Only display backup calling when more than 1 SIM" into sc-dev am: 3f211d4c64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13715532

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idbaa1dae43d694a447761f46d3f48dd255e1b50d
2021-03-03 00:18:58 +00:00
Bonian Chen
3f211d4c64 Merge "[Settings] Only display backup calling when more than 1 SIM" into sc-dev 2021-03-02 23:19:24 +00:00
Treehugger Robot
e696e52fd3 Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 am: 9059706e7b am: bfa57a33ee am: 2a6d2e4a2d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I011ebcf279e1efb16399efe6222a63e8f80c7571
2021-03-02 21:05:12 +00:00
Treehugger Robot
2a6d2e4a2d Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 am: 9059706e7b am: bfa57a33ee
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe6db36fc0039d10f352756b2c8d398a225c6a55
2021-03-02 20:38:41 +00:00
Treehugger Robot
bfa57a33ee Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 am: 9059706e7b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd1aa5ea04aa3ff22ece59fe04bc69c7e15385bd
2021-03-02 19:47:20 +00:00
Treehugger Robot
9059706e7b Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12e20519ac29f802f9983dcf27f313388b33829c
2021-03-02 19:05:16 +00:00
Sally Yuen
b3d9280c3f Merge "Call into ColorDisplayManager for RBC slider range" into sc-dev am: 4d5a03da7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13688354

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8322e261f22e96fd9e05700f6aff0d90a94628e3
2021-03-02 18:39:46 +00:00
Sally Yuen
d10678e2bf Merge "[Reduce Bright Colors] reorder preferences" into sc-dev am: 18923596c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13501300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic68068d76c144c2a622b03aac056a90a42db0140
2021-03-02 18:38:50 +00:00
Sally Yuen
4d5a03da7e Merge "Call into ColorDisplayManager for RBC slider range" into sc-dev 2021-03-02 17:38:30 +00:00
Sally Yuen
18923596c4 Merge "[Reduce Bright Colors] reorder preferences" into sc-dev 2021-03-02 17:31:15 +00:00
Bonian Chen
a9a411e3df [Settings] Only display backup calling when more than 1 SIM
Backup calling only available when more than 1 SIM available.

Bug: 179802059
Test: on device
Change-Id: I24e5eb9e1a7064c3ea65389fbb00c0ff2a5852ed
2021-03-02 21:14:53 +08:00
TreeHugger Robot
845a518a04 Merge "Avoid double-badging application icon in the dialog" into sc-dev am: c752d2e25b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13698226

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8c1cbb51fe5e4ef06a851f5efc4809e9bafc77f
2021-03-02 09:03:07 +00:00
TreeHugger Robot
c752d2e25b Merge "Avoid double-badging application icon in the dialog" into sc-dev 2021-03-02 07:57:25 +00:00
Treehugger Robot
b6dc427c50 Merge "Wellbeing Package needs to be enabled by default" 2021-03-02 06:09:37 +00:00
Yanting Yang
23b5a53d93 Merge "Clean up RestrictedHomepagePreference" into sc-dev am: 082de8bfd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13694187

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieddb41929c43bf0c7e1786a2d2d76fb0c5110bb8
2021-03-02 05:19:07 +00:00
Yanting Yang
082de8bfd9 Merge "Clean up RestrictedHomepagePreference" into sc-dev 2021-03-02 04:15:54 +00:00
TreeHugger Robot
2f0f0db2ec Merge "Update UI for factory reset flow" into sc-dev am: 0994940af2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13693503

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ca0f0fd3d652bc44c4cf9308e748565f02dbb78
2021-03-02 02:22:53 +00:00
TreeHugger Robot
4a98bad643 Merge "[Provider Model] Show connected networks in APM/APM networks" into sc-dev am: 9531fb8ffb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13664265

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I327a90bda998ef4e25974bbf1e3bbc2a0348e1ff
2021-03-02 02:22:11 +00:00
TreeHugger Robot
0994940af2 Merge "Update UI for factory reset flow" into sc-dev 2021-03-02 02:04:43 +00:00
TreeHugger Robot
9531fb8ffb Merge "[Provider Model] Show connected networks in APM/APM networks" into sc-dev 2021-03-02 01:53:04 +00:00
Janis Danisevskis
62637de424 Merge "Address nits from ag/13702356" into sc-dev am: 5e57390696
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13711305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ed4d080b81d91f6f130c70bc598457c91656431
2021-03-01 23:18:08 +00:00
Janis Danisevskis
5e57390696 Merge "Address nits from ag/13702356" into sc-dev 2021-03-01 22:33:46 +00:00
Weng Su
f1489b51a3 [Provider Model] Show connected networks in APM/APM networks
- Separate APM and APM network types from other Internet types because
they can coexist at the same time.

- Show no internet icon in airplane-mode networks.

- Show connected non-carrier(Wi-Fi) network in airplane-mode networks.

- Show connected Ethernet network when airplane mode on.

- Screenshot:
  https://screenshot.googleplex.com/cr3eWNLMEuJ8zvP
  https://screenshot.googleplex.com/6DiMqKBBnBoxxhN

Bug: 180778141
Bug: 180778839
Bug: 179106406
Test: manual test
atest -c ConnectedEthernetNetworkControllerTest \
         InternetConnectivityPanelTest \
         InternetPreferenceControllerTest \
         InternetUpdaterTest

Change-Id: I861d5ce879facbb61dfdc5b7be943662d55bdcca
2021-03-02 02:59:11 +08:00
sallyyuen
9f5080599c [Reduce Bright Colors] reorder preferences
Test: Manual
Bug: 128465252
Change-Id: I76b0b0c510a438a05c77cd77b64281882e553124
2021-03-01 09:44:18 -08:00
TreeHugger Robot
f5aac9aca1 Merge "Include 1xRTT when updating set of RATs via "Allow 2G" toggle." into sc-dev am: fd510f5b67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13715406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09e18fdadf130e00234c6016c24545036455d8c3
2021-03-01 10:36:00 +00:00
TreeHugger Robot
fd510f5b67 Merge "Include 1xRTT when updating set of RATs via "Allow 2G" toggle." into sc-dev 2021-03-01 09:35:13 +00:00
Julia Reynolds
fff6dde818 Merge "Updates to NLS notif type filtering" into sc-dev am: 6698d3b2c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13691340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9c1ac17f70d6b1fa4b9185cd7947dcaff8f48e5
2021-02-27 15:54:14 +00:00
Julia Reynolds
6698d3b2c8 Merge "Updates to NLS notif type filtering" into sc-dev 2021-02-27 15:34:35 +00:00
Yomna Nasser
7c7977efae Include 1xRTT when updating set of RATs via "Allow 2G" toggle.
Update BITMASK_2G to include 1xRTT when disabling/enabling 2G
via toggle in Enable2gPreferenceController. This is to align
with TelephonyManager's NETWORK_CLASS_BITMASK_2G.

Bug: b/163168917
Test: m & atest -c Enable2gPreferenceControllerTest
Change-Id: Ia0e099b63a9089be8cd8bfd4211db9eb3c506fc3
2021-02-27 00:11:01 +00:00
Julia Reynolds
dc79f1ba99 Updates to NLS notif type filtering
- Allow an app to tell us they will never bridge a notification
type. We will then not let a user select that type
- Checkboxes everywhere.

Test: Settings unit
Bug: 181125165
Bug: 181124973
Change-Id: I73939d3d0e99016456e009b2f104cdded98411c6
2021-02-26 19:27:25 +00:00
Janis Danisevskis
3ac41cc279 Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." into sc-dev am: e067adcce7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13702356

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I268cbf5ec0d25f86e4614fafd1f3edd5ea261d79
2021-02-26 16:58:15 +00:00
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
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
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
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
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
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