Revert "zenfone6: Add camera motor action to AppSelectListPreference"
This reverts commit 2ccd6e6e9dc5d9fb088c4de0d26453be593d4440.
Change-Id: I570404b17ebdb136c8c8bc18015f3448672dfb87
diff --git a/DeviceParts/res/drawable/ic_camera_motor.xml b/DeviceParts/res/drawable/ic_camera_motor.xml
deleted file mode 100644
index f99e1ab..0000000
--- a/DeviceParts/res/drawable/ic_camera_motor.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="32dp"
- android:width="32dp"
- android:viewportWidth="24"
- android:viewportHeight="24"
- android:tint="?android:attr/colorAccent" >
- <path android:fillColor="#fff" android:pathData="M9,12C9,11.19 9.3,10.5 9.89,9.89C10.5,9.3 11.19,9 12,9C12.81,9 13.5,9.3 14.11,9.89C14.7,10.5 15,11.19 15,12C15,12.81 14.7,13.5 14.11,14.11C13.5,14.7 12.81,15 12,15C11.19,15 10.5,14.7 9.89,14.11C9.3,13.5 9,12.81 9,12M5.53,8.44L7.31,10.22L5.53,12L7.31,13.78L5.53,15.56L2,12L5.53,8.44M8.44,18.47L10.22,16.69L12,18.47L13.78,16.69L15.56,18.47L12,22L8.44,18.47M18.47,15.56L16.69,13.78L18.47,12L16.69,10.22L18.47,8.44L22,12L18.47,15.56M15.56,5.53L13.78,7.31L12,5.53L10.22,7.31L8.44,5.53L12,2L15.56,5.53Z" />
-</vector>
\ No newline at end of file
diff --git a/DeviceParts/src/org/omnirom/device/AppSelectListPreference.java b/DeviceParts/src/org/omnirom/device/AppSelectListPreference.java
index a5ae096..0fe9e74 100644
--- a/DeviceParts/src/org/omnirom/device/AppSelectListPreference.java
+++ b/DeviceParts/src/org/omnirom/device/AppSelectListPreference.java
@@ -55,7 +55,6 @@
public static final String TORCH_ENTRY = "torch";
public static final String DISABLED_ENTRY = "disabled";
public static final String CAMERA_ENTRY = "camera";
- public static final String CAMERA_MOTOR_ENTRY = "camera_motor";
public static final String MUSIC_PLAY_ENTRY = "music_play";
public static final String MUSIC_PREV_ENTRY = "music_prev";
public static final String MUSIC_NEXT_ENTRY = "music_next";
@@ -212,10 +211,6 @@
R.drawable.ic_camera, CAMERA_ENTRY);
mInstalledPackages.add(0, cameraItem);
- PackageItem cameraMotorItem = new PackageItem(getContext().getResources().getString(R.string.camera_label),
- R.drawable.ic_camera_motor, CAMERA_MOTOR_ENTRY);
- mInstalledPackages.add(0, cameraMotorItem);
-
PackageItem torchItem = new PackageItem(getContext().getResources().getString(R.string.torch_entry),
R.drawable.ic_flashlight, TORCH_ENTRY);
mInstalledPackages.add(0, torchItem);
@@ -342,9 +337,6 @@
} else if (name.equals(CAMERA_ENTRY)) {
mTitle = getContext().getResources().getString(R.string.camera_entry);
mAppIconResourceId = R.drawable.ic_camera;
- } else if (name.equals(CAMERA_MOTOR_ENTRY)) {
- mTitle = getContext().getResources().getString(R.string.camera_label);
- mAppIconResourceId = R.drawable.ic_camera_motor;
} else if (name.equals(MUSIC_PLAY_ENTRY)) {
mTitle = getContext().getResources().getString(R.string.music_play_entry);
mAppIconResourceId = R.drawable.ic_music_play;
diff --git a/DeviceParts/src/org/omnirom/device/KeyHandler.java b/DeviceParts/src/org/omnirom/device/KeyHandler.java
index c579c75..da96c04 100644
--- a/DeviceParts/src/org/omnirom/device/KeyHandler.java
+++ b/DeviceParts/src/org/omnirom/device/KeyHandler.java
@@ -521,12 +521,6 @@
OmniVibe.performHapticFeedbackLw(HapticFeedbackConstants.LONG_PRESS, false, mContext);
OmniUtils.sendKeycode(KeyEvent.KEYCODE_APP_SWITCH);
return true;
- } else if (value.equals(AppSelectListPreference.CAMERA_MOTOR_ENTRY)) {
- Intent intent = new Intent("com.asus.motorservice.action.WIDGET_BTN_CLICKED");
- intent.setPackage("com.asus.motorservice");
- mContext.sendBroadcast(intent);
- OmniVibe.performHapticFeedbackLw(HapticFeedbackConstants.LONG_PRESS, false, mContext);
- return true;
} else if (value.equals(AppSelectListPreference.SCREENSHOT_ENTRY)) {
final ScreenshotHelper screenshotHelper = new ScreenshotHelper(mContext);
mHandler.postDelayed(() -> {