From 38e737508cf9fd517bfa9289e80089fb60c8e5b0 Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Fri, 19 Aug 2011 21:50:04 +0800 Subject: Update back/front camera picker icon. bug:5024054 Change-Id: I6c6338b0b90f225bf69cec8c328ca37d50669910 --- res/drawable-hdpi/ic_rotate_camera_facing_back.png | Bin 2327 -> 0 bytes res/drawable-hdpi/ic_rotate_camera_facing_forward.png | Bin 2322 -> 0 bytes res/drawable-hdpi/ic_switch_camera_facing_holo_light.png | Bin 0 -> 1725 bytes res/drawable-mdpi/ic_rotate_camera_facing_back.png | Bin 1387 -> 0 bytes res/drawable-mdpi/ic_rotate_camera_facing_forward.png | Bin 1375 -> 0 bytes res/drawable-mdpi/ic_switch_camera_facing_holo_light.png | Bin 0 -> 1105 bytes .../ic_switch_camera_facing_holo_light.png | Bin 0 -> 2853 bytes .../ic_switch_camera_facing_holo_light.png | Bin 0 -> 1762 bytes .../ic_switch_camera_facing_holo_light.png | Bin 0 -> 3954 bytes res/drawable-xhdpi/ic_rotate_camera_facing_back.png | Bin 3246 -> 0 bytes res/drawable-xhdpi/ic_rotate_camera_facing_forward.png | Bin 3284 -> 0 bytes .../ic_switch_camera_facing_holo_light.png | Bin 0 -> 2391 bytes src/com/android/camera/ui/CameraPicker.java | 12 +----------- src/com/android/camera/ui/IndicatorControl.java | 1 - 14 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 res/drawable-hdpi/ic_rotate_camera_facing_back.png delete mode 100644 res/drawable-hdpi/ic_rotate_camera_facing_forward.png create mode 100644 res/drawable-hdpi/ic_switch_camera_facing_holo_light.png delete mode 100644 res/drawable-mdpi/ic_rotate_camera_facing_back.png delete mode 100644 res/drawable-mdpi/ic_rotate_camera_facing_forward.png create mode 100644 res/drawable-mdpi/ic_switch_camera_facing_holo_light.png create mode 100644 res/drawable-w1024dp-hdpi/ic_switch_camera_facing_holo_light.png create mode 100644 res/drawable-w1024dp-mdpi/ic_switch_camera_facing_holo_light.png create mode 100644 res/drawable-w1024dp-xhdpi/ic_switch_camera_facing_holo_light.png delete mode 100644 res/drawable-xhdpi/ic_rotate_camera_facing_back.png delete mode 100644 res/drawable-xhdpi/ic_rotate_camera_facing_forward.png create mode 100644 res/drawable-xhdpi/ic_switch_camera_facing_holo_light.png 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 Binary files a/res/drawable-hdpi/ic_rotate_camera_facing_back.png and /dev/null differ 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 Binary files a/res/drawable-hdpi/ic_rotate_camera_facing_forward.png and /dev/null differ 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 Binary files /dev/null and b/res/drawable-hdpi/ic_switch_camera_facing_holo_light.png differ 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 Binary files a/res/drawable-mdpi/ic_rotate_camera_facing_back.png and /dev/null differ 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 Binary files a/res/drawable-mdpi/ic_rotate_camera_facing_forward.png and /dev/null differ 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 Binary files /dev/null and b/res/drawable-mdpi/ic_switch_camera_facing_holo_light.png differ 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 Binary files /dev/null and b/res/drawable-w1024dp-hdpi/ic_switch_camera_facing_holo_light.png differ 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 Binary files /dev/null and b/res/drawable-w1024dp-mdpi/ic_switch_camera_facing_holo_light.png differ 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 Binary files /dev/null and b/res/drawable-w1024dp-xhdpi/ic_switch_camera_facing_holo_light.png differ 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 Binary files a/res/drawable-xhdpi/ic_rotate_camera_facing_back.png and /dev/null differ 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 Binary files a/res/drawable-xhdpi/ic_rotate_camera_facing_forward.png and /dev/null differ 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 Binary files /dev/null and b/res/drawable-xhdpi/ic_switch_camera_facing_holo_light.png differ 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); } -- cgit v1.1