Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d4770e0 authored by Shubham Basu's avatar Shubham Basu Committed by Automerger Merge Worker
Browse files

Merge "adding matrial next overline text style for subheader" into sc-dev am: 47b11902 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/14738081

Change-Id: Icbe026faac8973e107c055cf6e08e36a438d77c2
parents 38b8bf9d 47b11902

res/layout/directory_header.xml

+1 −2
Original line number Diff line number Diff line
@@ -72,8 +72,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:textAppearance="@style/SortTitle"

            android:textAllCaps="true"

            android:textAppearance="@style/SectionHeader"

            android:maxLines="1"

            android:ellipsize="end"

            android:gravity="start|center_vertical"/>

res/values-v31/styles.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<resources>

    <style name="SectionHeader" parent="@*android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="fontFamily">@string/config_fontFamilyMedium</item>

        <item name="android:textSize">12sp</item>

    </style>

</resources>

res/values/styles_text.xml

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,13 @@ 
        <item name="android:textSize">11sp</item>

    </style>



    <style name="SectionHeader" parent="@*android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:textAllCaps">true</item>

        <item name="fontFamily">@string/config_fontFamilyMedium</item>

        <item name="android:textSize">12sp</item>

    </style>



    <style name="SortList" parent="@style/TextAppearance.AppCompat.Subhead">

        <item name="android:textColor">@color/sort_list_text</item>

        <item name="fontFamily">@string/config_fontFamilyMedium</item>