From 845db3499dbac3c64c993aabf8c5f0eac3791e7d Mon Sep 17 00:00:00 2001 From: Weng Su Date: Mon, 23 Nov 2020 16:36:14 +0000 Subject: [PATCH] [Provider Model] Add Airplane-safe Networks preference - Hide the preference when airplane mode is off. - Reuse PrimarySwitchPreference for RestrictedSwitchPreference - Screenshot https://screenshot.googleplex.com/8HiC5sc8xaqnhz5 Bug: 174022082 Test: atest -c AirplaneSafeNetworksPreferenceControllerTest Change-Id: I06a56e8e815778cebf200c4a486c414e92f4cb87 --- res/xml/network_provider_internet.xml | 7 +- ...planeSafeNetworksPreferenceController.java | 106 ++++++++++++++++ .../network/NetworkDashboardFragment.java | 1 + .../widget/PrimarySwitchController.java | 47 +++++-- ...eSafeNetworksPreferenceControllerTest.java | 118 ++++++++++++++++++ 5 files changed, 265 insertions(+), 14 deletions(-) create mode 100644 src/com/android/settings/network/AirplaneSafeNetworksPreferenceController.java create mode 100644 tests/unit/src/com/android/settings/network/AirplaneSafeNetworksPreferenceControllerTest.java diff --git a/res/xml/network_provider_internet.xml b/res/xml/network_provider_internet.xml index a0794780430..20cf2be9dea 100644 --- a/res/xml/network_provider_internet.xml +++ b/res/xml/network_provider_internet.xml @@ -57,18 +57,17 @@ android:key="airplane_mode" android:title="@string/airplane_mode" android:icon="@drawable/ic_airplanemode_active" - android:disableDependentsState="true" android:order="-5" settings:controller="com.android.settings.network.AirplaneModePreferenceController" settings:userRestriction="no_airplane_mode"/> -