diff options
author | Steve Kondik <steve@cyngn.com> | 2015-03-24 07:23:19 -0700 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-03-24 07:23:19 -0700 |
commit | 6eaafbef54de3a9b70ec338512b537cd0f7b5d13 (patch) | |
tree | 69646095b714fc45fb7c4d8aeeae6dcaf8aa3d49 /res/layout-port/on_screen_hint.xml | |
parent | 708b6b29c2cde2510b6cee475bbb91f0ac06c74f (diff) | |
parent | 6cb15e279f0fcecfab919a51b6a542bcef5bd2f1 (diff) | |
download | android_packages_apps_Camera2-staging/cm-12.1.tar.gz android_packages_apps_Camera2-staging/cm-12.1.tar.bz2 android_packages_apps_Camera2-staging/cm-12.1.zip |
Merge branch 'lollipop-mr1-release' of https://android.googlesource.com/platform/packages/apps/Camera2 into cm-12.1staging/cm-12.1
Change-Id: I24fa423d91d8d441cbf5d9e75b98037584dd2fbc
Diffstat (limited to 'res/layout-port/on_screen_hint.xml')
-rw-r--r-- | res/layout-port/on_screen_hint.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/layout-port/on_screen_hint.xml b/res/layout-port/on_screen_hint.xml index 467b67f78..1475f3b39 100644 --- a/res/layout-port/on_screen_hint.xml +++ b/res/layout-port/on_screen_hint.xml @@ -17,7 +17,7 @@ android:layout_height="match_parent" android:layout_width="match_parent" android:orientation="horizontal" - android:background="@drawable/on_screen_hint_frame"> + android:background="@android:drawable/toast_frame"> <TextView android:id="@+id/message" android:layout_height="wrap_content" |