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 /res | |
| 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 'res')
| -rw-r--r-- | res/drawable/dummy_rect_background.xml | 6 | ||||
| -rw-r--r-- | res/layout/filmstrip_image.xml | 7 | ||||
| -rw-r--r-- | res/layout/filmstrip_video.xml | 4 |
3 files changed, 1 insertions, 16 deletions
diff --git a/res/drawable/dummy_rect_background.xml b/res/drawable/dummy_rect_background.xml deleted file mode 100644 index 7a8eb731b..000000000 --- a/res/drawable/dummy_rect_background.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- used for views that don't have a background set, but still want to have an L elevation shadow --> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <solid android:color="#00ffffff" /> -</shape>
\ No newline at end of file diff --git a/res/layout/filmstrip_image.xml b/res/layout/filmstrip_image.xml deleted file mode 100644 index 003c2dd4e..000000000 --- a/res/layout/filmstrip_image.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<ImageView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@drawable/dummy_rect_background" - android:elevation="10dp" /> diff --git a/res/layout/filmstrip_video.xml b/res/layout/filmstrip_video.xml index 027bd8b04..8439b61c5 100644 --- a/res/layout/filmstrip_video.xml +++ b/res/layout/filmstrip_video.xml @@ -2,9 +2,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@drawable/dummy_rect_background" - android:elevation="10dp"> + android:layout_height="match_parent"> <ImageView android:id="@+id/video_view" android:layout_width="match_parent" |