Merge "Do not use bitmap cache on low ram devices" into ub-launcher3-qt-dev
diff --git a/res/layout/preview_card_font_content.xml b/res/layout/preview_card_font_content.xml
index bc66f20..d52474e 100644
--- a/res/layout/preview_card_font_content.xml
+++ b/res/layout/preview_card_font_content.xml
@@ -31,10 +31,15 @@
android:layout_marginBottom="16dp"
android:gravity="center_horizontal"
android:text="@string/font_card_title"/>
+ <View
+ android:id="@+id/font_card_divider"
+ android:layout_width="15dp"
+ android:layout_height="2dp"
+ android:layout_marginVertical="30dp"
+ android:background="?android:colorAccent"/>
<TextView
style="@style/FontCardBodyTextStyle"
android:id="@+id/font_card_body"
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/font_card_body"/>
diff --git a/res/layout/theme_preview_card.xml b/res/layout/theme_preview_card.xml
index fc5acda..c1e63de 100644
--- a/res/layout/theme_preview_card.xml
+++ b/res/layout/theme_preview_card.xml
@@ -45,7 +45,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:layout_marginBottom="8dp"
+ android:layout_marginBottom="48dp"
android:drawablePadding="10dp"
android:textAppearance="@style/CardTitleTextAppearance"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index beaf48a..184296a 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -82,10 +82,10 @@
<string name="preview_name_wallpaper">Wallpaper</string>
<!-- Title text for previewing a font [CHAR LIMIT=30] -->
- <string name="font_card_title">Customize your device</string>
+ <string name="font_card_title">ABC • abc • 123</string>
<!-- Body text for previewing a font [CHAR LIMIT=160] -->
- <string name="font_card_body">Add your style to every screen with featured or custom designs that change your phone\'s home screen, icons and more</string>
+ <string name="font_card_body">Add your favorite fonts to every screen</string>
<!--Title for a grid option, describing the number of columns and rows, eg: 4x4 [CHAR LIMIT=10] -->
<string name="grid_title_pattern"><xliff:g name="num_cols" example="1">%1$d</xliff:g>x<xliff:g name="num_rows" example="1">%2$d</xliff:g></string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 188494d..753a877 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -88,6 +88,7 @@
</style>
<style name="FontCardBodyTextStyle">
+ <item name="android:layout_width">200dp</item>
<item name="android:textAlignment">center</item>
<item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault</item>
</style>
diff --git a/src/com/android/customization/picker/theme/ThemeFragment.java b/src/com/android/customization/picker/theme/ThemeFragment.java
index 59808ac..bc17a27 100644
--- a/src/com/android/customization/picker/theme/ThemeFragment.java
+++ b/src/com/android/customization/picker/theme/ThemeFragment.java
@@ -532,6 +532,7 @@
title.setTypeface(previewInfo.headlineFontFamily);
TextView body = card.findViewById(R.id.font_card_body);
body.setTypeface(previewInfo.bodyFontFamily);
+ card.findViewById(R.id.font_card_divider).setBackgroundColor(accentColor);
}
});
if (previewInfo.icons.size() >= mIconIds.length) {