summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2016-02-09 14:49:56 +0100
committerArne Coucheron <arco68@gmail.com>2018-01-26 01:08:33 +0100
commit25a9622e042102df3469a7a44f75c984d2713a7d (patch)
treeb4c215e1196ac6d63776ccc5eaef1e4a6369aa4a
parenta0df98edb234a6f4702e1f01df3b67a243103fd1 (diff)
downloadandroid_packages_apps_Snap-25a9622e042102df3469a7a44f75c984d2713a7d.zip
android_packages_apps_Snap-25a9622e042102df3469a7a44f75c984d2713a7d.tar.gz
android_packages_apps_Snap-25a9622e042102df3469a7a44f75c984d2713a7d.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.xml8
-rw-r--r--res/values/colors.xml2
-rw-r--r--res/values/styles.xml4
10 files changed, 9 insertions, 5 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 2c89b6f..474ea57 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 aea3485..c4672cf 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 966108a..2907535 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>