summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorClark Scheff <clark@cyngn.com>2014-08-08 10:57:01 -0700
committerd34d <clark@cyngn.com>2014-08-11 08:18:18 -0700
commit5f903c2159a8a3fce0ef71c76ca201c3d54ffc12 (patch)
treec3eccc0dee91fff14dc5d5bf697d5ded36027248 /res/layout
parent5ac8d238009ca3dd90d0609762f60c9a02db2206 (diff)
downloadpackages_apps_ThemeChooser-5f903c2159a8a3fce0ef71c76ca201c3d54ffc12.tar.gz
packages_apps_ThemeChooser-5f903c2159a8a3fce0ef71c76ca201c3d54ffc12.tar.bz2
packages_apps_ThemeChooser-5f903c2159a8a3fce0ef71c76ca201c3d54ffc12.zip
Add tags to theme cards
The following tags can be enabled/disabled per theme Applied Customized Updated Default Currently the "Updated" tag is not being enabled. This will require some special handling and not worth holding up this patch. Change-Id: I69de7ca80df66f6c5cdbf0b47f18fc7dc77289f5
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/fragment_pager_list.xml3
-rw-r--r--res/layout/tag_applied.xml8
-rw-r--r--res/layout/tag_customized.xml8
-rw-r--r--res/layout/tag_default.xml12
-rw-r--r--res/layout/tag_updated.xml8
-rw-r--r--res/layout/theme_tags.xml12
6 files changed, 50 insertions, 1 deletions
diff --git a/res/layout/fragment_pager_list.xml b/res/layout/fragment_pager_list.xml
index b6361b1..e1ddc34 100644
--- a/res/layout/fragment_pager_list.xml
+++ b/res/layout/fragment_pager_list.xml
@@ -8,7 +8,7 @@
android:paddingEnd="@dimen/collapsed_theme_page_padding">
<com.cyngn.theme.widget.LockableScrollView android:id="@android:id/list"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:paddingTop="@dimen/collapsed_theme_page_padding_top"
android:gravity="center"
android:layout_gravity="center_vertical"
@@ -20,6 +20,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
+ <include layout="@layout/theme_tags" />
<FrameLayout
android:id="@+id/shadow_frame"
android:layout_width="match_parent"
diff --git a/res/layout/tag_applied.xml b/res/layout/tag_applied.xml
new file mode 100644
index 0000000..62c88f1
--- /dev/null
+++ b/res/layout/tag_applied.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/tag_applied"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginEnd="8dp"
+ android:src="@drawable/ic_tag_applied" />
diff --git a/res/layout/tag_customized.xml b/res/layout/tag_customized.xml
new file mode 100644
index 0000000..585453a
--- /dev/null
+++ b/res/layout/tag_customized.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/tag_customized"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginEnd="8dp"
+ android:src="@drawable/ic_tag_customized" />
diff --git a/res/layout/tag_default.xml b/res/layout/tag_default.xml
new file mode 100644
index 0000000..8bc0201
--- /dev/null
+++ b/res/layout/tag_default.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/tag_default"
+ android:layout_width="75dp"
+ android:layout_height="24dp"
+ android:gravity="center"
+ android:textSize="14sp"
+ android:textColor="@color/default_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
new file mode 100644
index 0000000..c5fa162
--- /dev/null
+++ b/res/layout/tag_updated.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/tag_updated"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginEnd="8dp"
+ android:src="@drawable/ic_tag_updated" />
diff --git a/res/layout/theme_tags.xml b/res/layout/theme_tags.xml
new file mode 100644
index 0000000..2e3fc04
--- /dev/null
+++ b/res/layout/theme_tags.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<com.cyngn.theme.widget.ThemeTagLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/tag_layout"
+ android:layout_width="wrap_content"
+ android:layout_height="24dp"
+ android:layout_marginBottom="8dp"
+ android:layout_marginStart="3dp"
+ android:animateLayoutChanges="true">
+
+</com.cyngn.theme.widget.ThemeTagLayout> \ No newline at end of file