From 442e4d0846df4566ce2fa9c4c627125f2983ee8c Mon Sep 17 00:00:00 2001
From: Clark Scheff <clark@cyngn.com>
Date: Tue, 23 Sep 2014 15:45:26 -0700
Subject: Replace option menu with reset/delete actions

The code and xml for the popup menu are still in place for future
use.  The image view for the menu is simply set to View.GONE so it
will not be available to the user at this time.

Change-Id: I7897e1c06532c51d6be82edca3bb76c37acbf9ae
---
 res/drawable-hdpi/ic_theme_delete.png   | Bin 0 -> 2961 bytes
 res/drawable-hdpi/ic_theme_reset.png    | Bin 0 -> 3689 bytes
 res/drawable-mdpi/ic_theme_delete.png   | Bin 0 -> 2836 bytes
 res/drawable-mdpi/ic_theme_reset.png    | Bin 0 -> 3339 bytes
 res/drawable-xhdpi/ic_theme_delete.png  | Bin 0 -> 2988 bytes
 res/drawable-xhdpi/ic_theme_reset.png   | Bin 0 -> 4047 bytes
 res/drawable-xxhdpi/ic_theme_delete.png | Bin 0 -> 3170 bytes
 res/drawable-xxhdpi/ic_theme_reset.png  | Bin 0 -> 4777 bytes
 res/layout/fragment_pager_list.xml      |  22 +++++++++++++++++++++-
 res/values/strings.xml                  |   1 +
 10 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 res/drawable-hdpi/ic_theme_delete.png
 create mode 100644 res/drawable-hdpi/ic_theme_reset.png
 create mode 100644 res/drawable-mdpi/ic_theme_delete.png
 create mode 100644 res/drawable-mdpi/ic_theme_reset.png
 create mode 100644 res/drawable-xhdpi/ic_theme_delete.png
 create mode 100644 res/drawable-xhdpi/ic_theme_reset.png
 create mode 100644 res/drawable-xxhdpi/ic_theme_delete.png
 create mode 100644 res/drawable-xxhdpi/ic_theme_reset.png

(limited to 'res')

diff --git a/res/drawable-hdpi/ic_theme_delete.png b/res/drawable-hdpi/ic_theme_delete.png
new file mode 100644
index 0000000..eeefe21
Binary files /dev/null and b/res/drawable-hdpi/ic_theme_delete.png differ
diff --git a/res/drawable-hdpi/ic_theme_reset.png b/res/drawable-hdpi/ic_theme_reset.png
new file mode 100644
index 0000000..8d1ead9
Binary files /dev/null and b/res/drawable-hdpi/ic_theme_reset.png differ
diff --git a/res/drawable-mdpi/ic_theme_delete.png b/res/drawable-mdpi/ic_theme_delete.png
new file mode 100644
index 0000000..93bb424
Binary files /dev/null and b/res/drawable-mdpi/ic_theme_delete.png differ
diff --git a/res/drawable-mdpi/ic_theme_reset.png b/res/drawable-mdpi/ic_theme_reset.png
new file mode 100644
index 0000000..4d124ab
Binary files /dev/null and b/res/drawable-mdpi/ic_theme_reset.png differ
diff --git a/res/drawable-xhdpi/ic_theme_delete.png b/res/drawable-xhdpi/ic_theme_delete.png
new file mode 100644
index 0000000..e105869
Binary files /dev/null and b/res/drawable-xhdpi/ic_theme_delete.png differ
diff --git a/res/drawable-xhdpi/ic_theme_reset.png b/res/drawable-xhdpi/ic_theme_reset.png
new file mode 100644
index 0000000..1e35a25
Binary files /dev/null and b/res/drawable-xhdpi/ic_theme_reset.png differ
diff --git a/res/drawable-xxhdpi/ic_theme_delete.png b/res/drawable-xxhdpi/ic_theme_delete.png
new file mode 100644
index 0000000..e2eac6e
Binary files /dev/null and b/res/drawable-xxhdpi/ic_theme_delete.png differ
diff --git a/res/drawable-xxhdpi/ic_theme_reset.png b/res/drawable-xxhdpi/ic_theme_reset.png
new file mode 100644
index 0000000..e8885df
Binary files /dev/null and b/res/drawable-xxhdpi/ic_theme_reset.png differ
diff --git a/res/layout/fragment_pager_list.xml b/res/layout/fragment_pager_list.xml
index 9e9b69c..c562080 100644
--- a/res/layout/fragment_pager_list.xml
+++ b/res/layout/fragment_pager_list.xml
@@ -110,7 +110,27 @@
                         android:layout_marginStart="1dp"
                         android:layout_marginEnd="8dp"
                         android:scaleType="center"
-                        android:src="@drawable/ic_overflow_dark"/>
+                        android:src="@drawable/ic_overflow_dark"
+                        android:visibility="gone"/>
+
+                    <ImageView
+                        android:id="@+id/delete"
+                        android:layout_width="36dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="1dp"
+                        android:layout_marginEnd="8dp"
+                        android:scaleType="center"
+                        android:src="@drawable/ic_theme_delete"/>
+
+                    <ImageView
+                        android:id="@+id/reset"
+                        android:layout_width="36dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="1dp"
+                        android:layout_marginEnd="8dp"
+                        android:scaleType="center"
+                        android:src="@drawable/ic_theme_reset"
+                        android:visibility="gone"/>
                 </LinearLayout>
                 <ProgressBar
                     android:id="@+id/apply_progress"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1589a62..6a0547f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -54,6 +54,7 @@
 
     <string name="apply_theme_overlay_title">Apply</string>
     <string name="delete_theme_overlay_title">Delete</string>
+    <string name="reset_theme_overlay_title">Reset</string>
 
     <string name="default_tag_text">Default</string>
     <string name="customized_tag_text">Customized</string>
-- 
cgit v1.1