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

Commit 3f66f77f authored by Edgar Wang's avatar Edgar Wang
Browse files

Fix SettingsLibTwoTargetPreference broken on Android R devices 

- Move new version layout to v31

Fixes: 189482683
Test: manual & CtsRoleTestCases
Change-Id: I281dbf103f32d7968e204c57bccf3038412200d7
parent ad227b1c

packages/SettingsLib/TwoTargetPreference/res/layout-v31/preference_two_target.xml

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

  -->



<!-- Based off preference_material_settings.xml except that ripple on only on the left side. -->

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

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

    android:gravity="center_vertical"

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

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

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

    android:clipToPadding="false">



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



    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:paddingTop="16dp"

        android:paddingBottom="16dp">



        <TextView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceListItem"

            android:ellipsize="marquee"/>



        <TextView

            android:id="@android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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

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

            android:textAppearance="?android:attr/textAppearanceListItemSecondary"

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

            android:maxLines="10"/>



    </RelativeLayout>



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



    <!-- Preference should place its actual preference widget here. -->

    <LinearLayout

        android:id="@android:id/widget_frame"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:minWidth="@dimen/two_target_min_width"

        android:gravity="center"

        android:orientation="vertical" />



</LinearLayout>

packages/SettingsLib/TwoTargetPreference/res/layout-v31/preference_two_target_divider.xml

0 → 100644
+31 −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:id="@+id/two_target_divider"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:gravity="start|center_vertical"

    android:orientation="horizontal"

    android:paddingTop="16dp"

    android:paddingBottom="16dp">

    <View

        android:layout_width="1dp"

        android:layout_height="32dp"

        android:background="?android:attr/listDivider" />

</LinearLayout>
 
 No newline at end of file

packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target.xml

+51 −24
Original line number Diff line number Diff line
@@ -18,16 +18,41 @@ 
<!-- Based off preference_material_settings.xml except that ripple on only on the left side. -->

<LinearLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

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

    android:gravity="center_vertical"

    android:background="@android:color/transparent"

    android:clipToPadding="false">



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

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

        android:gravity="start|center_vertical"

        android:clipToPadding="false"

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

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

    android:clipToPadding="false">

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



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

        <LinearLayout

            android:id="@+id/icon_frame"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="start|center_vertical"

            android:minWidth="56dp"

            android:orientation="horizontal"

            android:clipToPadding="false"

            android:paddingTop="4dp"

            android:paddingBottom="4dp">

            <androidx.preference.internal.PreferenceImageView

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                settings:maxWidth="48dp"

                settings:maxHeight="48dp" />

        </LinearLayout>



        <RelativeLayout

            android:layout_width="wrap_content"
@@ -56,6 +81,8 @@ 


        </RelativeLayout>



    </LinearLayout>



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



    <!-- Preference should place its actual preference widget here. -->
@@ -63,7 +90,7 @@ 
        android:id="@android:id/widget_frame"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:minWidth="@dimen/two_target_min_width"

        android:minWidth="64dp"

        android:gravity="center"

        android:orientation="vertical" />

packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target_divider.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,6 +26,6 @@ 
    android:paddingBottom="16dp">

    <View

        android:layout_width="1dp"

        android:layout_height="32dp"

        android:layout_height="match_parent"

        android:background="?android:attr/listDivider" />

</LinearLayout>
 
 No newline at end of file