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

Commit a143b940 authored by Jacqueline Bronger's avatar Jacqueline Bronger Committed by Android (Google) Code Review
Browse files

Merge "Adjust TV PiP edu text font." into main

parents 4a22e6f4 1888548f

libs/WindowManager/Shell/res/values/strings_tv.xml

+2 −0
Original line number Diff line number Diff line
@@ -59,5 +59,7 @@ 
    <!-- Accessibility action: done with moving the PiP [CHAR LIMIT=30] -->

    <string name="a11y_action_pip_move_done">Done</string>



    <string name="font_display_medium" translatable="false">sans-serif</string>



</resources>

libs/WindowManager/Shell/res/values/styles.xml

+0 −9
Original line number Diff line number Diff line
@@ -75,15 +75,6 @@ 
        <item name="android:background">@color/split_divider_background</item>

    </style>



    <style name="TvPipEduText">

        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>

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

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

        <item name="android:lineSpacingExtra">4sp</item>

        <item name="android:lineHeight">16sp</item>

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

    </style>



    <style name="LetterboxDialog" parent="@android:style/Theme.DeviceDefault.Dialog.Alert">

        <item name="android:layout_width">wrap_content</item>

        <item name="android:layout_height">wrap_content</item>

libs/WindowManager/Shell/res/values/styles_tv.xml

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

<!-- Copyright (C) 2025 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 xmlns:android="http://schemas.android.com/apk/res/android">



    <style name="TvPipEduText">

        <item name="android:fontFamily">@string/font_display_medium</item>

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

        <item name="android:textFontWeight">700</item>

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

        <item name="android:lineSpacingExtra">4sp</item>

        <item name="android:lineHeight">16sp</item>

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

    </style>



</resources>
 
 No newline at end of file