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

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

Clean up ArrowPreference and BackgroundPreference 

Bug: 420391483
Test: rebuild
Flag: EXEMPT clean up
Change-Id: I8689fbd6f0da7cb58ae7f36ce4ffbed57f01668e
parent 6b490c46

res/layout/preference_background.xml

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



<!--

  Copyright (C) 2024 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.

  -->



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

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

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

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

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

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

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

    android:paddingVertical="@dimen/settingslib_switchbar_margin"

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



    <LinearLayout

        android:id="@+id/background"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:paddingStart="@dimen/settingslib_switchbar_padding_left"

        android:paddingEnd="@dimen/settingslib_switchbar_padding_right"

        android:orientation="horizontal"

        android:gravity="start|center_vertical"

        android:baselineAligned="false">



        <FrameLayout

            android:id="@+id/icon_frame"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginEnd="15dip"

            android:layout_marginRight="15dip">

            <androidx.preference.internal.PreferenceImageView

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                app:maxWidth="48dp"

                app:maxHeight="48dp" />

        </FrameLayout>



        <RelativeLayout

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_marginEnd="6dip"

            android:layout_marginRight="6dip"

            android:layout_marginTop="@dimen/settingslib_switch_title_margin"

            android:layout_marginBottom="@dimen/settingslib_switch_title_margin"

            android:layout_weight="1">



            <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:textColor="@androidprv:color/materialColorOnPrimaryContainer"

                android:ellipsize="marquee"

                android:fadingEdge="horizontal"

                android:hyphenationFrequency="normalFast"

                android:lineBreakWordStyle="phrase" />



            <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:layout_alignLeft="@android:id/title"

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

                android:textColor="@androidprv:color/materialColorOnPrimaryContainer"

                android:hyphenationFrequency="normalFast"

                android:lineBreakWordStyle="phrase"

                android:maxLines="4"

                android:scrollbars="none"/>

        </RelativeLayout>



        <!-- 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:gravity="center_vertical"

            android:orientation="vertical" />

    </LinearLayout>



</FrameLayout>
 
 No newline at end of file

res/layout/preference_widget_arrow.xml

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

<!--

    Copyright (C) 2024 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.

-->



<ImageView

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center_vertical"

    android:contentDescription="@null"

    android:scaleType="center"

    android:tint="@androidprv:color/materialColorOnPrimaryContainer"

    android:src="@drawable/ic_arrow_forward" />
 
 No newline at end of file

res/values/attrs.xml

+0 −5
Original line number Diff line number Diff line
@@ -196,9 +196,4 @@ 
    <attr name="notification_importance_button_background_color_selected" format="color" />

    <attr name="notification_importance_button_border_color_selected" format="color" />

    <attr name="notification_importance_button_foreground_color_selected" format="color" />



    <!-- For BackgroundPreference -->

    <declare-styleable name="BackgroundPreference">

        <attr name="background" format="reference" />

    </declare-styleable>

</resources>

src/com/android/settings/accessibility/ArrowPreference.java

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.

 */



package com.android.settings.accessibility;



import android.content.Context;

import android.util.AttributeSet;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.core.content.res.TypedArrayUtils;



import com.android.settings.R;



/**

 * A settings preference with colored rounded rectangle background and an arrow icon on the right.

 */

public class ArrowPreference extends BackgroundPreference {



    public ArrowPreference(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr,

            int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);

        setBackground(

                com.android.settingslib.widget.mainswitch.R.drawable.settingslib_switch_bar_bg_on);

        setWidgetLayoutResource(R.layout.preference_widget_arrow);

    }



    public ArrowPreference(@NonNull Context context, @Nullable AttributeSet attrs,

            int defStyleAttr) {

        this(context, attrs, defStyleAttr, 0);

    }



    public ArrowPreference(@NonNull Context context, @Nullable AttributeSet attrs) {

        this(context, attrs, TypedArrayUtils.getAttr(context,

                androidx.preference.R.attr.preferenceStyle,

                android.R.attr.preferenceStyle));

    }



    public ArrowPreference(@NonNull Context context) {

        this(context, null);

    }

}

src/com/android/settings/accessibility/BackgroundPreference.java

deleted100644 → 0
+0 −93
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 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.

 */



package com.android.settings.accessibility;



import android.content.Context;

import android.content.res.TypedArray;

import android.graphics.drawable.Drawable;

import android.util.AttributeSet;

import android.widget.LinearLayout;



import androidx.annotation.DrawableRes;

import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.core.content.res.TypedArrayUtils;

import androidx.preference.Preference;

import androidx.preference.PreferenceViewHolder;



import com.android.settings.R;



/**

 * A preference with custom background.

 */

public class BackgroundPreference extends Preference {



    private int mBackgroundId;



    public BackgroundPreference(@NonNull Context context,

            @Nullable AttributeSet attrs, int defStyleAttr,

            int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);

        setLayoutResource(R.layout.preference_background);

        setIconSpaceReserved(false);



        final TypedArray styledAttrs = context.obtainStyledAttributes(attrs,

                R.styleable.BackgroundPreference);

        mBackgroundId = styledAttrs.getResourceId(R.styleable.BackgroundPreference_background, 0);

        styledAttrs.recycle();

    }



    public BackgroundPreference(@NonNull Context context, @Nullable AttributeSet attrs,

            int defStyleAttr) {

        this(context, attrs, defStyleAttr, 0);

    }



    public BackgroundPreference(@NonNull Context context, @Nullable AttributeSet attrs) {

        this(context, attrs, TypedArrayUtils.getAttr(context,

                androidx.preference.R.attr.preferenceStyle,

                com.android.internal.R.attr.preferenceStyle), 0);

    }



    public BackgroundPreference(@NonNull Context context) {

        this(context, null, TypedArrayUtils.getAttr(context,

                androidx.preference.R.attr.preferenceStyle,

                com.android.internal.R.attr.preferenceStyle), 0);

    }



    @Override

    public void onBindViewHolder(@NonNull PreferenceViewHolder holder) {

        super.onBindViewHolder(holder);



        final LinearLayout layout = (LinearLayout) holder.findViewById(R.id.background);

        if (mBackgroundId != 0) {

            final Drawable backgroundDrawable = getContext().getDrawable(mBackgroundId);

            layout.setBackground(backgroundDrawable);

        }

    }



    /**

     * Sets the background to a given resource. The resource should refer to a Drawable object.

     *

     * @param resId The identifier of the resource.

     */

    public void setBackground(@DrawableRes int resId) {

        if (mBackgroundId != resId) {

            mBackgroundId = resId;

            notifyChanged();

        }

    }

}