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

Commit 13b0088e authored by David Liu's avatar David Liu
Browse files

Use an interface OnScreenWidgetMixin to add extra padding to FootPreference,... 

Use an interface OnScreenWidgetMixin to add extra padding to FootPreference, IntroPreference, and TopIntroPreference

The padding of FooterPreference, IntroPreference, and TopIntroPreference are not enough, so we need to add extra padding for them. We can achieve this by adding interface OnScreenWidgetMixin and letting SettingsPreferenceGroupAdapter to add extra padding to the widgets that implement this interface.

Bug: 409555871
Test: Manually Test the widget paddings are correct
Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled
Change-Id: I41ef7a585779098f10f0a83a6e7c0f6a916fac96
parent 96fc6028

packages/SettingsLib/FooterPreference/src/com/android/settingslib/widget/FooterPreference.java

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ import java.net.URISyntaxException; 
 * A custom preference acting as "footer" of a page. It has a field for icon and text. It is added

 * to screen as the last preference.

 */

public class FooterPreference extends Preference implements GroupSectionDividerMixin {

public class FooterPreference extends Preference

        implements GroupSectionDividerMixin, OnScreenWidgetMixin {

    private static final String TAG = "FooterPreference";



    public static final String KEY_FOOTER = "footer_preference";

packages/SettingsLib/IntroPreference/src/com/android/settingslib/widget/IntroPreference.kt

+4 −2
Original line number Diff line number Diff line
@@ -31,7 +31,9 @@ constructor( 
    attrs: AttributeSet? = null,

    defStyleAttr: Int = 0,

    defStyleRes: Int = 0,

) : Preference(context, attrs, defStyleAttr, defStyleRes), GroupSectionDividerMixin {

) : Preference(context, attrs, defStyleAttr, defStyleRes),

    GroupSectionDividerMixin,

    OnScreenWidgetMixin {



    private var isCollapsable: Boolean = true

    private var minLines: Int = DEFAULT_MIN_LINES
@@ -53,7 +55,7 @@ constructor( 
            setCollapsable(isCollapsable)

            setMinLines(minLines)

            visibility = if (summary.isNullOrEmpty()) View.GONE else View.VISIBLE

            setText(summary.toString())

            summary?.let { setText(summary.toString()) }

            if (hyperlinkListener != null) {

                setHyperlinkListener(hyperlinkListener)

            }

packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/OnScreenWidgetMixin.kt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 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.settingslib.widget



/**

 * A base interface to indicate that a widget is placed onto the screen.

 *

 * Widget implements this interface will be treated as on-screen widget and applied proper padding.

 */

interface OnScreenWidgetMixin

packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsPreferenceGroupAdapter.kt

+6 −0
Original line number Diff line number Diff line
@@ -199,6 +199,12 @@ open class SettingsPreferenceGroupAdapter(preferenceGroup: PreferenceGroup) : 
        return when {

            // This item handles edge to edge itself

            item is NormalPaddingMixin && item is GroupSectionDividerMixin -> 0 to 0

            // Item is placed directly on screen needs to have extra padding

            item is OnScreenWidgetMixin -> {

                val extraPadding = item.context.resources.getDimensionPixelSize(

                    R.dimen.settingslib_expressive_space_extrasmall4)

                mNormalPaddingStart + extraPadding to mNormalPaddingEnd + extraPadding

            }



            // According to mappingPreferenceGroup(), backgroundRes == 0 means this item is

            // GroupSectionDividerMixin or PreferenceCategory, which is design to have normal

packages/SettingsLib/TopIntroPreference/src/com/android/settingslib/widget/TopIntroPreference.kt

+3 −1
Original line number Diff line number Diff line
@@ -31,7 +31,9 @@ constructor( 
    attrs: AttributeSet? = null,

    defStyleAttr: Int = 0,

    defStyleRes: Int = 0,

) : Preference(context, attrs, defStyleAttr, defStyleRes), GroupSectionDividerMixin {

) : Preference(context, attrs, defStyleAttr, defStyleRes),

    GroupSectionDividerMixin,

    OnScreenWidgetMixin {



    private var isCollapsable: Boolean = false

    private var minLines: Int = 2