Improve the animation to filmstrip.
1. Remove the snap-in-center check at the end of scale animation.
2. Don't go back to full-screen when animating from camera preview
to filmstrip.
bug:10806298
bug:10864100
Change-Id: I751040a22e2758709c22e7230a5418a871ef85f9
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index bb72ba7..fc80c5c 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -830,14 +830,20 @@
}
}
+ /**
+ * Dumps the stack trace.
+ *
+ * @param level How many levels of the stack are dumped. 0 means all.
+ * @return A {@link java.lang.String} of all the output with newline
+ * between each.
+ */
public static String dumpStackTrace(int level) {
StackTraceElement[] elems = Thread.currentThread().getStackTrace();
// Ignore the first 3 elements.
- level += 3;
- level = (level == 0 ? elems.length : Math.min(level, elems.length));
+ level = (level == 0 ? elems.length : Math.min(level + 3, elems.length));
String ret = new String();
for (int i = 3; i < level; i++) {
- ret = ret + elems[i].toString() + '\n';
+ ret = ret + "\t" + elems[i].toString() + '\n';
}
return ret;
}