summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@cyanogenmod.org>2016-02-09 15:49:56 +0200
committerSteve Kondik <steve@cyngn.com>2016-11-02 12:24:50 -0700
commit391655796e30b454990d40db9b4122072820afa8 (patch)
tree9e6634b1096e43516f92e3f91146c1c350bcfe7a /res
parentdef7886f3c76253e0cd55fa7af75d3fd0c1bd0ee (diff)
downloadandroid_packages_apps_Snap-391655796e30b454990d40db9b4122072820afa8.tar.gz
android_packages_apps_Snap-391655796e30b454990d40db9b4122072820afa8.tar.bz2
android_packages_apps_Snap-391655796e30b454990d40db9b4122072820afa8.zip
Snap: Material toasts
* Match the framework toast appearance Change-Id: I886862f3087bcd5cb1cfa76f72731292b7511d07
Diffstat (limited to 'res')
-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 000000000..a804a8a94
--- /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 f8f75db9b..000000000
--- 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 000000000..778e4e676
--- /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 f8f75db9b..000000000
--- 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 000000000..77e69c72a
--- /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 f8f75db9b..000000000
--- 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 000000000..edecb6320
--- /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 d0e117aed..474ea575d 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 2e552e00d..54cb7a68d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -95,4 +95,6 @@
<color name="help_menu_switcher_1">#00ff00</color>
<color name="help_menu_switcher_2">#ffffff</color>
<color name="help_menu_switcher_3">#ffffff</color>
+
+ <color name="toast_text">@color/white</color>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ebb9e0f19..91a162e6d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -307,4 +307,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>