diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2019-04-11 15:17:41 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2019-04-11 22:56:54 +0000 |
| commit | df4bf92412059663e3ac9d787d34f5afbedca59f (patch) | |
| tree | c94088828f14766ab818db5b59bb5d9575baf1de /res/layout | |
| parent | 0d7b0159b37361f8483ea2120d286ec249a82673 (diff) | |
| download | android_packages_apps_Trebuchet-df4bf92412059663e3ac9d787d34f5afbedca59f.tar.gz android_packages_apps_Trebuchet-df4bf92412059663e3ac9d787d34f5afbedca59f.tar.bz2 android_packages_apps_Trebuchet-df4bf92412059663e3ac9d787d34f5afbedca59f.zip | |
Popups (shortcut, system, scroller) / Drop Targets / Widgets (bottom/full) should follow themed font
Bug: 126229665
Change-Id: I429da6b9bc5f99d42be0f2498cbdecb059f127f4
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/deep_shortcut.xml | 1 | ||||
| -rw-r--r-- | res/layout/system_shortcut.xml | 1 | ||||
| -rw-r--r-- | res/layout/widget_cell_content.xml | 2 | ||||
| -rw-r--r-- | res/layout/widgets_bottom_sheet.xml | 2 | ||||
| -rw-r--r-- | res/layout/widgets_scroll_container.xml | 1 |
5 files changed, 2 insertions, 5 deletions
diff --git a/res/layout/deep_shortcut.xml b/res/layout/deep_shortcut.xml index 92f70e661..ca6f409db 100644 --- a/res/layout/deep_shortcut.xml +++ b/res/layout/deep_shortcut.xml @@ -33,7 +33,6 @@ android:drawablePadding="@dimen/deep_shortcut_drawable_padding" android:textSize="14sp" android:textColor="?android:attr/textColorPrimary" - android:fontFamily="sans-serif" launcher:layoutHorizontal="true" launcher:iconDisplay="shortcut_popup" launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size" /> diff --git a/res/layout/system_shortcut.xml b/res/layout/system_shortcut.xml index 04f3d027d..4b7097a97 100644 --- a/res/layout/system_shortcut.xml +++ b/res/layout/system_shortcut.xml @@ -31,7 +31,6 @@ android:paddingEnd="@dimen/popup_padding_end" android:textSize="14sp" android:textColor="?android:attr/textColorPrimary" - android:fontFamily="sans-serif" launcher:iconDisplay="shortcut_popup" launcher:layoutHorizontal="true" android:focusable="false" /> diff --git a/res/layout/widget_cell_content.xml b/res/layout/widget_cell_content.xml index c77b0b931..64f2362ed 100644 --- a/res/layout/widget_cell_content.xml +++ b/res/layout/widget_cell_content.xml @@ -34,7 +34,6 @@ android:layout_weight="1" android:ellipsize="end" android:fadingEdge="horizontal" - android:fontFamily="sans-serif-condensed" android:gravity="start" android:singleLine="true" android:maxLines="1" @@ -51,7 +50,6 @@ android:layout_marginLeft="5dp" android:textColor="?android:attr/textColorSecondary" android:textSize="14sp" - android:fontFamily="sans-serif-condensed" android:alpha="0.8" /> </LinearLayout> diff --git a/res/layout/widgets_bottom_sheet.xml b/res/layout/widgets_bottom_sheet.xml index 6bf90481a..3fdfc9666 100644 --- a/res/layout/widgets_bottom_sheet.xml +++ b/res/layout/widgets_bottom_sheet.xml @@ -26,7 +26,7 @@ android:theme="?attr/widgetsTheme"> <TextView - style="@style/TextTitle" + style="@style/TextHeadline" android:id="@+id/title" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/res/layout/widgets_scroll_container.xml b/res/layout/widgets_scroll_container.xml index 33c981a31..fc509d116 100644 --- a/res/layout/widgets_scroll_container.xml +++ b/res/layout/widgets_scroll_container.xml @@ -23,6 +23,7 @@ android:scrollbars="none"> <LinearLayout android:id="@+id/widgets_cell_list" + style="@style/TextTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingStart="0dp" |