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

Commit 6590ebf9 authored by Mill Chen's avatar Mill Chen
Browse files

Update TopIntroPreference 

- support learn more button
- support hyperlink

Bug: 367394720
Bug: 384999645
Test: visual test
Flag: EXEMPT backward compatibility
Change-Id: I3e96f31eed33d1d94d38f0ecb7dc39401468c07f
parent 44c66c63

packages/SettingsLib/SettingsTheme/res/layout-v35/settingslib_expressive_collapsable_textview.xml→packages/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_collapsable_textview.xml

+0 −0

File moved.

View file

packages/SettingsLib/SettingsTheme/res/values-v31/styles_expressive.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -104,6 +104,11 @@ 
        <item name="android:layout_width">match_parent</item>

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

    </style>

    </style>





    <style name="SettingslibTextAppearance.LinkableTextStyle.Expressive"

        parent="@style/TextAppearance.SettingsLib.LabelLarge">

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

    </style>



    <style name="SettingslibTextButtonStyle.Expressive"

    <style name="SettingslibTextButtonStyle.Expressive"

        parent="@style/Widget.Material3Expressive.Button.TextButton.Icon">

        parent="@style/Widget.Material3Expressive.Button.TextButton.Icon">

        <item name="android:theme">@style/Theme.Material3.DynamicColors.DayNight</item>

        <item name="android:theme">@style/Theme.Material3.DynamicColors.DayNight</item>

packages/SettingsLib/SettingsTheme/res/values-v35/styles_expressive.xml

+0 −5
Original line number Original line Diff line number Diff line
@@ -70,11 +70,6 @@ 
        <item name="android:textAppearance">@style/TextAppearance.SettingsLib.TitleLarge.Emphasized</item>

        <item name="android:textAppearance">@style/TextAppearance.SettingsLib.TitleLarge.Emphasized</item>

    </style>

    </style>





    <style name="SettingslibTextAppearance.LinkableTextStyle.Expressive"

           parent="@style/TextAppearance.SettingsLib.LabelLarge">

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

    </style>



    <style name="SettingsLibStatusBannerCardStyle">

    <style name="SettingsLibStatusBannerCardStyle">

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

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

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

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

packages/SettingsLib/TopIntroPreference/res/layout-v33/top_intro_preference.xml

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

<!--

  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.

  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.

  -->



<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    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:background="?android:attr/selectableItemBackground"

    android:clipToPadding="false">



    <TextView

        android:id="@android:id/title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="start"

        android:textAlignment="viewStart"

        android:clickable="false"

        android:longClickable="false"

        android:maxLines="10"

        android:hyphenationFrequency="normalFast"

        android:lineBreakWordStyle="phrase"

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

</LinearLayout>
 
 No newline at end of file

packages/SettingsLib/TopIntroPreference/res/layout-v35/settingslib_expressive_top_intro.xml→packages/SettingsLib/TopIntroPreference/res/layout/settingslib_expressive_top_intro.xml

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

<?xml version="1.0" encoding="utf-8"?>

<!--

<!--

  Copyright (C) 2024 The Android Open Source Project

  Copyright (C) 2025 The Android Open Source Project





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

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

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

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