PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update airplane mode key to match framework constant" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-23 03:00:47 +00:00
committed by Android (Google) Code Review
parent 5a0a7ef4bb 8ad8516f48
commit 6be5e331cf
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
View File

@@ -26,6 +26,7 @@ import android.content.ContentResolver;
import android.content.Context;
import android.content.pm.PackageManager;
import android.provider.Settings;
import android.provider.SettingsSlicesContract;
import android.support.v7.preference.PreferenceManager;
import android.support.v7.preference.PreferenceScreen;
@@ -69,12 +70,12 @@ public class AirplaneModePreferenceControllerTest {
mResolver = RuntimeEnvironment.application.getContentResolver();
doReturn(mPackageManager).when(mContext).getPackageManager();
mController = new AirplaneModePreferenceController(mContext,
AirplaneModePreferenceController.KEY_TOGGLE_AIRPLANE);
SettingsSlicesContract.KEY_AIRPLANE_MODE);
mPreferenceManager = new PreferenceManager(mContext);
mScreen = mPreferenceManager.createPreferenceScreen(mContext);
mPreference = new RestrictedSwitchPreference(mContext);
mPreference.setKey("toggle_airplane");
mPreference.setKey(SettingsSlicesContract.KEY_AIRPLANE_MODE);
mScreen.addPreference(mPreference);
mController.setFragment(null);
mLifecycleOwner = () -> mLifecycle;

3
tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
View File

@@ -33,6 +33,7 @@ import android.net.IConnectivityManager;
import android.net.NetworkRequest;
import android.os.IBinder;
import android.os.UserHandle;
import android.provider.SettingsSlicesContract;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
@@ -88,7 +89,7 @@ public class VpnPreferenceControllerTest {
doReturn(true).when(mController).isAvailable();
mController.displayPreference(mScreen);
verify(mPreference).setDependency(AirplaneModePreferenceController.KEY_TOGGLE_AIRPLANE);
verify(mPreference).setDependency(SettingsSlicesContract.KEY_AIRPLANE_MODE);
}
@Test