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

Commit 411ca289 authored by Chris.CC Lee's avatar Chris.CC Lee
Browse files

Align layouts between single and two target preferences. 

Change the layout to align view components with TwoTargetPreference.

Fixes: 124084391

Test: Visual
Change-Id: I417a8e442bd80c51be04e3f33514a6605c9b45f8
parent 68c7aad7

res/layout/preference_single_target.xml

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

<!--

  Copyright (C) 2019 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_two_target.xml with Material ripple moved to parent for full ripple. -->

<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:attr/selectableItemBackground"

    android:clipToPadding="false">



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:gravity="start|center_vertical"

        android:clipToPadding="false"

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

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



        <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"

            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>



    </LinearLayout>



    <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="64dp"

        android:gravity="center"

        android:orientation="vertical" />



</LinearLayout>

src/com/android/settings/widget/SingleTargetGearPreference.java

+26 −10
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ package com.android.settings.widget; 


import android.content.Context;

import android.util.AttributeSet;

import android.view.View;



import androidx.core.content.res.TypedArrayUtils;

import androidx.preference.Preference;

import androidx.preference.PreferenceViewHolder;



import com.android.settings.R;
@@ -28,23 +29,38 @@ import com.android.settings.R; 
 * A preference with single target and a gear icon on the side.

 */

public class SingleTargetGearPreference extends Preference {



    public SingleTargetGearPreference(Context context, AttributeSet attrs,

            int defStyleAttr, int defStyleRes) {

    public SingleTargetGearPreference(Context context, AttributeSet attrs, int defStyleAttr,

            int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);

        setWidgetLayoutResource(R.layout.preference_widget_gear_no_bg);

        init();

    }



    public SingleTargetGearPreference(Context context, AttributeSet attrs, int defStyleAttr) {

        this(context, attrs, defStyleAttr, 0 /* defStyleRes */);

        super(context, attrs, defStyleAttr);

        init();

    }



    public SingleTargetGearPreference(Context context, AttributeSet attrs) {

        this(context, attrs, TypedArrayUtils.getAttr(context, R.attr.preferenceStyle,

                android.R.attr.preferenceStyle));

        super(context, attrs);

        init();

    }



    public SingleTargetGearPreference(Context context) {

        this(context, null /* attrs */);

        super(context);

        init();

    }



    private void init() {

        setLayoutResource(R.layout.preference_single_target);

        setWidgetLayoutResource(R.layout.preference_widget_gear_optional_background);

    }



    @Override

    public void onBindViewHolder(PreferenceViewHolder holder) {

        super.onBindViewHolder(holder);

        final View divider = holder.findViewById(com.android.settingslib.R.id.two_target_divider);

        if (divider != null) {

            divider.setVisibility(View.INVISIBLE);

        }

    }

}