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

Merge "Expose the notification-swipe controls." into oc-dr1-dev

Browse Source 
am: c075f8943e

Change-Id: I479a411c032df7426d89838a668f4303c4d67a54
This commit is contained in:
Daniel Nishi
2017-08-09 22:37:34 +00:00
committed by android-build-merger
parent bf81a17a31 c075f8943e
commit 8bbc28a95b
2 changed files with 16 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
View File

@@ -17,29 +17,24 @@
package com.android.settings.gestures; package com.android.settings.gestures;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.provider.Settings; import android.provider.Settings;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.search.ResultPayload;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import static android.provider.Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED; import static android.provider.Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED;
public class SwipeToNotificationPreferenceController extends GesturePreferenceController { public class SwipeToNotificationPreferenceController extends GesturePreferenceController {
private final int ON = 1; private static final int ON = 1;
private final int OFF = 0; private static final int OFF = 0;
private static final String PREF_KEY_VIDEO = "gesture_swipe_down_fingerprint_video"; private static final String PREF_KEY_VIDEO = "gesture_swipe_down_fingerprint_video";
private final String mSwipeDownFingerPrefKey; private final String mSwipeDownFingerPrefKey;
private final String SECURE_KEY = SYSTEM_NAVIGATION_KEYS_ENABLED; private static final String SECURE_KEY = SYSTEM_NAVIGATION_KEYS_ENABLED;
public SwipeToNotificationPreferenceController(Context context, Lifecycle lifecycle, public SwipeToNotificationPreferenceController(Context context, Lifecycle lifecycle,
String key) { String key) {
@@ -70,28 +65,30 @@ public class SwipeToNotificationPreferenceController extends GesturePreferenceCo
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return isGestureAvailable(mContext); return SwipeToNotificationPreferenceController.isAvailable(mContext);
} }
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY, setSwipeToNotification(mContext, (boolean) newValue);
(boolean) newValue ? ON : OFF);
return true; return true;
} }
@Override @Override
protected boolean isSwitchPrefEnabled() { protected boolean isSwitchPrefEnabled() {
return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY, OFF) == ON; return isSwipeToNotificationOn(mContext);
} }
@Override public static boolean isSwipeToNotificationOn(Context context) {
public ResultPayload getResultPayload() { return Settings.Secure.getInt(context.getContentResolver(), SECURE_KEY, OFF) == ON;
final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext, }
SwipeToNotificationSettings.class.getName(), mSwipeDownFingerPrefKey,
mContext.getString(R.string.display_settings));
return new InlineSwitchPayload(SECURE_KEY, ResultPayload.SettingsSource.SECURE, public static boolean setSwipeToNotification(Context context, boolean isEnabled) {
ON /* onValue */, intent, isAvailable(), OFF /* defaultValue */); return Settings.Secure.putInt(
context.getContentResolver(), SECURE_KEY, isEnabled ? ON : OFF);
}
public static boolean isAvailable(Context context) {
return isGestureAvailable(context);
} }
} }

40
tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
View File

@@ -129,46 +129,6 @@ public class SwipeToNotificationPreferenceControllerTest {
assertThat(mController.isSwitchPrefEnabled()).isFalse(); assertThat(mController.isSwitchPrefEnabled()).isFalse();
} }
@Test
public void testPreferenceController_ProperResultPayloadType() {
when(mContext.getResources().
getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys))
.thenReturn(true);
SwipeToNotificationPreferenceController controller =
new SwipeToNotificationPreferenceController(mContext, null /* lifecycle */,
SYSTEM_NAVIGATION_KEYS_ENABLED);
ResultPayload payload = controller.getResultPayload();
assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
}
@Test
@Config(shadows = ShadowSecureSettings.class)
public void testSetValue_updatesCorrectly() {
int newValue = 1;
ContentResolver resolver = mContext.getContentResolver();
Settings.Secure.putInt(resolver, Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 0);
((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
int updatedValue = Settings.Secure.getInt(resolver,
Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, -1);
assertThat(updatedValue).isEqualTo(newValue);
}
@Test
@Config(shadows = ShadowSecureSettings.class)
public void testGetValue_correctValueReturned() {
int currentValue = 1;
ContentResolver resolver = mContext.getContentResolver();
Settings.Secure.putInt(resolver,
Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, currentValue);
int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
assertThat(newValue).isEqualTo(currentValue);
}
private void stubFingerprintSupported(boolean enabled) { private void stubFingerprintSupported(boolean enabled) {
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
.thenReturn(enabled); .thenReturn(enabled);