Update back/front camera picker icon.

bug:5024054
Change-Id: I6c6338b0b90f225bf69cec8c328ca37d50669910

14 files changed, 1 insertions, 12 deletions

diff --git a/res/drawable-hdpi/ic_rotate_camera_facing_back.png b/res/drawable-hdpi/ic_rotate_camera_facing_back.png
deleted file mode 100644
index cca4636..0000000
--- a/res/drawable-hdpi/ic_rotate_camera_facing_back.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_rotate_camera_facing_forward.png b/res/drawable-hdpi/ic_rotate_camera_facing_forward.png
deleted file mode 100644
index 6def0c7..0000000
--- a/res/drawable-hdpi/ic_rotate_camera_facing_forward.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_switch_camera_facing_holo_light.png b/res/drawable-hdpi/ic_switch_camera_facing_holo_light.png
new file mode 100644
index 0000000..c76c064
--- /dev/null
+++ b/res/drawable-hdpi/ic_switch_camera_facing_holo_light.png
diff --git a/res/drawable-mdpi/ic_rotate_camera_facing_back.png b/res/drawable-mdpi/ic_rotate_camera_facing_back.png
deleted file mode 100644
index 0adc8bd..0000000
--- a/res/drawable-mdpi/ic_rotate_camera_facing_back.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_rotate_camera_facing_forward.png b/res/drawable-mdpi/ic_rotate_camera_facing_forward.png
deleted file mode 100644
index bb373af..0000000
--- a/res/drawable-mdpi/ic_rotate_camera_facing_forward.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_switch_camera_facing_holo_light.png b/res/drawable-mdpi/ic_switch_camera_facing_holo_light.png
new file mode 100644
index 0000000..fe2ccaf
--- /dev/null
+++ b/res/drawable-mdpi/ic_switch_camera_facing_holo_light.png
diff --git a/res/drawable-w1024dp-hdpi/ic_switch_camera_facing_holo_light.png b/res/drawable-w1024dp-hdpi/ic_switch_camera_facing_holo_light.png
new file mode 100644
index 0000000..51244d8
--- /dev/null
+++ b/res/drawable-w1024dp-hdpi/ic_switch_camera_facing_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/ic_switch_camera_facing_holo_light.png b/res/drawable-w1024dp-mdpi/ic_switch_camera_facing_holo_light.png
new file mode 100644
index 0000000..ff108f5
--- /dev/null
+++ b/res/drawable-w1024dp-mdpi/ic_switch_camera_facing_holo_light.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_switch_camera_facing_holo_light.png b/res/drawable-w1024dp-xhdpi/ic_switch_camera_facing_holo_light.png
new file mode 100644
index 0000000..cb17d4f
--- /dev/null
+++ b/res/drawable-w1024dp-xhdpi/ic_switch_camera_facing_holo_light.png
diff --git a/res/drawable-xhdpi/ic_rotate_camera_facing_back.png b/res/drawable-xhdpi/ic_rotate_camera_facing_back.png
deleted file mode 100644
index 1caf7e7..0000000
--- a/res/drawable-xhdpi/ic_rotate_camera_facing_back.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_rotate_camera_facing_forward.png b/res/drawable-xhdpi/ic_rotate_camera_facing_forward.png
deleted file mode 100644
index 46ce681..0000000
--- a/res/drawable-xhdpi/ic_rotate_camera_facing_forward.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_switch_camera_facing_holo_light.png b/res/drawable-xhdpi/ic_switch_camera_facing_holo_light.png
new file mode 100644
index 0000000..913b3be
--- /dev/null
+++ b/res/drawable-xhdpi/ic_switch_camera_facing_holo_light.png
diff --git a/src/com/android/camera/ui/CameraPicker.java b/src/com/android/camera/ui/CameraPicker.java
index 43a1f16..f4d7d2f 100644
--- a/src/com/android/camera/ui/CameraPicker.java
+++ b/src/com/android/camera/ui/CameraPicker.java
@@ -37,10 +37,7 @@ public class CameraPicker extends RotateImageView implements View.OnClickListene
 
     public CameraPicker(Context context) {
         super(context);
-    }
-
-    public CameraPicker(Context context, AttributeSet attrs) {
-        super(context, attrs);
+        setImageResource(R.drawable.ic_switch_camera_facing_holo_light);
     }
 
     public void setListener(OnPreferenceChangedListener listener) {
@@ -61,12 +58,6 @@ public class CameraPicker extends RotateImageView implements View.OnClickListene
         }
     }
 
-    public void setCameraPickerIcon() {
-        setImageResource((mCameraFacing == CameraInfo.CAMERA_FACING_BACK)
-                ? R.drawable.ic_rotate_camera_facing_back
-                : R.drawable.ic_rotate_camera_facing_forward);
-    }
-
     @Override
     public void onClick(View v) {
         if (mCameras == null) return;
@@ -74,7 +65,6 @@ public class CameraPicker extends RotateImageView implements View.OnClickListene
                 ? CameraInfo.CAMERA_FACING_FRONT
                 : CameraInfo.CAMERA_FACING_BACK;
         mCameraFacing = newCameraIndex;
-        setCameraPickerIcon();
         mPreference.setValue((String) mCameras[mCameraFacing]);
         mListener.onSharedPreferenceChanged();
     }
diff --git a/src/com/android/camera/ui/IndicatorControl.java b/src/com/android/camera/ui/IndicatorControl.java
index 1d9a148..d8233dc 100644
--- a/src/com/android/camera/ui/IndicatorControl.java
+++ b/src/com/android/camera/ui/IndicatorControl.java
@@ -109,7 +109,6 @@ public abstract class IndicatorControl extends RelativeLayout implements
         if (pref == null) return;
         mCameraPicker = new CameraPicker(context);
         mCameraPicker.initialize(pref);
-        mCameraPicker.setCameraPickerIcon();
         addView(mCameraPicker);
     }