Make some existing slices public.

Only PreferenceControllers with isPublicSlice() set to true are exposed
to other apps. Others will be Settings only.

Bug: 141088937
Test: robotests
Change-Id: I5934e89bc1b268fdd44acd630621fa46987728ff
This commit is contained in:
Yi-Ling Chuang
2019-11-27 18:33:34 +08:00
parent 617458b07c
commit 430c16c012
10 changed files with 75 additions and 7 deletions

View File

@@ -55,6 +55,11 @@ public class SmartBatteryPreferenceController extends BasePreferenceController i
return TextUtils.equals(getPreferenceKey(), "smart_battery");
}
@Override
public boolean isPublicSlice() {
return true;
}
@Override
public void updateState(Preference preference) {
super.updateState(preference);

View File

@@ -59,7 +59,7 @@ public class BatterySaverButtonPreferenceController extends
}
@Override
public boolean isSliceable() {
public boolean isPublicSlice() {
return true;
}

View File

@@ -103,7 +103,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
}
@Override
public boolean isSliceable() {
public boolean isPublicSlice() {
return true;
}

View File

@@ -23,7 +23,7 @@ import android.net.Uri;
import android.nfc.NfcAdapter;
import android.provider.Settings;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
@@ -90,7 +90,7 @@ public class NfcPreferenceController extends TogglePreferenceController
}
@Override
public boolean isSliceable() {
public boolean isPublicSlice() {
return true;
}

View File

@@ -77,7 +77,7 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
}
@Override
public boolean isSliceable() {
public boolean isPublicSlice() {
return true;
}

View File

@@ -120,4 +120,9 @@ public class SmartBatteryPreferenceControllerTest {
new SmartBatteryPreferenceController(null);
assertThat(controller.isSliceable()).isTrue();
}
@Test
public void isPublicSlice_returnsTrue() {
assertThat(mController.isPublicSlice()).isTrue();
}
}

View File

@@ -110,4 +110,9 @@ public class BatterySaverButtonPreferenceControllerTest {
verify(mPowerManager).setPowerSaveModeEnabled(false);
}
@Test
public void isPublicSlice_returnsTrue() {
assertThat(mController.isPublicSlice()).isTrue();
}
}

View File

@@ -191,4 +191,9 @@ public class AirplaneModePreferenceControllerTest {
public void isSliceable_returnsTrue() {
assertThat(mController.isSliceable()).isTrue();
}
@Test
public void isPublicSlice_returnsTrue() {
assertThat(mController.isPublicSlice()).isTrue();
}
}

View File

@@ -25,7 +25,6 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.nfc.NfcAdapter;
import android.nfc.NfcManager;
import android.os.UserManager;
@@ -36,7 +35,6 @@ import androidx.preference.SwitchPreference;
import com.android.settings.nfc.NfcPreferenceController.NfcSliceWorker;
import com.android.settings.nfc.NfcPreferenceController.NfcSliceWorker.NfcUpdateReceiver;
import com.android.settings.slices.SliceBuilderUtils;
import org.junit.Before;
import org.junit.Test;
@@ -286,4 +284,9 @@ public class NfcPreferenceControllerTest {
verify(worker).updateSlice();
}
@Test
public void isPublicSlice_returnsTrue() {
assertThat(mNfcController.isPublicSlice()).isTrue();
}
}

View File

@@ -0,0 +1,45 @@
/*
* Copyright (C) 2019 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.nfc;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class SecureNfcPreferenceControllerTest {
private Context mContext;
private SecureNfcPreferenceController mController;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mController = new SecureNfcPreferenceController(mContext, "nfc_secure_settings");
}
@Test
public void isPublicSlice_returnsTrue() {
assertThat(mController.isPublicSlice()).isTrue();
}
}