From 6c046831dee2b9b0a948196154a94c55c96fc270 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Thu, 30 May 2019 15:44:07 -0700 Subject: [PATCH] Override 2 getSliceUri() instance to return platform slice (This is not a clear cherry-pick, @Override need to be removed.) Bug: 126222433 Test: robotest Merged-In: I3f9c8202d9b75b24b80ebcf385abc95f8df851e2 Change-Id: Iec9fae48e91baef5861baef946fc155b1eb37904 --- res/xml/power_usage_summary.xml | 3 +-- .../BatterySaverButtonPreferenceController.java | 13 +++++++++++++ .../AirplaneModePreferenceController.java | 17 +++++++++++++++++ .../panel/InternetConnectivityPanel.java | 3 ++- .../settings/slices/CustomSliceRegistry.java | 12 +----------- ...terySaverButtonPreferenceControllerTest.java | 7 +++++++ .../AirplaneModePreferenceControllerTest.java | 12 ++++++++---- .../panel/InternetConnectivityPanelTest.java | 3 ++- 8 files changed, 51 insertions(+), 19 deletions(-) diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml index 88f88f106d1..b32af469b59 100644 --- a/res/xml/power_usage_summary.xml +++ b/res/xml/power_usage_summary.xml @@ -37,8 +37,7 @@ android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings" android:key="battery_saver_summary" android:title="@string/battery_saver" - settings:controller="com.android.settings.fuelgauge.BatterySaverController" - settings:platform_slice="true" /> + settings:controller="com.android.settings.fuelgauge.BatterySaverController" /> uris = new ArrayList<>(); uris.add(CustomSliceRegistry.WIFI_SLICE_URI); uris.add(CustomSliceRegistry.MOBILE_DATA_SLICE_URI); - uris.add(CustomSliceRegistry.AIRPLANE_URI); + uris.add(AirplaneModePreferenceController.SLICE_URI); return uris; } diff --git a/src/com/android/settings/slices/CustomSliceRegistry.java b/src/com/android/settings/slices/CustomSliceRegistry.java index 42d81e95598..a019687011b 100644 --- a/src/com/android/settings/slices/CustomSliceRegistry.java +++ b/src/com/android/settings/slices/CustomSliceRegistry.java @@ -59,17 +59,7 @@ import java.util.Map; public class CustomSliceRegistry { /** - * Uri for Airplane mode Slice. - */ - public static final Uri AIRPLANE_URI = new Uri.Builder() - .scheme(ContentResolver.SCHEME_CONTENT) - .authority(SettingsSlicesContract.AUTHORITY) - .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION) - .appendPath(SettingsSlicesContract.KEY_AIRPLANE_MODE) - .build(); - - /** - * Uri for Contextual Adaptive Sleep Slice + * Uri for Contextual Adaptive Sleep Slice */ public static final Uri CONTEXTUAL_ADAPTIVE_SLEEP_URI = new Uri.Builder() .scheme(ContentResolver.SCHEME_CONTENT) diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java index 3509330c760..8609599f950 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java @@ -26,6 +26,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.PowerManager; +import android.provider.SettingsSlicesContract; import android.widget.Button; import androidx.preference.PreferenceScreen; @@ -72,6 +73,12 @@ public class BatterySaverButtonPreferenceControllerTest { mController.displayPreference(mPreferenceScreen); } + @Test + public void getSliceUri_shouldUsePlatformAuthority() { + assertThat(mController.getSliceUri().getAuthority()) + .isEqualTo(SettingsSlicesContract.AUTHORITY); + } + @Test public void updateState_lowPowerOn_preferenceIsChecked() { when(mPowerManager.isPowerSaveMode()).thenReturn(true); diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java index d75c9c97208..c63b8761369 100644 --- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java @@ -86,6 +86,12 @@ public class AirplaneModePreferenceControllerTest { mLifecycle.addObserver(mController); } + @Test + public void getSliceUri_shouldUsePlatformAuthority() { + assertThat(mController.getSliceUri().getAuthority()) + .isEqualTo(SettingsSlicesContract.AUTHORITY); + } + @Test @Config(qualifiers = "mcc999") public void airplaneModePreference_shouldNotBeAvailable_ifSetToNotVisible() { @@ -184,9 +190,7 @@ public class AirplaneModePreferenceControllerTest { } @Test - public void isSliceableCorrectKey_returnsTrue() { - final AirplaneModePreferenceController controller = - new AirplaneModePreferenceController(mContext,"toggle_airplane"); - assertThat(controller.isSliceable()).isTrue(); + public void isSliceable_returnsTrue() { + assertThat(mController.isSliceable()).isTrue(); } } diff --git a/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java b/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java index 42867fb6ca4..d9f56debc02 100644 --- a/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java +++ b/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java @@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.net.Uri; +import com.android.settings.network.AirplaneModePreferenceController; import com.android.settings.slices.CustomSliceRegistry; import org.junit.Before; @@ -47,7 +48,7 @@ public class InternetConnectivityPanelTest { final List uris = mPanel.getSlices(); assertThat(uris).containsExactly( - CustomSliceRegistry.AIRPLANE_URI, + AirplaneModePreferenceController.SLICE_URI, CustomSliceRegistry.MOBILE_DATA_SLICE_URI, CustomSliceRegistry.WIFI_SLICE_URI); }