From f40ac25917a17e2d482d9b69edd9a0b14097847b Mon Sep 17 00:00:00 2001
From: Bharadwaj Narasimha <bnarasimha@cyngn.com>
Date: Wed, 31 Aug 2016 13:02:56 -0700
Subject: Move actions in theme card to overflow menu

Moved the customize,delete and reset in the title card
to an overflow menu to free up some space in the
title card for the theme and author names.

TICKET:CYNGNOS-3279
Change-Id: I0c4defd82369e4840efac420b1629493b280b168
---
 res/drawable-hdpi/ic_theme_customize.png   | Bin 3373 -> 0 bytes
 res/drawable-hdpi/ic_theme_delete.png      | Bin 2961 -> 0 bytes
 res/drawable-hdpi/ic_theme_reset.png       | Bin 3689 -> 0 bytes
 res/drawable-mdpi/ic_theme_customize.png   | Bin 3123 -> 0 bytes
 res/drawable-mdpi/ic_theme_delete.png      | Bin 2836 -> 0 bytes
 res/drawable-mdpi/ic_theme_reset.png       | Bin 3339 -> 0 bytes
 res/drawable-xhdpi/ic_theme_customize.png  | Bin 3602 -> 0 bytes
 res/drawable-xhdpi/ic_theme_delete.png     | Bin 2988 -> 0 bytes
 res/drawable-xhdpi/ic_theme_reset.png      | Bin 4047 -> 0 bytes
 res/drawable-xxhdpi/ic_theme_customize.png | Bin 4016 -> 0 bytes
 res/drawable-xxhdpi/ic_theme_delete.png    | Bin 3170 -> 0 bytes
 res/drawable-xxhdpi/ic_theme_reset.png     | Bin 4777 -> 0 bytes
 res/layout/title_card.xml                  |  28 ----------------------------
 res/menu/overflow.xml                      |   8 ++++----
 res/values/strings.xml                     |   2 +-
 15 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100644 res/drawable-hdpi/ic_theme_customize.png
 delete mode 100644 res/drawable-hdpi/ic_theme_delete.png
 delete mode 100644 res/drawable-hdpi/ic_theme_reset.png
 delete mode 100644 res/drawable-mdpi/ic_theme_customize.png
 delete mode 100644 res/drawable-mdpi/ic_theme_delete.png
 delete mode 100644 res/drawable-mdpi/ic_theme_reset.png
 delete mode 100644 res/drawable-xhdpi/ic_theme_customize.png
 delete mode 100644 res/drawable-xhdpi/ic_theme_delete.png
 delete mode 100644 res/drawable-xhdpi/ic_theme_reset.png
 delete mode 100644 res/drawable-xxhdpi/ic_theme_customize.png
 delete mode 100644 res/drawable-xxhdpi/ic_theme_delete.png
 delete mode 100644 res/drawable-xxhdpi/ic_theme_reset.png

(limited to 'res')

diff --git a/res/drawable-hdpi/ic_theme_customize.png b/res/drawable-hdpi/ic_theme_customize.png
deleted file mode 100644
index 2ce535c..0000000
Binary files a/res/drawable-hdpi/ic_theme_customize.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_theme_delete.png b/res/drawable-hdpi/ic_theme_delete.png
deleted file mode 100644
index eeefe21..0000000
Binary files a/res/drawable-hdpi/ic_theme_delete.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_theme_reset.png b/res/drawable-hdpi/ic_theme_reset.png
deleted file mode 100644
index 8d1ead9..0000000
Binary files a/res/drawable-hdpi/ic_theme_reset.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_theme_customize.png b/res/drawable-mdpi/ic_theme_customize.png
deleted file mode 100644
index 56f306e..0000000
Binary files a/res/drawable-mdpi/ic_theme_customize.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_theme_delete.png b/res/drawable-mdpi/ic_theme_delete.png
deleted file mode 100644
index 93bb424..0000000
Binary files a/res/drawable-mdpi/ic_theme_delete.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_theme_reset.png b/res/drawable-mdpi/ic_theme_reset.png
deleted file mode 100644
index 4d124ab..0000000
Binary files a/res/drawable-mdpi/ic_theme_reset.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_theme_customize.png b/res/drawable-xhdpi/ic_theme_customize.png
deleted file mode 100644
index 8da38ea..0000000
Binary files a/res/drawable-xhdpi/ic_theme_customize.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_theme_delete.png b/res/drawable-xhdpi/ic_theme_delete.png
deleted file mode 100644
index e105869..0000000
Binary files a/res/drawable-xhdpi/ic_theme_delete.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_theme_reset.png b/res/drawable-xhdpi/ic_theme_reset.png
deleted file mode 100644
index 1e35a25..0000000
Binary files a/res/drawable-xhdpi/ic_theme_reset.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_theme_customize.png b/res/drawable-xxhdpi/ic_theme_customize.png
deleted file mode 100644
index 8e0db4c..0000000
Binary files a/res/drawable-xxhdpi/ic_theme_customize.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_theme_delete.png b/res/drawable-xxhdpi/ic_theme_delete.png
deleted file mode 100644
index e2eac6e..0000000
Binary files a/res/drawable-xxhdpi/ic_theme_delete.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_theme_reset.png b/res/drawable-xxhdpi/ic_theme_reset.png
deleted file mode 100644
index e8885df..0000000
Binary files a/res/drawable-xxhdpi/ic_theme_reset.png and /dev/null differ
diff --git a/res/layout/title_card.xml b/res/layout/title_card.xml
index 61efa88..0529009 100644
--- a/res/layout/title_card.xml
+++ b/res/layout/title_card.xml
@@ -49,13 +49,6 @@
                     android:textColor="@color/theme_author_text_color"
                     android:textSize="14dp" />
         </LinearLayout>
-        <ImageView
-                android:id="@+id/customize"
-                android:layout_width="47dp"
-                android:layout_height="match_parent"
-                android:scaleType="center"
-                android:src="@drawable/ic_theme_customize"
-                android:background="@drawable/theme_card_action_item_background"/>
 
         <ImageView
                 android:id="@+id/overflow"
@@ -65,29 +58,8 @@
                 android:layout_marginEnd="8dp"
                 android:scaleType="center"
                 android:src="@drawable/ic_overflow_dark"
-                android:visibility="gone"
                 android:background="@drawable/theme_card_action_item_background"/>
 
-        <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"
-                android:background="@drawable/theme_card_action_item_background"/>
-
-        <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"
-                android:background="@drawable/theme_card_action_item_background"/>
     </LinearLayout>
     <ProgressBar
             android:id="@+id/apply_progress"
diff --git a/res/menu/overflow.xml b/res/menu/overflow.xml
index 26353be..d03f190 100644
--- a/res/menu/overflow.xml
+++ b/res/menu/overflow.xml
@@ -18,12 +18,12 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <group android:id="@+id/group_popupmenu">
+        <item android:id="@+id/menu_customize"
+              android:title="@string/menu_customize"/>
+
         <item android:id="@+id/menu_delete"
               android:title="@string/menu_delete"/>
-        <!-- Will be added back in once UX is available for this function
-        <item android:id="@+id/menu_author"
-            android:title="@string/menu_author_info"/>
-        -->
+
         <item android:id="@+id/menu_reset"
             android:title="@string/menu_reset"/>
     </group>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0850936..ecd0601 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -53,7 +53,7 @@
     <string name="ringtone_label">Ringtone</string>
 
     <!-- Overflow menu -->
-    <string name="menu_author_info">Author</string>
+    <string name="menu_customize">Customize</string>
     <string name="menu_delete">Delete</string>
     <string name="menu_reset">Reset theme</string>
 
-- 
cgit v1.1