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

Move code from SuggestionChecks to FeatureProvider

Browse Source 
This is step one to deprecate SuggestionChecks. Moving logic into
SuggestionFeatureProvider allows potential logic override and improves
testability.

Also moved isSuggestionComplete tests to corresponding activity/pref
controller test.

Bug: 65065268
Test: robotests
Change-Id: I2071d30fc58bb84acad2083ca03cfcf7d41f10cb
This commit is contained in:
Fan Zhang
2017-09-28 17:17:44 -07:00
parent b963125159
commit 31f699c281
23 changed files with 497 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
View File

@@ -16,10 +16,13 @@
package com.android.settings.gestures;
import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import com.android.settings.R;
@@ -28,12 +31,12 @@ import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.search.ResultPayload;
import com.android.settingslib.core.lifecycle.Lifecycle;
import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
public class DoubleTapPowerPreferenceController extends GesturePreferenceController {
private final int ON = 0;
private final int OFF = 1;
@VisibleForTesting
static final int ON = 0;
@VisibleForTesting
static final int OFF = 1;
private static final String PREF_KEY_VIDEO = "gesture_double_tap_power_video";
private final String mDoubleTapPowerKey;
@@ -81,7 +84,7 @@ public class DoubleTapPowerPreferenceController extends GesturePreferenceControl
protected boolean isSwitchPrefEnabled() {
final int cameraDisabled = Settings.Secure.getInt(mContext.getContentResolver(),
SECURE_KEY, ON);
return cameraDisabled == 0;
return cameraDisabled == ON;
}
@Override

8
src/com/android/settings/gestures/PickupGesturePreferenceController.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.gestures;
import static android.provider.Settings.Secure.DOZE_PULSE_ON_PICK_UP;
import android.annotation.UserIdInt;
import android.content.Context;
import android.content.Intent;
@@ -30,8 +32,6 @@ import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.search.ResultPayload;
import com.android.settingslib.core.lifecycle.Lifecycle;
import static android.provider.Settings.Secure.DOZE_PULSE_ON_PICK_UP;
public class PickupGesturePreferenceController extends GesturePreferenceController {
private final int ON = 1;
@@ -56,8 +56,8 @@ public class PickupGesturePreferenceController extends GesturePreferenceControll
public static boolean isSuggestionComplete(Context context, SharedPreferences prefs) {
AmbientDisplayConfiguration ambientConfig = new AmbientDisplayConfiguration(context);
return !ambientConfig.pulseOnPickupAvailable()
|| prefs.getBoolean(PickupGestureSettings.PREF_KEY_SUGGESTION_COMPLETE, false);
return prefs.getBoolean(PickupGestureSettings.PREF_KEY_SUGGESTION_COMPLETE, false)
|| !ambientConfig.pulseOnPickupAvailable();
}
@Override

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

@@ -16,6 +16,8 @@
package com.android.settings.gestures;
import static android.provider.Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED;
import android.content.Context;
import android.content.SharedPreferences;
import android.provider.Settings;
@@ -24,8 +26,6 @@ import android.support.v7.preference.Preference;
import com.android.settings.Utils;
import com.android.settingslib.core.lifecycle.Lifecycle;
import static android.provider.Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED;
public class SwipeToNotificationPreferenceController extends GesturePreferenceController {
private static final int ON = 1;
@@ -45,11 +45,12 @@ public class SwipeToNotificationPreferenceController extends GesturePreferenceCo
public static boolean isSuggestionComplete(Context context, SharedPreferences prefs) {
return !isGestureAvailable(context)
|| prefs.getBoolean(SwipeToNotificationSettings.PREF_KEY_SUGGESTION_COMPLETE,
false);
false);
}
private static boolean isGestureAvailable(Context context) {
return Utils.hasFingerprintHardware(context) && context.getResources()
return Utils.hasFingerprintHardware(context)
&& context.getResources()
.getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys);
}