summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/wallpaper_component_selection_item.xml8
-rw-r--r--res/values/attrs.xml3
-rw-r--r--res/values/styles.xml6
3 files changed, 11 insertions, 6 deletions
diff --git a/res/layout/wallpaper_component_selection_item.xml b/res/layout/wallpaper_component_selection_item.xml
index e36ec0a..7f1428c 100644
--- a/res/layout/wallpaper_component_selection_item.xml
+++ b/res/layout/wallpaper_component_selection_item.xml
@@ -3,6 +3,7 @@
Copyright (C) 2014 Cyanogen, Inc.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cyngn="http://schemas.android.com/apk/res/com.cyngn.theme.chooser"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="@dimen/component_selection_cell_height"
@@ -31,16 +32,17 @@
android:background="@android:color/white"
android:layout_gravity="center_horizontal|bottom"
android:visibility="gone">
- <com.cyngn.theme.widget.FittedTextView
+ <com.cyngn.theme.widget.LatoTextView
android:layout_width="@dimen/animated_lock_screen_text_width"
android:layout_height="@dimen/animated_lock_screen_text_height"
android:includeFontPadding="false"
- android:gravity="center"
+ android:layout_gravity="center_horizontal"
android:layout_marginLeft="@dimen/animated_lock_screen_text_margin_left"
android:layout_marginRight="@dimen/animated_lock_screen_text_margin_right"
android:layout_marginTop="@dimen/animated_lock_screen_text_margin_top"
android:layout_marginBottom="@dimen/animated_lock_screen_text_margin_bottom"
style="@style/animated_lock_screen_badge_text_style"
+ cyngn:autoFitText="true"
android:text="@string/animated_lock_screen_badge_text"/>
</LinearLayout>
</FrameLayout>
@@ -52,4 +54,4 @@
android:layout_gravity="center_horizontal"
style="@style/component_title"/>
-</LinearLayout> \ No newline at end of file
+</LinearLayout>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index d78f25e..0cb7ae9 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -18,4 +18,7 @@
<attr name="maxHeight" format="dimension" />
</declare-styleable>
+ <declare-styleable name="FittedTextView">
+ <attr name="autoFitText" format="boolean" />
+ </declare-styleable>
</resources> \ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3fca6f9..e0bc961 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -130,12 +130,12 @@
</style>
<style name="animated_lock_screen_badge_text_style">
- <item name="android:fontFamily">sans-serif</item>
- <item name="android:textStyle">bold</item>
<item name="android:alpha">0.54</item>
- <item name="android:textSize">12sp</item>
<item name="android:letterSpacing">0.2</item>
<item name="android:textColor">@android:color/black</item>
<item name="android:textAllCaps">true</item>
+ <item name="android:gravity">center</item>
+ <item name="android:textSize">10dp</item>
+ <item name="android:maxLines">1</item>
</style>
</resources>