Remove Refocus string and icon

  Bug: 10494566

Change-Id: I49c61a5e1ae31e0458250e6cc624d63547ac0372

diff --git a/res/drawable-xhdpi/ic_switch_refocus.png b/res/drawable-xhdpi/ic_switch_refocus.png
deleted file mode 100644 (file)
index 3175f35..0000000
Binary files a/res/drawable-xhdpi/ic_switch_refocus.png and /dev/null differ

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 37a2317..e7e1cf7 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -937,8 +937,6 @@
     <string name="accessibility_switch_to_panorama">Switch to panorama</string>
     <!-- The button to switch to the Photo Sphere mode. [CHAR LIMIT = NONE] -->
     <string name="accessibility_switch_to_photo_sphere">Switch to Photo Sphere</string>
-    <!-- The button to switch to the Re-Focus mode. [CHAR LIMIT = NONE] -->
-    <string name="accessibility_switch_to_refocus">Switch to Refocus</string>
     <!-- The button in review mode indicating that the photo taking, video recording, and panorama saving session should be canceled [CHAR LIMIT = NONE] -->
     <string name="accessibility_review_cancel">Review cancel</string>
     <!-- The button in review mode indicating that the taken photo/video is OK to be attached/uploaded [CHAR LIMIT = NONE] -->

diff --git a/src/com/android/camera/ui/CameraSwitcher.java b/src/com/android/camera/ui/CameraSwitcher.java
index d970537..aaa9cda 100644 (file)
--- a/src/com/android/camera/ui/CameraSwitcher.java
+++ b/src/com/android/camera/ui/CameraSwitcher.java
@@ -195,10 +195,6 @@ public class CameraSwitcher extends RotateImageView
                     item.setContentDescription(getContext().getResources().getString(
                             R.string.accessibility_switch_to_photo_sphere));
                     break;
-                case R.drawable.ic_switch_refocus:
-                    item.setContentDescription(getContext().getResources().getString(
-                            R.string.accessibility_switch_to_refocus));
-                    break;
                 default:
                     break;
             }