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

Commit f20a6d0e authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Migrate SyncStateSwitchPreference to SwitchPreferenceCompat" into main

parents 0eca0104 b547927d

res/layout/preference_widget_sync_toggle.xml

+1 −7
Original line number Diff line number Diff line
@@ -38,11 +38,5 @@ 
        android:layout_marginEnd="8dip"

        android:contentDescription="@string/sync_active" />



    <Switch

        android:id="@android:id/switch_widget"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:focusable="false"

        android:clickable="false" />

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

</LinearLayout>

res/values/styles_preference.xml

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
        <item name="iconSpaceReserved">@bool/settingslib_config_icon_space_reserved</item>

    </style>



    <style name="SyncSwitchPreference" parent="@style/SettingsSwitchPreference.SettingsLib">

    <style name="SyncSwitchPreference" parent="@style/SettingsSwitchPreferenceCompat.SettingsLib">

        <item name="android:widgetLayout">@layout/preference_widget_sync_toggle</item>

    </style>

src/com/android/settings/accounts/SyncStateSwitchPreference.java

+3 −3
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ import android.view.View; 
import android.widget.TextView;



import androidx.preference.PreferenceViewHolder;

import androidx.preference.SwitchPreference;

import androidx.preference.SwitchPreferenceCompat;



import com.android.settings.R;

import com.android.settingslib.widget.AnimatedImageView;



public class SyncStateSwitchPreference extends SwitchPreference {

public class SyncStateSwitchPreference extends SwitchPreferenceCompat {



    private boolean mIsActive = false;

    private boolean mIsPending = false;
@@ -84,7 +84,7 @@ public class SyncStateSwitchPreference extends SwitchPreference { 
        final boolean failedVisible = mFailed && !activeVisible;

        syncFailedView.setVisibility(failedVisible ? View.VISIBLE : View.GONE);



        View switchView = view.findViewById(com.android.internal.R.id.switch_widget);

        View switchView = view.findViewById(androidx.preference.R.id.switchWidget);

        if (mOneTimeSyncMode) {

            switchView.setVisibility(View.GONE);

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

+4 −4
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ import android.util.AttributeSet; 
import android.view.View;



import androidx.preference.PreferenceViewHolder;

import androidx.preference.SwitchPreference;

import androidx.preference.SwitchPreferenceCompat;



/**

 *  This widget with enabled filterTouchesWhenObscured attribute use to replace

 *  the {@link SwitchPreference} in the Special access app pages for security.

 *  the {@link SwitchPreferenceCompat} in the Special access app pages for security.

 */

public class FilterTouchesSwitchPreference extends SwitchPreference {

public class FilterTouchesSwitchPreference extends SwitchPreferenceCompat {



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

            int defStyleRes) {
@@ -48,7 +48,7 @@ public class FilterTouchesSwitchPreference extends SwitchPreference { 
    @Override

    public void onBindViewHolder(PreferenceViewHolder holder) {

        super.onBindViewHolder(holder);

        final View switchView = holder.findViewById(android.R.id.switch_widget);

        final View switchView = holder.findViewById(androidx.preference.R.id.switchWidget);

        if (switchView != null) {

            final View rootView = switchView.getRootView();

            rootView.setFilterTouchesWhenObscured(true);