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

Commit 26c3c3a9 authored by PETER LIANG's avatar PETER LIANG Committed by Automerger Merge Worker
Browse files

Merge "Fix the inconsistent alignment of the main switch preference." into... 

Merge "Fix the inconsistent alignment of the main switch preference." into tm-qpr-dev am: aea8f1ae

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19358210



Change-Id: I38ed641d9b1df23306f2d1e78b705d02592f34b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a851cb82 aea8f1ae

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

+0 −2
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ public class ToggleScreenReaderPreferenceFragmentForSetupWizard 
        if (mTopIntroPreference != null) {

            mTopIntroPreference.setVisible(false);

        }



        mToggleServiceSwitchPreference.applyPartnerCustomizationPaddingStyle();

    }



    @Override

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

+0 −18
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.content.Context; 
import android.content.res.TypedArray;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.view.ViewGroup;

import android.widget.Switch;



import androidx.core.content.res.TypedArrayUtils;
@@ -35,8 +34,6 @@ import com.android.settingslib.RestrictedPreferenceHelper; 
import com.android.settingslib.core.instrumentation.SettingsJankMonitor;

import com.android.settingslib.widget.OnMainSwitchChangeListener;



import com.google.android.setupdesign.util.LayoutStyler;



import java.util.ArrayList;

import java.util.List;
@@ -52,7 +49,6 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements 
            new ArrayList<>();

    private final List<OnMainSwitchChangeListener> mSwitchChangeListeners = new ArrayList<>();



    private boolean mApplyPartnerCustomizationPaddingStyle;

    private SettingsMainSwitchBar mMainSwitchBar;

    private CharSequence mTitle;

    private EnforcedAdmin mEnforcedAdmin;
@@ -100,12 +96,6 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements 
        } else {

            mMainSwitchBar.hide();

        }



        if (mApplyPartnerCustomizationPaddingStyle) {

            // TODO(b/232494666): Replace all margins of the root view with the padding

            final ViewGroup parentView = (ViewGroup) mMainSwitchBar.getParent();

            LayoutStyler.applyPartnerCustomizationLayoutPaddingStyle(parentView);

        }

    }



    private void init(Context context, AttributeSet attrs) {
@@ -253,14 +243,6 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements 
        }

    }



    /**

     * Apples the padding style of the partner's customization. It's used in the SetupWizard.

     */

    public void applyPartnerCustomizationPaddingStyle() {

        mApplyPartnerCustomizationPaddingStyle = true;

        notifyChanged();

    }



    private void initMainSwitchBar() {

        if (mMainSwitchBar != null) {

            mMainSwitchBar.setTitle(mTitle);