summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@cyanogenmod.org>2016-02-09 15:49:56 +0200
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-02-10 14:56:36 -0800
commitda3f7c10237a7cab50607b31a066d68ee708483f (patch)
treec6e18390afe42ae99c70e6c05e41ee1946e62987
parent54a9c2a494ee1440f3f063207cbc82811a70d0ce (diff)
downloadandroid_packages_apps_Snap-da3f7c10237a7cab50607b31a066d68ee708483f.zip
android_packages_apps_Snap-da3f7c10237a7cab50607b31a066d68ee708483f.tar.gz
android_packages_apps_Snap-da3f7c10237a7cab50607b31a066d68ee708483f.tar.bz2
Snap: Material toasts
* Match the framework toast appearance Change-Id: I886862f3087bcd5cb1cfa76f72731292b7511d07
-rw-r--r--res/drawable-hdpi/toast_frame.9.pngbin0 -> 1573 bytes
-rw-r--r--res/drawable-hdpi/toast_frame_holo.9.pngbin1585 -> 0 bytes
-rw-r--r--res/drawable-mdpi/toast_frame.9.pngbin0 -> 965 bytes
-rw-r--r--res/drawable-mdpi/toast_frame_holo.9.pngbin1585 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/toast_frame.9.pngbin0 -> 2090 bytes
-rw-r--r--res/drawable-xhdpi/toast_frame_holo.9.pngbin1585 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/toast_frame.9.pngbin0 -> 2323 bytes
-rw-r--r--res/layout/rotate_text_toast.xml7
-rw-r--r--res/values/colors.xml2
-rw-r--r--res/values/styles.xml3
10 files changed, 9 insertions, 3 deletions
diff --git a/res/drawable-hdpi/toast_frame.9.png b/res/drawable-hdpi/toast_frame.9.png
new file mode 100644
index 0000000..a804a8a
--- /dev/null
+++ b/res/drawable-hdpi/toast_frame.9.png
Binary files differ
diff --git a/res/drawable-hdpi/toast_frame_holo.9.png b/res/drawable-hdpi/toast_frame_holo.9.png
deleted file mode 100644
index f8f75db..0000000
--- a/res/drawable-hdpi/toast_frame_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/toast_frame.9.png b/res/drawable-mdpi/toast_frame.9.png
new file mode 100644
index 0000000..778e4e6
--- /dev/null
+++ b/res/drawable-mdpi/toast_frame.9.png
Binary files differ
diff --git a/res/drawable-mdpi/toast_frame_holo.9.png b/res/drawable-mdpi/toast_frame_holo.9.png
deleted file mode 100644
index f8f75db..0000000
--- a/res/drawable-mdpi/toast_frame_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/toast_frame.9.png b/res/drawable-xhdpi/toast_frame.9.png
new file mode 100644
index 0000000..77e69c7
--- /dev/null
+++ b/res/drawable-xhdpi/toast_frame.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/toast_frame_holo.9.png b/res/drawable-xhdpi/toast_frame_holo.9.png
deleted file mode 100644
index f8f75db..0000000
--- a/res/drawable-xhdpi/toast_frame_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/toast_frame.9.png b/res/drawable-xxhdpi/toast_frame.9.png
new file mode 100644
index 0000000..edecb63
--- /dev/null
+++ b/res/drawable-xxhdpi/toast_frame.9.png
Binary files differ
diff --git a/res/layout/rotate_text_toast.xml b/res/layout/rotate_text_toast.xml
index d0e117a..474ea57 100644
--- a/res/layout/rotate_text_toast.xml
+++ b/res/layout/rotate_text_toast.xml
@@ -24,13 +24,14 @@
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/toast_frame_holo">
+ android:background="@drawable/toast_frame">
<TextView
android:id="@+id/message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:textAppearanceMedium"
- android:textColor="@color/white"
+ android:textAppearance="@style/ToastTextAppearance"
+ android:textColor="@color/toast_text"
+ android:shadowColor="#BB000000"
android:shadowRadius="2.75" />
</FrameLayout>
</com.android.camera.ui.RotateLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f3ec800..7801105 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -77,4 +77,6 @@
<color name="camera_control_bg_opaque">@color/black</color>
<color name="camera_control_bg_transparent">#40212121</color>
+
+ <color name="toast_text">@color/white</color>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e042260..e20b699 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -298,4 +298,7 @@
<style name="PanoViewHorizontalBar">
<item name="android:background">@android:color/transparent</item>
</style>
+ <style name="ToastTextAppearance" parent="@android:style/TextAppearance">
+ <item name="android:fontFamily">sans-serif-condensed</item>
+ </style>
</resources>