diff options
| author | Alan Newberger <alann@google.com> | 2015-02-05 01:27:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-05 01:27:19 +0000 |
| commit | 054ccbf10949437349140f3285d33250e2e28136 (patch) | |
| tree | 9af412e34e1fb9744a3428796da2de66eede83ce /src/com/android/camera/widget | |
| parent | 6fc611a9e7f756953c9fbd3857c86b5a1a6aac01 (diff) | |
| parent | d70b22919f8d212bf11abd6e6724b3a395ef02c1 (diff) | |
| download | android_packages_apps_Camera2-054ccbf10949437349140f3285d33250e2e28136.tar.gz android_packages_apps_Camera2-054ccbf10949437349140f3285d33250e2e28136.tar.bz2 android_packages_apps_Camera2-054ccbf10949437349140f3285d33250e2e28136.zip | |
Merge "Remove elevations from filmstrip" into ub-camera-haleakala
Diffstat (limited to 'src/com/android/camera/widget')
| -rw-r--r-- | src/com/android/camera/widget/FilmstripView.java | 11 |
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); } /** |