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

Commit c3369885 authored by Edgar Wang's avatar Edgar Wang
Browse files

Considering to mainline moudle to move some resource to v31 

- mainline module team have concern about backward compatible on
  old platform.
  To reduce the change, we move most of change for Android S to v31
- Rename resource name to avoid build conflict in another path.

Bug: 182179573
Test: manual
Change-Id: Ic377c8cde7794e9088dad8b066ae7a9c377f8d5f
parent 214bff10

packages/SettingsLib/FooterPreference/res/layout-v31/preference_footer.xml

0 → 100644
+55 −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.

  -->



<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"

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

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

    android:background="?android:attr/selectableItemBackground"

    android:orientation="vertical"

    android:clipToPadding="false">



    <LinearLayout

        android:id="@+id/icon_frame"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:minWidth="56dp"

        android:gravity="start|top"

        android:orientation="horizontal"

        android:paddingEnd="12dp"

        android:paddingTop="16dp"

        android:paddingBottom="4dp">

        <ImageView

            android:id="@android:id/icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>

    </LinearLayout>



    <com.android.settingslib.widget.LinkTextView

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:paddingBottom="16dp"

        android:paddingTop="16dp"

        android:maxLines="10"

        android:textColor="?android:attr/textColorSecondary"

        android:ellipsize="marquee" />



</LinearLayout>
 
 No newline at end of file

packages/SettingsLib/FooterPreference/res/layout/preference_footer.xml

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

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

    android:background="?android:attr/selectableItemBackground"

    android:orientation="vertical"

    android:clipToPadding="false">



    <LinearLayout

packages/SettingsLib/SettingsTheme/res/layout/settings_dropdown_preference.xml→packages/SettingsLib/SettingsTheme/res/layout-v31/settingslib_dropdown_preference.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,6 @@ 
        android:layout_marginLeft="@dimen/preference_dropdown_padding_start"

        android:visibility="invisible" />



    <include layout="@layout/settings_preference" />

    <include layout="@layout/settingslib_preference" />



</FrameLayout>
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/res/layout/settings_icon.xml→packages/SettingsLib/SettingsTheme/res/layout-v31/settingslib_icon_frame.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:id="@+id/icon_frame"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:minWidth="@dimen/icon_min_width"

    android:minWidth="48dp"

    android:gravity="start|center_vertical"

    android:orientation="horizontal"

    android:paddingLeft="0dp"

packages/SettingsLib/SettingsTheme/res/layout/settings_preference.xml→packages/SettingsLib/SettingsTheme/res/layout-v31/settingslib_preference.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
    android:clipToPadding="false"

    android:baselineAligned="false">



    <include layout="@layout/settings_icon"/>

    <include layout="@layout/settingslib_icon_frame"/>



    <RelativeLayout

        android:layout_width="0dp"