summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2013-04-30 20:58:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-30 20:58:34 +0000
commit553f31aca13fbcb661af0122b132314576d84c27 (patch)
tree51cd88a110e61ece047a29050010a9e526d249a2
parent7d54a706167031ff4043536c7cfa529ac46e6411 (diff)
parentd548f9af4524773a3dc7903f33eb05fcf9a1bfb8 (diff)
downloadandroid_packages_apps_Snap-553f31aca13fbcb661af0122b132314576d84c27.tar.gz
android_packages_apps_Snap-553f31aca13fbcb661af0122b132314576d84c27.tar.bz2
android_packages_apps_Snap-553f31aca13fbcb661af0122b132314576d84c27.zip
Merge "Align review controls" into gb-ub-photos-bryce
-rw-r--r--src/com/android/camera/ui/CameraControls.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index 668b49467..3a5fbde57 100644
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -75,6 +75,15 @@ public class CameraControls extends RotatableLayout {
toLeft(mSwitcher, l, t, r, b, orientation, rotation, shutter);
toRight(mMenu, l, t, r, b, orientation, rotation, shutter);
toRight(mIndicators, l, t, r, b, orientation, rotation, shutter);
+ View retake = findViewById(R.id.btn_retake);
+ if (retake != null) {
+ Rect retakeRect = new Rect();
+ center(retake, l, t, r, b, orientation, rotation, retakeRect);
+ View cancel = findViewById(R.id.btn_cancel);
+ toLeft(cancel, l, t, r, b, orientation, rotation, shutter);
+ View done = findViewById(R.id.btn_done);
+ toRight(done, l, t, r, b, orientation, rotation, shutter);
+ }
}
private int correctRotation(int rotation, int orientation) {