summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-09-18 22:59:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-18 22:59:40 +0000
commit1f2d9f978f608c876a4952404530009e3e33c36a (patch)
tree070a14e1f249e8f0a002c547fe29d4204e384f74 /res
parent5029f1bc83ca4bc896346ad737ce50affa4d9353 (diff)
parent22cf526889b2d5addd3f696089e6672fdb63ebaf (diff)
downloadandroid_packages_apps_Trebuchet-1f2d9f978f608c876a4952404530009e3e33c36a.tar.gz
android_packages_apps_Trebuchet-1f2d9f978f608c876a4952404530009e3e33c36a.tar.bz2
android_packages_apps_Trebuchet-1f2d9f978f608c876a4952404530009e3e33c36a.zip
Merge "Changing font family to condensed for icons and folders (issue 10823062)" into jb-ub-now-indigo-rose
Diffstat (limited to 'res')
-rw-r--r--res/layout/user_folder.xml3
-rw-r--r--res/values/styles.xml1
2 files changed, 3 insertions, 1 deletions
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index d790c5388..45986e532 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -48,5 +48,6 @@
android:textColorHighlight="#ff333333"
android:gravity="center_horizontal"
android:singleLine="true"
- android:imeOptions="flagNoExtractUi"/>
+ android:imeOptions="flagNoExtractUi"
+ android:fontFamily="sans-serif-condensed"/>
</com.android.launcher3.Folder>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 618bb4705..cf77b51d9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -74,6 +74,7 @@
<item name="android:textColor">@color/workspace_icon_text_color</item>
<item name="android:shadowRadius">2.0</item>
<item name="android:shadowColor">#B0000000</item>
+ <item name="android:fontFamily">sans-serif-condensed</item>
</style>
<style name="WorkspaceIcon.Portrait">