summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorBharadwaj Narasimha <bnarasimha@cyngn.com>2016-08-31 13:02:56 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-09-03 13:44:11 -0700
commitf40ac25917a17e2d482d9b69edd9a0b14097847b (patch)
tree9bdd618b8c58cacd3aa188aebd6224929a90e403 /res
parent7e4390fef0dfba5f80b0ef0c4e0665ac45f84b99 (diff)
downloadpackages_apps_ThemeChooser-f40ac25917a17e2d482d9b69edd9a0b14097847b.zip
packages_apps_ThemeChooser-f40ac25917a17e2d482d9b69edd9a0b14097847b.tar.gz
packages_apps_ThemeChooser-f40ac25917a17e2d482d9b69edd9a0b14097847b.tar.bz2
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
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_theme_customize.pngbin3373 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_theme_delete.pngbin2961 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_theme_reset.pngbin3689 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_theme_customize.pngbin3123 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_theme_delete.pngbin2836 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_theme_reset.pngbin3339 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_theme_customize.pngbin3602 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_theme_delete.pngbin2988 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_theme_reset.pngbin4047 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_theme_customize.pngbin4016 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_theme_delete.pngbin3170 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_theme_reset.pngbin4777 -> 0 bytes
-rw-r--r--res/layout/title_card.xml28
-rw-r--r--res/menu/overflow.xml8
-rw-r--r--res/values/strings.xml2
15 files changed, 5 insertions, 33 deletions
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
--- a/res/drawable-hdpi/ic_theme_customize.png
+++ /dev/null
Binary files 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
--- a/res/drawable-hdpi/ic_theme_delete.png
+++ /dev/null
Binary files 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
--- a/res/drawable-hdpi/ic_theme_reset.png
+++ /dev/null
Binary files 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
--- a/res/drawable-mdpi/ic_theme_customize.png
+++ /dev/null
Binary files 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
--- a/res/drawable-mdpi/ic_theme_delete.png
+++ /dev/null
Binary files 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
--- a/res/drawable-mdpi/ic_theme_reset.png
+++ /dev/null
Binary files 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
--- a/res/drawable-xhdpi/ic_theme_customize.png
+++ /dev/null
Binary files 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
--- a/res/drawable-xhdpi/ic_theme_delete.png
+++ /dev/null
Binary files 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
--- a/res/drawable-xhdpi/ic_theme_reset.png
+++ /dev/null
Binary files 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
--- a/res/drawable-xxhdpi/ic_theme_customize.png
+++ /dev/null
Binary files 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
--- a/res/drawable-xxhdpi/ic_theme_delete.png
+++ /dev/null
Binary files 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
--- a/res/drawable-xxhdpi/ic_theme_reset.png
+++ /dev/null
Binary files 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>