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

Commit 44143c6d authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

Merge "[Panlingual] Add a new layout for top intro on app preferences" into... 

Merge "[Panlingual] Add a new layout for top intro on app preferences" into tm-dev am: af3351b5 am: b597bc26 am: b8d5211f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18309446



Change-Id: I27c5e8e644a082e5a6adae05405b073eec2a9b77
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f8bf499 b8d5211f

packages/SettingsLib/TopIntroPreference/res/values/styles.xml→packages/SettingsLib/AppPreference/res/layout/preference_app_header.xml

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

<!--

  Copyright (C) 2021 The Android Open Source Project

  Copyright (C) 2022 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.
@@ -14,10 +14,23 @@ 
  See the License for the specific language governing permissions and

  limitations under the License.

  -->

<resources>

    <style name="TextAppearance.TopIntroText"

           parent="@android:style/TextAppearance.DeviceDefault">

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

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

    </style>

</resources>
 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingBottom="16dp"

    android:paddingTop="8dp"

    android:clickable="false">



    <TextView

        android:id="@+id/apps_top_intro_text"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textDirection="locale"

        android:clickable="false"

        android:longClickable="false"

        android:textAppearance="@style/TextAppearance.TopIntroText" />



</LinearLayout>

packages/SettingsLib/SettingsTheme/res/values/styles.xml

+7 −0
Original line number Diff line number Diff line
@@ -26,4 +26,11 @@ 
    <style name="TextAppearance.CategoryTitle.SettingsLib"

           parent="@android:style/TextAppearance.DeviceDefault.Medium">

    </style>



    <style name="TextAppearance.TopIntroText"

        parent="@android:style/TextAppearance.DeviceDefault">

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

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

    </style>



</resources>

packages/SettingsLib/TopIntroPreference/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ android_library { 
    static_libs: [

        "androidx.annotation_annotation",

        "androidx.preference_preference",

        "SettingsLibSettingsTheme",

    ],

    sdk_version: "system_current",

    min_sdk_version: "21",