summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/widget
diff options
context:
space:
mode:
authorAlan Newberger <alann@google.com>2015-02-04 01:59:55 +0000
committerAlan Newberger <alann@google.com>2015-02-04 17:18:21 -0800
commitd70b22919f8d212bf11abd6e6724b3a395ef02c1 (patch)
treea16b94c1f98b87d59857217625844abd58237a96 /src/com/android/camera/widget
parentd251aa45da226d9fde64a481a22023adc6be43b0 (diff)
downloadandroid_packages_apps_Camera2-d70b22919f8d212bf11abd6e6724b3a395ef02c1.tar.gz
android_packages_apps_Camera2-d70b22919f8d212bf11abd6e6724b3a395ef02c1.tar.bz2
android_packages_apps_Camera2-d70b22919f8d212bf11abd6e6724b3a395ef02c1.zip
Remove elevations from filmstrip
Elevations were not applied to SessionItems causing bad z-order behavior. As the shadows are not really visible, just removing elevation entirely, this also seems to improve performance. Bug: 17742801 Change-Id: I8fedad3b6c083f7cde349e51021f928d719edb40
Diffstat (limited to 'src/com/android/camera/widget')
-rw-r--r--src/com/android/camera/widget/FilmstripView.java11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/com/android/camera/widget/FilmstripView.java b/src/com/android/camera/widget/FilmstripView.java
index 1bb80d98b..58673e39e 100644
--- a/src/com/android/camera/widget/FilmstripView.java
+++ b/src/com/android/camera/widget/FilmstripView.java
@@ -994,17 +994,8 @@ public class FilmstripView extends ViewGroup {
}
mViewItems[i].bringViewToFront();
}
- // ZoomView is a special case to always be in the front. In L set to
- // max elevation to make sure ZoomView is above other elevated views.
+ // ZoomView is a special case to always be in the front.
bringChildToFront(mZoomView);
- if (ApiHelper.isLOrHigher()) {
- setMaxElevation(mZoomView);
- }
- }
-
- @TargetApi(Build.VERSION_CODES.LOLLIPOP)
- private void setMaxElevation(View v) {
- v.setElevation(Float.MAX_VALUE);
}
/**