summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-07-11 14:26:27 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-07-11 14:26:27 -0700
commitc169f14364623954516eab90dba2de4b8148065b (patch)
tree7e07186dc88bf694a67796cf6f1253b25292121e
parent551b3b04ddfcb1e81deb04416614c49beadf1434 (diff)
parent97f707909b76bba8cda9b5355d9077cfcc3ff0d9 (diff)
downloadandroid_packages_apps_Snap-c169f14364623954516eab90dba2de4b8148065b.tar.gz
android_packages_apps_Snap-c169f14364623954516eab90dba2de4b8148065b.tar.bz2
android_packages_apps_Snap-c169f14364623954516eab90dba2de4b8148065b.zip
Merge "SnapdragonCamera: Fix panorama cancel button location" into camera.lnx.1.0-dev.1.0
-rw-r--r--src/com/android/camera/WideAnglePanoramaUI.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java
index 171036446..14907e842 100644
--- a/src/com/android/camera/WideAnglePanoramaUI.java
+++ b/src/com/android/camera/WideAnglePanoramaUI.java
@@ -639,7 +639,7 @@ public class WideAnglePanoramaUI implements
+ progressLayout.getChildAt(0).getHeight() / 2;
int[] x = { r / 2, r / 10, r * 9 / 10, r / 2 };
- int[] y = { t / 2, (t + b1) / 2, (t + b1) / 2, b1 + pivotY };
+ int[] y = { t / 2 + pivotY, (t + b1) / 2, (t + b1) / 2, b1 + pivotY };
int idx1, idx2;
int g;