From 23cf762d88301274ccd786a52f2ea42003dd9dac Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Tue, 9 Feb 2016 14:49:56 +0100
Subject: Snap: Material toasts

* Match the framework toast appearance

Change-Id: I886862f3087bcd5cb1cfa76f72731292b7511d07
---
 res/drawable-hdpi/toast_frame.9.png       | Bin 0 -> 1573 bytes
 res/drawable-hdpi/toast_frame_holo.9.png  | Bin 1585 -> 0 bytes
 res/drawable-mdpi/toast_frame.9.png       | Bin 0 -> 965 bytes
 res/drawable-mdpi/toast_frame_holo.9.png  | Bin 1585 -> 0 bytes
 res/drawable-xhdpi/toast_frame.9.png      | Bin 0 -> 2090 bytes
 res/drawable-xhdpi/toast_frame_holo.9.png | Bin 1585 -> 0 bytes
 res/drawable-xxhdpi/toast_frame.9.png     | Bin 0 -> 2323 bytes
 res/layout/rotate_text_toast.xml          |   8 +++-----
 res/values/colors.xml                     |   2 ++
 res/values/styles.xml                     |   4 ++++
 10 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 res/drawable-hdpi/toast_frame.9.png
 delete mode 100644 res/drawable-hdpi/toast_frame_holo.9.png
 create mode 100644 res/drawable-mdpi/toast_frame.9.png
 delete mode 100644 res/drawable-mdpi/toast_frame_holo.9.png
 create mode 100644 res/drawable-xhdpi/toast_frame.9.png
 delete mode 100644 res/drawable-xhdpi/toast_frame_holo.9.png
 create mode 100644 res/drawable-xxhdpi/toast_frame.9.png

(limited to 'res')

diff --git a/res/drawable-hdpi/toast_frame.9.png b/res/drawable-hdpi/toast_frame.9.png
new file mode 100644
index 000000000..a804a8a94
Binary files /dev/null and b/res/drawable-hdpi/toast_frame.9.png 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 f8f75db9b..000000000
Binary files a/res/drawable-hdpi/toast_frame_holo.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/toast_frame.9.png b/res/drawable-mdpi/toast_frame.9.png
new file mode 100644
index 000000000..778e4e676
Binary files /dev/null and b/res/drawable-mdpi/toast_frame.9.png 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 f8f75db9b..000000000
Binary files a/res/drawable-mdpi/toast_frame_holo.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/toast_frame.9.png b/res/drawable-xhdpi/toast_frame.9.png
new file mode 100644
index 000000000..77e69c72a
Binary files /dev/null and b/res/drawable-xhdpi/toast_frame.9.png 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 f8f75db9b..000000000
Binary files a/res/drawable-xhdpi/toast_frame_holo.9.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/toast_frame.9.png b/res/drawable-xxhdpi/toast_frame.9.png
new file mode 100644
index 000000000..edecb6320
Binary files /dev/null and b/res/drawable-xxhdpi/toast_frame.9.png differ
diff --git a/res/layout/rotate_text_toast.xml b/res/layout/rotate_text_toast.xml
index 2c89b6f59..474ea575d 100644
--- a/res/layout/rotate_text_toast.xml
+++ b/res/layout/rotate_text_toast.xml
@@ -24,16 +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="@android: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 aea3485b9..c4672cf31 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -98,4 +98,6 @@
     <color name="dialog_text">#000000</color>
     <color name="dialog_button">#008B8B</color>
     <color name="dialog_hr">#C4C4C4</color>
+
+    <color name="toast_text">@color/white</color>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 966108a84..29075351d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -339,4 +339,8 @@
         <item name="android:gravity">center</item>
         <item name="android:textSize">18sp</item>
     </style>
+
+    <style name="ToastTextAppearance" parent="@android:style/TextAppearance">
+        <item name="android:fontFamily">sans-serif-condensed</item>
+    </style>
 </resources>
-- 
cgit v1.2.3