summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-08-27 00:20:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-27 00:20:12 +0000
commit143eb46b81202601e5454d460ea80a4796ecf43d (patch)
tree0e7f8e2c69b7055592ed274d9a6e157697295f63
parent3be7f94c1029728a8e236cfcde9c8bce68244095 (diff)
parentd2219d3023a93ce15725af5009627eb37e982726 (diff)
downloadandroid_packages_apps_Snap-143eb46b81202601e5454d460ea80a4796ecf43d.tar.gz
android_packages_apps_Snap-143eb46b81202601e5454d460ea80a4796ecf43d.tar.bz2
android_packages_apps_Snap-143eb46b81202601e5454d460ea80a4796ecf43d.zip
Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbad
-rw-r--r--res/drawable-xhdpi/ic_switch_refocus.pngbin833 -> 0 bytes
-rw-r--r--res/values/strings.xml2
-rw-r--r--src/com/android/camera/ui/CameraSwitcher.java4
3 files changed, 0 insertions, 6 deletions
diff --git a/res/drawable-xhdpi/ic_switch_refocus.png b/res/drawable-xhdpi/ic_switch_refocus.png
deleted file mode 100644
index 3175f35ae..000000000
--- a/res/drawable-xhdpi/ic_switch_refocus.png
+++ /dev/null
Binary files differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 37a231760..e7e1cf731 100644
--- 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 d970537d3..aaa9cdac8 100644
--- 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;
}