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

Commit 32bea1eb authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "[Expressive design] update RestrictedSwitchPreference" into main

parents 1c6377e7 b6cdd673

packages/SettingsLib/res/layout/restricted_switch_preference_expressive.xml

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

<!-- Copyright (C) 2016 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="@dimen/settingslib_expressive_space_large3"

    android:gravity="center_vertical"

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

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

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

    android:clipToPadding="false"

    android:baselineAligned="false"

    android:filterTouchesWhenObscured="false">



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



    <RelativeLayout

        android:layout_width="@dimen/settingslib_expressive_space_none"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:paddingVertical="@dimen/settingslib_expressive_space_small1"

        android:paddingStart="@dimen/settingslib_expressive_space_none"

        android:paddingEnd="@dimen/settingslib_expressive_space_small1"

        android:filterTouchesWhenObscured="false">



        <TextView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="start"

            android:textAlignment="viewStart"

            android:maxLines="2"

            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:layout_gravity="start"

            android:textAlignment="viewStart"

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

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

            android:maxLines="10" />



        <TextView

            android:id="@+id/additional_summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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

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

            android:layout_gravity="start"

            android:textAlignment="viewStart"

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

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

            android:maxLines="10"

            android:visibility="gone" />

    </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="end|center_vertical"

        android:paddingStart="@dimen/settingslib_expressive_space_small1"

        android:orientation="vertical" />



</LinearLayout>

packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -42,6 +42,8 @@ import androidx.preference.PreferenceManager; 
import androidx.preference.PreferenceViewHolder;

import androidx.preference.PreferenceViewHolder;

import androidx.preference.SwitchPreferenceCompat;

import androidx.preference.SwitchPreferenceCompat;





import com.android.settingslib.widget.SettingsThemeHelper;



/**

/**

 * Version of SwitchPreferenceCompat that can be disabled by a device admin

 * Version of SwitchPreferenceCompat that can be disabled by a device admin

 * using a user restriction.

 * using a user restriction.
@@ -83,7 +85,10 @@ public class RestrictedSwitchPreference extends SwitchPreferenceCompat implement 
            }

            }

        }

        }

        if (mUseAdditionalSummary) {

        if (mUseAdditionalSummary) {

            setLayoutResource(R.layout.restricted_switch_preference);

            int resId = SettingsThemeHelper.isExpressiveTheme(context)

                    ? R.layout.restricted_switch_preference_expressive

                    : R.layout.restricted_switch_preference;

            setLayoutResource(resId);

            useAdminDisabledSummary(false);

            useAdminDisabledSummary(false);

        }

        }

    }

    }