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

Update screen pinning state whenever it changes.

Browse Source 
Change-Id: I98f0a7b0afcc76bcf822786e6cf3ea37004db1a8
Fixes: 71845181
Test: robotests
This commit is contained in:
Fan Zhang
2018-01-11 12:38:22 -08:00
parent 66898b0cc9
commit f93fcd366a
2 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/settings/security/ScreenPinningPreferenceController.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.security;
import android.content.Context; import android.content.Context;
import android.provider.Settings; import android.provider.Settings;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
@@ -38,19 +37,16 @@ public class ScreenPinningPreferenceController extends BasePreferenceController
} }
@Override @Override
public void displayPreference(PreferenceScreen screen) { public String getSummary() {
super.displayPreference(screen); return Settings.System.getInt(mContext.getContentResolver(),
final Preference preference = screen.findPreference(getPreferenceKey()); Settings.System.LOCK_TO_APP_ENABLED, 0) != 0
if (preference == null) { ? mContext.getString(R.string.switch_on_text)
return; : mContext.getString(R.string.switch_off_text);
} }
if (Settings.System.getInt(mContext.getContentResolver(),
Settings.System.LOCK_TO_APP_ENABLED, 0) != 0) { @Override
preference.setSummary( public void updateState(Preference preference) {
mContext.getString(R.string.switch_on_text)); super.updateState(preference);
} else { preference.setSummary(getSummary());
preference.setSummary(
mContext.getString(R.string.switch_off_text));
}
} }
} }

19
tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
View File

@@ -18,23 +18,19 @@ package com.android.settings.security;
import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.provider.Settings; import android.provider.Settings;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.TestConfig; import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
@@ -43,10 +39,6 @@ import org.robolectric.annotation.Config;
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ScreenPinningPreferenceControllerTest { public class ScreenPinningPreferenceControllerTest {
@Mock
private PreferenceScreen mScreen;
private FakeFeatureFactory mFeatureFactory;
private Context mContext; private Context mContext;
private ScreenPinningPreferenceController mController; private ScreenPinningPreferenceController mController;
private Preference mPreference; private Preference mPreference;
@@ -55,12 +47,9 @@ public class ScreenPinningPreferenceControllerTest {
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application; mContext = RuntimeEnvironment.application;
mFeatureFactory = FakeFeatureFactory.setupForTest();
mController = new ScreenPinningPreferenceController(mContext); mController = new ScreenPinningPreferenceController(mContext);
mPreference = new Preference(mContext); mPreference = new Preference(mContext);
mPreference.setKey(mController.getPreferenceKey()); mPreference.setKey(mController.getPreferenceKey());
when(mScreen.findPreference(mController.getPreferenceKey()))
.thenReturn(mPreference);
} }
@After @After
@@ -75,22 +64,22 @@ public class ScreenPinningPreferenceControllerTest {
} }
@Test @Test
public void displayPreference_isOff_shouldDisableOffSummary() { public void updateState_isOff_shouldDisableOffSummary() {
Settings.System.putInt(mContext.getContentResolver(), Settings.System.putInt(mContext.getContentResolver(),
Settings.System.LOCK_TO_APP_ENABLED, 0); Settings.System.LOCK_TO_APP_ENABLED, 0);
mController.displayPreference(mScreen); mController.updateState(mPreference);
assertThat(mPreference.getSummary()) assertThat(mPreference.getSummary())
.isEqualTo(mContext.getString(R.string.switch_off_text)); .isEqualTo(mContext.getString(R.string.switch_off_text));
} }
@Test @Test
public void displayPreference_isOn_shouldDisableOnSummary() { public void updateState_isOn_shouldDisableOnSummary() {
Settings.System.putInt(mContext.getContentResolver(), Settings.System.putInt(mContext.getContentResolver(),
Settings.System.LOCK_TO_APP_ENABLED, 1); Settings.System.LOCK_TO_APP_ENABLED, 1);
mController.displayPreference(mScreen); mController.updateState(mPreference);
assertThat(mPreference.getSummary()) assertThat(mPreference.getSummary())
.isEqualTo(mContext.getString(R.string.switch_on_text)); .isEqualTo(mContext.getString(R.string.switch_on_text));