Change updated and customized tags to be text based

The previous implementation used icons that were not clear to the
user.  This changes those tags so that they have text that is more
descriptive.

Change-Id: I9c0fe4fbdb609fd630b5aca148a439ebdefc497b

22 files changed, 24 insertions, 14 deletions

diff --git a/res/drawable-hdpi/bg_tag_customized.9.png b/res/drawable-hdpi/bg_tag_customized.9.png
new file mode 100644
index 0000000..ad35476
--- /dev/null
+++ b/res/drawable-hdpi/bg_tag_customized.9.png
diff --git a/res/drawable-hdpi/bg_tag_updated.9.png b/res/drawable-hdpi/bg_tag_updated.9.png
new file mode 100644
index 0000000..4923af7
--- /dev/null
+++ b/res/drawable-hdpi/bg_tag_updated.9.png
diff --git a/res/drawable-hdpi/ic_tag_customized.png b/res/drawable-hdpi/ic_tag_customized.png
deleted file mode 100644
index b6c711e..0000000
--- a/res/drawable-hdpi/ic_tag_customized.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_tag_updated.png b/res/drawable-hdpi/ic_tag_updated.png
deleted file mode 100644
index 21b01c3..0000000
--- a/res/drawable-hdpi/ic_tag_updated.png
+++ /dev/null
diff --git a/res/drawable-mdpi/bg_tag_customized.9.png b/res/drawable-mdpi/bg_tag_customized.9.png
new file mode 100644
index 0000000..ea04320
--- /dev/null
+++ b/res/drawable-mdpi/bg_tag_customized.9.png
diff --git a/res/drawable-mdpi/bg_tag_updated.9.png b/res/drawable-mdpi/bg_tag_updated.9.png
new file mode 100644
index 0000000..91b750b
--- /dev/null
+++ b/res/drawable-mdpi/bg_tag_updated.9.png
diff --git a/res/drawable-mdpi/ic_tag_customized.png b/res/drawable-mdpi/ic_tag_customized.png
deleted file mode 100644
index 855d9a4..0000000
--- a/res/drawable-mdpi/ic_tag_customized.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_tag_updated.png b/res/drawable-mdpi/ic_tag_updated.png
deleted file mode 100644
index d0a5a3e..0000000
--- a/res/drawable-mdpi/ic_tag_updated.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/bg_tag_customized.9.png b/res/drawable-xhdpi/bg_tag_customized.9.png
new file mode 100644
index 0000000..8691c0f
--- /dev/null
+++ b/res/drawable-xhdpi/bg_tag_customized.9.png
diff --git a/res/drawable-xhdpi/bg_tag_updated.9.png b/res/drawable-xhdpi/bg_tag_updated.9.png
new file mode 100644
index 0000000..34cb87f
--- /dev/null
+++ b/res/drawable-xhdpi/bg_tag_updated.9.png
diff --git a/res/drawable-xhdpi/ic_tag_customized.png b/res/drawable-xhdpi/ic_tag_customized.png
deleted file mode 100644
index f485b9e..0000000
--- a/res/drawable-xhdpi/ic_tag_customized.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_tag_updated.png b/res/drawable-xhdpi/ic_tag_updated.png
deleted file mode 100644
index 5ee4946..0000000
--- a/res/drawable-xhdpi/ic_tag_updated.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/bg_tag_customized.9.png b/res/drawable-xxhdpi/bg_tag_customized.9.png
new file mode 100644
index 0000000..828c692
--- /dev/null
+++ b/res/drawable-xxhdpi/bg_tag_customized.9.png
diff --git a/res/drawable-xxhdpi/bg_tag_updated.9.png b/res/drawable-xxhdpi/bg_tag_updated.9.png
new file mode 100644
index 0000000..adae829
--- /dev/null
+++ b/res/drawable-xxhdpi/bg_tag_updated.9.png
diff --git a/res/drawable-xxhdpi/ic_tag_customized.png b/res/drawable-xxhdpi/ic_tag_customized.png
deleted file mode 100644
index 98a28df..0000000
--- a/res/drawable-xxhdpi/ic_tag_customized.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_tag_updated.png b/res/drawable-xxhdpi/ic_tag_updated.png
deleted file mode 100644
index 2d18aef..0000000
--- a/res/drawable-xxhdpi/ic_tag_updated.png
+++ /dev/null
diff --git a/res/layout/tag_customized.xml b/res/layout/tag_customized.xml
index 585453a..54aae46 100644
--- a/res/layout/tag_customized.xml
+++ b/res/layout/tag_customized.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/tag_customized"
-    android:layout_width="24dp"
+    android:layout_width="100dp"
     android:layout_height="24dp"
-    android:layout_marginEnd="8dp"
-    android:src="@drawable/ic_tag_customized" />
+    android:gravity="center"
+    android:textSize="14sp"
+    android:textColor="@color/tag_text_color"
+    android:textAllCaps="true"
+    android:background="@drawable/bg_tag_customized"
+    android:text="@string/customized_tag_text" />
diff --git a/res/layout/tag_default.xml b/res/layout/tag_default.xml
index 8bc0201..cec9d84 100644
--- a/res/layout/tag_default.xml
+++ b/res/layout/tag_default.xml
@@ -6,7 +6,7 @@
     android:layout_height="24dp"
     android:gravity="center"
     android:textSize="14sp"
-    android:textColor="@color/default_tag_text_color"
+    android:textColor="@color/tag_text_color"
     android:textAllCaps="true"
     android:background="@drawable/bg_tag_default"
     android:text="@string/default_tag_text" />
diff --git a/res/layout/tag_updated.xml b/res/layout/tag_updated.xml
index c5fa162..f067421 100644
--- a/res/layout/tag_updated.xml
+++ b/res/layout/tag_updated.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/tag_updated"
-    android:layout_width="24dp"
+    android:layout_width="75dp"
     android:layout_height="24dp"
-    android:layout_marginEnd="8dp"
-    android:src="@drawable/ic_tag_updated" />
+    android:gravity="center"
+    android:textSize="14sp"
+    android:textColor="@color/tag_text_color"
+    android:textAllCaps="true"
+    android:background="@drawable/bg_tag_updated"
+    android:text="@string/updated_tag_text" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 472e219..ddede53 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -55,7 +55,7 @@
     <color name="apply_layout_separator_color">#ffffff</color>
     <color name="apply_layout_button_bg_color">#66ffffff</color>
 
-    <color name="default_tag_text_color">#ffffff</color>
+    <color name="tag_text_color">#ffffff</color>
     <color name="add_component_text_color">#000000</color>
     <color name="add_component_text_color_boot_anim">#ffffff</color>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 88c26f3..9c57cae 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -60,6 +60,8 @@
     <string name="apply_theme_layout_title">Apply</string>
 
     <string name="default_tag_text">Default</string>
+    <string name="customized_tag_text">Customized</string>
+    <string name="updated_tag_text">Updated</string>
 
     <string name="add_component_text">Add</string>
 
diff --git a/src/com/cyngn/theme/widget/ThemeTagLayout.java b/src/com/cyngn/theme/widget/ThemeTagLayout.java
index 0d11348..cf25fe1 100644
--- a/src/com/cyngn/theme/widget/ThemeTagLayout.java
+++ b/src/com/cyngn/theme/widget/ThemeTagLayout.java
@@ -14,8 +14,8 @@ import com.cyngn.theme.chooser.R;
 
 public class ThemeTagLayout extends LinearLayout {
     private ImageView mAppliedTag;
-    private ImageView mCustomizedTag;
-    private ImageView mUpdatedTag;
+    private TextView mCustomizedTag;
+    private TextView mUpdatedTag;
     private TextView mDefaultTag;
 
     public ThemeTagLayout(Context context) {
@@ -36,8 +36,8 @@ public class ThemeTagLayout extends LinearLayout {
         LayoutInflater inflater =
                 (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         mAppliedTag = (ImageView) inflater.inflate(R.layout.tag_applied, this, false);
-        mCustomizedTag = (ImageView) inflater.inflate(R.layout.tag_customized, this, false);
-        mUpdatedTag = (ImageView) inflater.inflate(R.layout.tag_updated, this, false);
+        mCustomizedTag = (TextView) inflater.inflate(R.layout.tag_customized, this, false);
+        mUpdatedTag = (TextView) inflater.inflate(R.layout.tag_updated, this, false);
         mDefaultTag = (TextView) inflater.inflate(R.layout.tag_default, this, false);
     }