summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-04-15 23:57:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-04-15 23:57:43 +0000
commit139cd9482064d9e4a5634758a0152db5cd922801 (patch)
treefee101071152b617f1de8dc6eecaa6685d70a5b1 /res
parent0edbac1132f229c22ed951cf2d90d58d2f36aa06 (diff)
parentfbd77f6881b344e2e061e97e27fb4dda1821438f (diff)
downloadandroid_packages_apps_Trebuchet-139cd9482064d9e4a5634758a0152db5cd922801.tar.gz
android_packages_apps_Trebuchet-139cd9482064d9e4a5634758a0152db5cd922801.tar.bz2
android_packages_apps_Trebuchet-139cd9482064d9e4a5634758a0152db5cd922801.zip
Merge "Fix all apps tab font." into ub-launcher3-qt-dev
Diffstat (limited to 'res')
-rw-r--r--res/layout/all_apps.xml7
1 files changed, 3 insertions, 4 deletions
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index 33ff46b91..9427ae0b7 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -24,7 +24,7 @@
android:clipChildren="true"
android:clipToPadding="false"
android:focusable="false"
- android:saveEnabled="false" >
+ android:saveEnabled="false">
<include
layout="@layout/all_apps_rv_layout"
@@ -47,7 +47,8 @@
android:layout_height="@dimen/all_apps_header_tab_height"
android:layout_marginLeft="@dimen/all_apps_tabs_side_padding"
android:layout_marginRight="@dimen/all_apps_tabs_side_padding"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ style="@style/TextHeadline">
<Button
android:id="@+id/tab_personal"
@@ -55,7 +56,6 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
- android:fontFamily="sans-serif-medium"
android:text="@string/all_apps_personal_tab"
android:textAllCaps="true"
android:textColor="@color/all_apps_tab_text"
@@ -67,7 +67,6 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
- android:fontFamily="sans-serif-medium"
android:text="@string/all_apps_work_tab"
android:textAllCaps="true"
android:textColor="@color/all_apps_tab_text"