zenfone8: DeviceParts: Remove Fingerprint navigation gestures
Change-Id: I4bd46b7bb92ae0222bbb9470fb995bcb3033fda9
diff --git a/DeviceParts/AndroidManifest.xml b/DeviceParts/AndroidManifest.xml
index fced17a..3335f69 100644
--- a/DeviceParts/AndroidManifest.xml
+++ b/DeviceParts/AndroidManifest.xml
@@ -62,16 +62,6 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
- <activity
- android:name="com.android.settings.Settings$SwipeToNotificationSuggestionActivity"
- android:exported="true"
- android:label="@string/fp_swipe_down_switch_title_head"
- android:launchMode="singleTask" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
<receiver android:name="org.omnirom.device.Startup" >
<intent-filter android:priority="100" >
<action android:name="android.intent.action.BOOT_COMPLETED" />
diff --git a/DeviceParts/res/values/strings.xml b/DeviceParts/res/values/strings.xml
index a66edc3..eb203bf 100644
--- a/DeviceParts/res/values/strings.xml
+++ b/DeviceParts/res/values/strings.xml
@@ -16,7 +16,6 @@
<resources>
<string name="app_name">Zenfone 6</string>
<string name="category_gestures_title">Device gestures</string>
- <string name="fp_gesture_title">Fingerprint scanner gestures</string>
<string name="category_vibrator">Vibrator</string>
<string name="vib_strength_title_head">Strength</string>
<string name="vib_strength_summary_head">Define the strength of the vibrator</string>
@@ -67,13 +66,6 @@
<string name="category_up_swipe_gesture">Up swipe</string>
<string name="category_left_swipe_gesture">Left swipe</string>
<string name="category_right_swipe_gesture">Right swipe</string>
- <string name="category_fp_down_swipe_gesture">Fingerprint down swipe</string>
- <string name="category_fp_up_swipe_gesture">Fingerprint up swipe</string>
- <string name="category_fp_right_swipe_gesture">Fingerprint right swipe</string>
- <string name="category_fp_left_swipe_gesture">Fingerprint left swipe</string>
- <string name="category_fp_long_press_gesture">Fingerprint long press</string>
- <string name="fp_swipe_down_switch_summary_head">Use swipe gesture to expand notifications</string>
- <string name="fp_swipe_down_switch_title_head">Swipe fingerprint for notifications</string>
<string name="doze_category_title">Ambient display</string>
<string name="doze_category_summary">Wake screen when you receive notifications</string>
diff --git a/DeviceParts/res/xml/gesture_settings.xml b/DeviceParts/res/xml/gesture_settings.xml
index ce5db70..867affd 100644
--- a/DeviceParts/res/xml/gesture_settings.xml
+++ b/DeviceParts/res/xml/gesture_settings.xml
@@ -23,25 +23,6 @@
android:defaultValue="true" />
<PreferenceCategory
- android:title="@string/fp_gesture_title"
- android:key="key_fp_gesture_category" >
-
- <Preference
- android:key="gesture_settings"
- android:title="@string/fp_swipe_down_switch_title_head"
- android:summary="@string/fp_swipe_down_switch_summary_head" >
- <intent android:action="android.intent.action.MAIN"
- android:targetPackage="com.android.settings"
- android:targetClass="com.android.settings.Settings$SwipeToNotificationSuggestionActivity" />
- </Preference>
-
- <org.omnirom.device.AppSelectListPreference
- android:key="fp_long_press_gesture_app"
- android:title="@string/category_fp_long_press_gesture"
- android:persistent="false"/>
- </PreferenceCategory>
-
- <PreferenceCategory
android:title="@string/smart_google">
<SwitchPreference
diff --git a/DeviceParts/src/org/omnirom/device/GestureSettings.java b/DeviceParts/src/org/omnirom/device/GestureSettings.java
index dc04947..7aba3fc 100644
--- a/DeviceParts/src/org/omnirom/device/GestureSettings.java
+++ b/DeviceParts/src/org/omnirom/device/GestureSettings.java
@@ -77,11 +77,6 @@
public static final String KEY_SMART_LONG = "smart_long";
public static final String KEY_SMART_KEY = "smart_key";
- public static final String KEY_FP_GESTURE_CATEGORY = "key_fp_gesture_category";
- public static final String KEY_FP_GESTURE_DEFAULT_CATEGORY = "gesture_settings";
-
- public static final String FP_GESTURE_LONG_PRESS_APP = "fp_long_press_gesture_app";
-
public static final String DEVICE_GESTURE_MAPPING_0 = "device_gesture_mapping_0_0";
public static final String DEVICE_GESTURE_MAPPING_1 = "device_gesture_mapping_1_0";
public static final String DEVICE_GESTURE_MAPPING_2 = "device_gesture_mapping_2_0";
@@ -90,12 +85,10 @@
public static final String DEVICE_GESTURE_MAPPING_5 = "device_gesture_mapping_5_0";
public static final String DEVICE_GESTURE_MAPPING_6 = "device_gesture_mapping_6_0";
public static final String DEVICE_GESTURE_MAPPING_7 = "device_gesture_mapping_7_0";
- public static final String DEVICE_GESTURE_MAPPING_8 = "device_gesture_mapping_8_0";
private TwoStatePreference mProxiSwitch;
private TwoStatePreference mSmartKeySwitch;
private TwoStatePreference mSwipeUpSwitch;
- private AppSelectListPreference mFPLongPressApp;
private AppSelectListPreference mLetterCGesture;
private AppSelectListPreference mLetterEGesture;
private AppSelectListPreference mLetterSGesture;
@@ -126,55 +119,49 @@
mSmartKeySwitch.setChecked(Settings.System.getInt(getContext().getContentResolver(),
KEY_SMART_KEY, 0) != 0);
- mFPLongPressApp = (AppSelectListPreference) findPreference(FP_GESTURE_LONG_PRESS_APP);
- mFPLongPressApp.setEnabled(true);
- String value = Settings.System.getString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_0);
- mFPLongPressApp.setValue(value);
- mFPLongPressApp.setOnPreferenceChangeListener(this);
-
mLetterCGesture = (AppSelectListPreference) findPreference(KEY_C_APP);
mLetterCGesture.setEnabled(true);
- value = Settings.System.getString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_1);
+ String value = Settings.System.getString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_0);
mLetterCGesture.setValue(value);
mLetterCGesture.setOnPreferenceChangeListener(this);
mLetterEGesture = (AppSelectListPreference) findPreference(KEY_E_APP);
mLetterEGesture.setEnabled(true);
- value = Settings.System.getString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_2);
+ value = Settings.System.getString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_1);
mLetterEGesture.setValue(value);
mLetterEGesture.setOnPreferenceChangeListener(this);
mLetterSGesture = (AppSelectListPreference) findPreference(KEY_S_APP);
mLetterSGesture.setEnabled(true);
- value = Settings.System.getString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_3);
+ value = Settings.System.getString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_2);
mLetterSGesture.setValue(value);
mLetterSGesture.setOnPreferenceChangeListener(this);
mLetterVGesture = (AppSelectListPreference) findPreference(KEY_V_APP);
mLetterVGesture.setEnabled(true);
- value = Settings.System.getString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_4);
+ value = Settings.System.getString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_3);
mLetterVGesture.setValue(value);
mLetterVGesture.setOnPreferenceChangeListener(this);
mLetterWGesture = (AppSelectListPreference) findPreference(KEY_W_APP);
mLetterWGesture.setEnabled(true);
- value = Settings.System.getString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_5);
+ value = Settings.System.getString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_4);
mLetterWGesture.setValue(value);
mLetterWGesture.setOnPreferenceChangeListener(this);
mLetterZGesture = (AppSelectListPreference) findPreference(KEY_Z_APP);
mLetterZGesture.setEnabled(true);
- value = Settings.System.getString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_6);
+ value = Settings.System.getString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_5);
mLetterZGesture.setValue(value);
mLetterZGesture.setOnPreferenceChangeListener(this);
mSmartKeySimple = (AppSelectListPreference) findPreference(KEY_SMART_SIMPLE);
- value = Settings.System.getString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_7);
+ value = Settings.System.getString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_6);
mSmartKeySimple.setValue(value);
mSmartKeySimple.setOnPreferenceChangeListener(this);
mSmartKeyLong = (AppSelectListPreference) findPreference(KEY_SMART_LONG);
- value = Settings.System.getString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_8);
+ value = Settings.System.getString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_7);
mSmartKeyLong.setValue(value);
mSmartKeyLong.setOnPreferenceChangeListener(this);
@@ -212,45 +199,42 @@
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
- if (preference == mFPLongPressApp) {
- String value = (String) newValue;
- Settings.System.putString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_0, value);
- } else if (preference == mLetterCGesture) {
+ if (preference == mLetterCGesture) {
String value = (String) newValue;
boolean gestureDisabled = value.equals(AppSelectListPreference.DISABLED_ENTRY);
setGestureEnabled(KEY_C_ID, !gestureDisabled);
- Settings.System.putString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_1, value);
+ Settings.System.putString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_0, value);
} else if (preference == mLetterEGesture) {
String value = (String) newValue;
boolean gestureDisabled = value.equals(AppSelectListPreference.DISABLED_ENTRY);
setGestureEnabled(KEY_E_ID, !gestureDisabled);
- Settings.System.putString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_2, value);
+ Settings.System.putString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_1, value);
} else if (preference == mLetterSGesture) {
String value = (String) newValue;
boolean gestureDisabled = value.equals(AppSelectListPreference.DISABLED_ENTRY);
setGestureEnabled(KEY_S_ID, !gestureDisabled);
- Settings.System.putString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_3, value);
+ Settings.System.putString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_2, value);
} else if (preference == mLetterVGesture) {
String value = (String) newValue;
boolean gestureDisabled = value.equals(AppSelectListPreference.DISABLED_ENTRY);
setGestureEnabled(KEY_V_ID, !gestureDisabled);
- Settings.System.putString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_4, value);
+ Settings.System.putString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_3, value);
} else if (preference == mLetterWGesture) {
String value = (String) newValue;
boolean gestureDisabled = value.equals(AppSelectListPreference.DISABLED_ENTRY);
setGestureEnabled(KEY_W_ID, !gestureDisabled);
- Settings.System.putString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_5, value);
+ Settings.System.putString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_4, value);
} else if (preference == mLetterZGesture) {
String value = (String) newValue;
boolean gestureDisabled = value.equals(AppSelectListPreference.DISABLED_ENTRY);
setGestureEnabled(KEY_Z_ID, !gestureDisabled);
- Settings.System.putString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_6, value);
+ Settings.System.putString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_5, value);
} else if (preference == mSmartKeySimple) {
String value = (String) newValue;
- Settings.System.putString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_7, value);
+ Settings.System.putString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_6, value);
} else if (preference == mSmartKeyLong) {
String value = (String) newValue;
- Settings.System.putString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_8, value);
+ Settings.System.putString(getContext().getContentResolver(), DEVICE_GESTURE_MAPPING_7, value);
}
return true;
}
@@ -357,7 +341,6 @@
@Override
protected void onPostExecute(Void feed) {
- mFPLongPressApp.setPackageList(mInstalledPackages);
mLetterCGesture.setPackageList(mInstalledPackages);
mLetterEGesture.setPackageList(mInstalledPackages);
mLetterSGesture.setPackageList(mInstalledPackages);
diff --git a/DeviceParts/src/org/omnirom/device/KeyHandler.java b/DeviceParts/src/org/omnirom/device/KeyHandler.java
index 4e15bb3..c7754ee 100644
--- a/DeviceParts/src/org/omnirom/device/KeyHandler.java
+++ b/DeviceParts/src/org/omnirom/device/KeyHandler.java
@@ -78,7 +78,6 @@
protected static final int GESTURE_REQUEST = 1;
private static final int GESTURE_WAKELOCK_DURATION = 2000;
- private static final int FP_GESTURE_LONG_PRESS = 187;
private static final int KEY_DOUBLE_TAP = 143;
private static final int KEY_HOME = 102;
private static final int KEY_BACK = 158;
@@ -105,8 +104,7 @@
private static final int[] sSupportedGestures = new int[]{
KEY_DOUBLE_TAP,
- KEY_GOOGLE_APP,
- FP_GESTURE_LONG_PRESS
+ KEY_GOOGLE_APP
};
private static final int[] sProxiCheckedGestures = new int[]{
@@ -555,17 +553,13 @@
private String getGestureValueForFPScanCode(int scanCode, long eventTime) {
long now = SystemClock.uptimeMillis();
- if (FP_GESTURE_LONG_PRESS == scanCode) {
- return Settings.System.getStringForUser(mContext.getContentResolver(),
- GestureSettings.DEVICE_GESTURE_MAPPING_0, UserHandle.USER_CURRENT);
- }
if (KEY_GOOGLE_APP == scanCode) {
if (now <= eventTime + SMARTKEY_DELAY_MILLIS) {
return Settings.System.getStringForUser(mContext.getContentResolver(),
- GestureSettings.DEVICE_GESTURE_MAPPING_7, UserHandle.USER_CURRENT);
+ GestureSettings.DEVICE_GESTURE_MAPPING_6, UserHandle.USER_CURRENT);
} else {
return Settings.System.getStringForUser(mContext.getContentResolver(),
- GestureSettings.DEVICE_GESTURE_MAPPING_8, UserHandle.USER_CURRENT);
+ GestureSettings.DEVICE_GESTURE_MAPPING_7, UserHandle.USER_CURRENT);
}
}
return null;
diff --git a/DeviceParts/src/org/omnirom/device/Startup.java b/DeviceParts/src/org/omnirom/device/Startup.java
index 0d71eb1..58c748b 100644
--- a/DeviceParts/src/org/omnirom/device/Startup.java
+++ b/DeviceParts/src/org/omnirom/device/Startup.java
@@ -62,36 +62,32 @@
}
public static void restoreAfterUserSwitch(Context context) {
- // fp down swipe
+
String value = Settings.System.getString(context.getContentResolver(), GestureSettings.DEVICE_GESTURE_MAPPING_0);
boolean enabled = !TextUtils.isEmpty(value) && !value.equals(AppSelectListPreference.DISABLED_ENTRY);
- restore(getGestureFile(GestureSettings.FP_GESTURE_LONG_PRESS_APP), enabled);
+ restore(getGestureFile(GestureSettings.KEY_C_APP), enabled);
value = Settings.System.getString(context.getContentResolver(), GestureSettings.DEVICE_GESTURE_MAPPING_1);
enabled = !TextUtils.isEmpty(value) && !value.equals(AppSelectListPreference.DISABLED_ENTRY);
- restore(getGestureFile(GestureSettings.KEY_C_APP), enabled);
+ restore(getGestureFile(GestureSettings.KEY_E_APP), enabled);
value = Settings.System.getString(context.getContentResolver(), GestureSettings.DEVICE_GESTURE_MAPPING_2);
enabled = !TextUtils.isEmpty(value) && !value.equals(AppSelectListPreference.DISABLED_ENTRY);
- restore(getGestureFile(GestureSettings.KEY_E_APP), enabled);
+ restore(getGestureFile(GestureSettings.KEY_S_APP), enabled);
value = Settings.System.getString(context.getContentResolver(), GestureSettings.DEVICE_GESTURE_MAPPING_3);
enabled = !TextUtils.isEmpty(value) && !value.equals(AppSelectListPreference.DISABLED_ENTRY);
- restore(getGestureFile(GestureSettings.KEY_S_APP), enabled);
+ restore(getGestureFile(GestureSettings.KEY_V_APP), enabled);
value = Settings.System.getString(context.getContentResolver(), GestureSettings.DEVICE_GESTURE_MAPPING_4);
enabled = !TextUtils.isEmpty(value) && !value.equals(AppSelectListPreference.DISABLED_ENTRY);
- restore(getGestureFile(GestureSettings.KEY_V_APP), enabled);
+ restore(getGestureFile(GestureSettings.KEY_W_APP), enabled);
value = Settings.System.getString(context.getContentResolver(), GestureSettings.DEVICE_GESTURE_MAPPING_5);
enabled = !TextUtils.isEmpty(value) && !value.equals(AppSelectListPreference.DISABLED_ENTRY);
- restore(getGestureFile(GestureSettings.KEY_W_APP), enabled);
-
- value = Settings.System.getString(context.getContentResolver(), GestureSettings.DEVICE_GESTURE_MAPPING_6);
- enabled = !TextUtils.isEmpty(value) && !value.equals(AppSelectListPreference.DISABLED_ENTRY);
restore(getGestureFile(GestureSettings.KEY_Z_APP), enabled);
- value = Settings.System.getString(context.getContentResolver(), GestureSettings.DEVICE_GESTURE_MAPPING_7);
+ value = Settings.System.getString(context.getContentResolver(), GestureSettings.DEVICE_GESTURE_MAPPING_6);
enabled = !TextUtils.isEmpty(value) && !value.equals(AppSelectListPreference.DISABLED_ENTRY);
restore(getGestureFile(GestureSettings.KEY_SMART_KEY), enabled);