diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-08-26 17:22:24 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-26 17:22:24 -0700 |
commit | 5d26fdfdc2746c8c6f70b947b43722bc576dc1c3 (patch) | |
tree | a610f37b279a1e370e8a66d3c43b6914a9da030b | |
parent | 1cc08feaf523d478dcf50bafdec0cf5b0a93c01b (diff) | |
parent | 143eb46b81202601e5454d460ea80a4796ecf43d (diff) | |
download | android_packages_apps_Snap-5d26fdfdc2746c8c6f70b947b43722bc576dc1c3.tar.gz android_packages_apps_Snap-5d26fdfdc2746c8c6f70b947b43722bc576dc1c3.tar.bz2 android_packages_apps_Snap-5d26fdfdc2746c8c6f70b947b43722bc576dc1c3.zip |
am 143eb46b: Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbad
* commit '143eb46b81202601e5454d460ea80a4796ecf43d':
Remove Refocus string and icon
-rw-r--r-- | res/drawable-xhdpi/ic_switch_refocus.png | bin | 833 -> 0 bytes | |||
-rw-r--r-- | res/values/strings.xml | 2 | ||||
-rw-r--r-- | src/com/android/camera/ui/CameraSwitcher.java | 4 |
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 Binary files differdeleted file mode 100644 index 3175f35ae..000000000 --- a/res/drawable-xhdpi/ic_switch_refocus.png +++ /dev/null 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; } |