Commit Graph

34816 Commits

Author SHA1 Message Date
Jeremy Goldman
e092a54381 Merge "Update string for discarding changes to a particular APN's settings." 2020-12-14 04:42:09 +00:00
Jeremy Goldman
11f91e47ea Merge "Enhanced4gBasePreferenceControllerTest migrated to junit" 2020-12-14 02:58:24 +00:00
Jeremy Goldman
7a16e45290 Update string for discarding changes to a particular APN's settings.
Previously was unclear whether the changes, or the entire APN was
being discarded. The word "Cancel" more closely implies that the most
recent changes to the screen will be discarded rather than the entire
APN.

This only changes the resource for english. However, many other
languages have a menu_cancel string that seems much closer
to "Cancel" than "Discard" as well.

i.e. http://cs/android/packages/apps/Settings/res/values-zu/strings.xml?l=1029&rcl=a7397bec91183a7a32561fd8d67b0478af6c65bb
http://cs/android/packages/apps/Settings/res/values-es/strings.xml?l=1029&rcl=a7397bec91183a7a32561fd8d67b0478af6c65bb

Bug: 171538880
Test: N/A
Change-Id: I80fde04dbc36078d5c53e68231fcc4e5c3cf94e6
2020-12-14 02:57:39 +00:00
TreeHugger Robot
e1f15ccc1d Merge "Add the mutability flag to BluetoothDevicesSlice." 2020-12-14 02:47:41 +00:00
TreeHugger Robot
6571548a37 Merge "[Provider Model] Fix the NetworkDashboardFragmentTest failed issue" 2020-12-13 15:18:40 +00:00
Jeremy Goldman
4348c2c826 Enhanced4gBasePreferenceControllerTest migrated to junit
Bug: 175389659
Test: atest -c Enhanced4gBasePreferenceControllerTest
Change-Id: I7ebcb303eb74168b81dd650fe78f3988647aa64d
2020-12-12 01:11:13 +08:00
Zim
abb239f4a4 Change transcoding default values
1. transcode_enabled: s/false/true/
2. transcode_default: s/false/true/

This is to maintain consistence with the MediaProvider defaults and it
only affects the 'checked' state when a user hasn't checked anything

Test: Manual
Bug: 175309276
Change-Id: Ic81490a944407e30f9cd207f64f2a0f5530a23d3
2020-12-11 15:48:21 +00:00
Zoey Chen
e05e21bfe7 Merge "[Provider Model] Should show "No SIM" if there is no SIM in the device." 2020-12-11 14:55:51 +00:00
Zoey Chen
44559badaf [Provider Model] Should show "No SIM" if there is no SIM in the device.
Bug: 172053880
Test: atest NetworkProviderCallsSmsControllerTest#getSummary_noSim_returnNoSim
Change-Id: I31fd8b4b6928ef8aa7c45ac7651fa26e0b08446e
2020-12-11 20:29:13 +08:00
Yi-Ling Chuang
32e7118161 Add the mutability flag to BluetoothDevicesSlice.
Starting Android S, all PendingIntent has to have a explicit mutability
flag set.

Fixes: 172207505
Fixes: 172811893
Test: Enable BluetoothDevicesSlice and play on it.
Play on the volume panel.

Change-Id: I618455de683d619fe300309e31864b3c64f12ad1
2020-12-11 15:32:23 +08:00
Weng Su
66869d2ff5 [Provider Model] Fix the NetworkDashboardFragmentTest failed issue
Since the getPreferenceScreenResId() is modified to return different resource ID when provider model enabled. So we need to update SEARCH_INDEX_DATA_PROVIDER class to match the same behavior.

Bug: 175290124
Test:
- Set Settings/System/Developer options/Feature
flags/settings_provider_model to true.
- atest -c NetworkDashboardFragmentTest

Change-Id: I05b0f830158429ddbbfba414cdb33a6df6a7465e
2020-12-10 13:29:49 +00:00
Manish Singh
7a418b240e Merge "Remove transcoding for apps from Settings." 2020-12-10 07:50:17 +00:00
TreeHugger Robot
04322e2202 Merge "Add mutability flag to WifiSlice." 2020-12-10 06:37:36 +00:00
Robert Luo
ce694271f2 Merge "Migrate media output switcher metrics - 3/n" 2020-12-10 02:36:59 +00:00
TreeHugger Robot
6172a98b2b Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196 am: 423bcb4fbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01cfff4403d6e3499ae2608e34b9184b6358097f
2020-12-09 14:31:49 +00:00
TreeHugger Robot
f49e9d2196 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36f99bfb1e5eee253bb4ce030d7000cb40c2ff63
2020-12-09 13:49:10 +00:00
Yi-Ling Chuang
49cda22b76 Add mutability flag to WifiSlice.
Starting Android S, PendeingIntent should have a explicit mutability
flag to avoid vulnerability.

Fixes: 172204181
Test: 1. adb shell am start -a
android.settings.panel.action.INTERNET_CONNECTIVITY and play on the wifi
panel.
2. Enable contextualWifiSlice and play on it.
3. Adjust volume on the volume panel.

Change-Id: I23f03cae8c481d9f5836b7fb967f734e9c99cd65
2020-12-09 21:35:15 +08:00
TreeHugger Robot
635029b87f Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad91ec439965d52c652f79ce4d6fe3b125631f79
2020-12-09 13:03:53 +00:00
TreeHugger Robot
cfdae774cd Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3605d2b4dbad8b7b4979b644c89352ee8449ba1
2020-12-09 12:17:08 +00:00
TreeHugger Robot
2117006bc6 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d7dcaefd10f297c9e268d8f9d8bf666d98b08fd
2020-12-09 12:08:40 +00:00
TreeHugger Robot
504b96d76c Merge "Add bluetooth package to permission request intent" into oc-mr1-dev 2020-12-09 12:06:33 +00:00
Jakub Pawlowski
c721dc5bad Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I956e8906633af45f12617dabbec4e060c14502f2
2020-12-09 11:32:56 +00:00
Jakub Pawlowski
b29c036522 Prevent overlay drawing on top of Bluetooth activity dialog
Bug: 168504491
Merged-In: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
Change-Id: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
2020-12-09 08:00:22 +00:00
Manish Singh
8b5f7d8f75 Remove transcoding for apps from Settings.
Now that we read the transcode_compat_manifest from DeviceConfig, we
don't need the app-level transcoding settings in Media transcoding
settings.

BUG=169327180
Test: manual testing.

Change-Id: Iea0c02820cb850c98d6c8f23ce828fa3d163bd80
2020-12-09 01:49:09 +00:00
TreeHugger Robot
8911c5b632 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2 am: 4c4f83eb21 am: f0322276a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e3add9dbe9dd2f5544ae64889282d1235add8c2
2020-12-09 00:48:28 +00:00
TreeHugger Robot
4c4f83eb21 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic39ad9f7212cdb757f79c61e23c84ac614e73fed
2020-12-08 23:58:02 +00:00
TreeHugger Robot
537c730ca2 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c3d91f901bc38554732ff2cc428232f117efea0
2020-12-08 23:27:51 +00:00
TreeHugger Robot
721f43dcdc Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev 2020-12-08 22:56:46 +00:00
TreeHugger Robot
84d4237008 Merge "Fix advanced device icon won't update issue" 2020-12-08 02:29:37 +00:00
Eugene Susla
c8d81959a2 RESTRICT AUTOMERGE am: 2e82aa5d05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689

Change-Id: I850120ab85fa938ebce7115c778b833b5266594c
2020-12-07 19:28:31 +00:00
Julia Reynolds
fcfc260cf5 Merge "Stop depending on empty Settings" 2020-12-07 18:31:26 +00:00
Jiashen Wang
8b113cb74a Merge "[SIM Dialog Migration] Sending push notification after DSDS reboot" 2020-12-07 18:31:06 +00:00
Jiashen Wang
ea5ef92219 Merge "[SIM Dialog Migration] Enable SIM operation dialog in Settings" 2020-12-07 18:31:02 +00:00
Jiashen Wang
9c14ca798a Merge "Fix the dialog presist issue after toggling pSIM" 2020-12-07 18:30:44 +00:00
Hugh Chen
5caaded598 Fix advanced device icon won't update issue
Add refresh() in onStart() state to fix UI won't update
when resume the activity.

Bug: 174728714
Test: make -j42 RunSettingsRoboTests
Change-Id: I86d21486c1466aa466ef67db667b3a40cd90230c
2020-12-07 16:28:17 +08:00
TreeHugger Robot
538f5420ac Merge "Fine tune the icon size for some pages" 2020-12-07 08:14:17 +00:00
Manish Singh
b309d3af6d Merge "Introduce new preference indicating user control." 2020-12-07 06:50:23 +00:00
Weng Su
cdb843d932 Merge "[Provider Model] Add Airplane-safe networks slice" 2020-12-07 06:23:55 +00:00
TreeHugger Robot
ab00a8dd36 Merge "[Provider Model] Modify the class name to GenericSwitchController" 2020-12-07 06:13:48 +00:00
Manish Singh
47445745be Introduce new preference indicating user control.
If the user enables this, then that means that we will respect user's
choices for all the preferences, i.e. we will not update the preferences
based on the updates from server.
On the other hand, if it's disabled, then the rest of the preferences
would not be considered.  And we'd decide their values based on the
values from the DeviceConfig (which in turn come from the server).

The controller for the default-transcoding-behavior for apps was also
added.

Also, renaming the set prop key for enabling-transcode to match the one
in DeviceConfig - transcode_enabled.
And while we were at it, we renamed the stirng from "disabling
transcoding for all apps" to "enabling transcoding for all apps"; and
also changed the controller to enable (instead of disable) transcoding.

BUG:169327180

Test: manual testing. And added unit test for
TranscodeUserControlPreferenceControllerTest.

Change-Id: If9b9face51b669f5177be8bfa18f44471f531058
2020-12-07 03:53:14 +00:00
Jiashen Wang
8271561a76 [SIM Dialog Migration] Enable SIM operation dialog in Settings
Change Settings to not call SubscriptionManager#setSubscriptionEnabled.
Instead, make Settings call EuiccManager APIs directly.
Design: https://docs.google.com/document/d/1wb5_hoBkZVbkXGNWHbx4Jf61swjfxsJzkytiTzJosYo/edit?usp=sharing
Bug: 160819390
Test: Manually tested eSIM profile enabling.

Change-Id: I56bbcbb9ccb886b0f9249e67c5a6a6444bb7dd45
2020-12-05 21:48:09 -08:00
Jiashen Wang
74614a2865 Fix the dialog presist issue after toggling pSIM
Bug: 170507290
Test: Manually tested it.
Change-Id: I202ff83bfa72d998ba70774d1998bc827b1b0c8e
2020-12-04 15:32:06 -08:00
Kevin Chyn
edb5aab5b9 Merge changes I7cdf5fc4,I701baf06
* changes:
  Start udfps enroll after activity animates in
  Update portrait enrollment for UDFPS
2020-12-03 19:18:58 +00:00
Weng Su
6c430b370d [Provider Model] Modify the class name to GenericSwitchController
- The generic class can be used for multiple controllers

Bug: 174022082
Test:
- atest -c AirplaneSafeNetworksPreferenceControllerTest
- make RunSettingsRoboTests
ROBOTEST_FILTER=AllInOneTetherPreferenceControllerTest
- make RunSettingsRoboTests
ROBOTEST_FILTER=AutomaticStorageManagementSwitchPreferenceControllerTest
- make RunSettingsRoboTests
ROBOTEST_FILTER=WifiPrimarySwitchPreferenceControllerTest

Change-Id: I7d50ae3e6228005eb6dfb0a6c1a2f870c41330f2
2020-12-03 17:40:37 +00:00
Weng Su
96af1674f8 [Provider Model] Add Airplane-safe networks slice
- Hide slice when Airplane Mode is off

- Show slice when Airplane Mode is on
  - Show "View airplane-safe networks" when Wi-Fi is disabled
  - Show "Turn off Airplane Mode" when Wi-Fi is enabled

- Tap "View airplane-safe networks" will set Wi-Fi enabled

- Tap "Turn off Airplane Mode" will set airplane Mode off

- Plan to update the slice to Button style in next cl

- Screenshot
  https://screenshot.googleplex.com/7wHoqvTjaScHXVm

Bug: 173413889
Test:
- atest -c AirplaneSafeNetworksSliceTest
- adb shell am start -a
android.settings.panel.action.INTERNET_CONNECTIVITY

Change-Id: Idcd70348728db2da91582697aaeb4bbf4da117c6
2020-12-03 13:29:56 +00:00
Tsung-Mao Fang
3d01afc621 Fine tune the icon size for some pages
Based on our Android S spec, we should make the size smaller for icons.

Test:
Notification access: https://screenshot.googleplex.com/Ah8wjmzggDQyhmP
Device admin: https://screenshot.googleplex.com/5tS64HxZz3ywPZZ
Fix: 174739497
Change-Id: Iad4a48b558084d7374fec515891d01d3e7d41108
2020-12-03 12:58:29 +00:00
Alex Johnston
25cca45c09 Merge "Add credential management app preference to Settings" 2020-12-03 10:00:27 +00:00
TreeHugger Robot
e08936a25b Merge "Show Floating action button to request manage credentials" 2020-12-03 09:02:21 +00:00
Alex Johnston
672c2aaaec Add credential management app preference to Settings
Background
* This is part of the work to support
  a credential management app on
  unmanaged devices.
Changes
* Add a preference controller which will only
  be enabled if there is a credential management app.
* Add a fragment to display details on the credential
  management app and its policy. Add a remove button
  to remove the credential management app.
* Link CredentialManagementAppAdapter to new fragment
  and add expander.

Manual Testing
* Verify preference is disabled if there is no credential
  management app.
* Verify preference summary shows credential mangement
  app name if a credential management app exists.
* Verify fragment details page displays the
  authentication policy correctly.

Bug: 165641221
Test: Manual testing
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.security.CredentialManagementAppFragmentTest
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.security.CredentialManagementAppControllerTest
Change-Id: I06d6b88d0c89022f7a6cbf3031834defcb54bd51
2020-12-03 07:23:50 +00:00
John Li
e986314b06 Merge "Add haptic effect for the seekbar in Settings 5/n." 2020-12-03 02:14:37 +00:00