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

Commit 94b4ce52 authored by PETER LIANG's avatar PETER LIANG Committed by Automerger Merge Worker
Browse files

Merge "Fix that once the phone is rotated to portrait orientation, the "Use... 

Merge "Fix that once the phone is rotated to portrait orientation, the "Use TalkBack" toggle is truncated." into tm-dev am: ae1d7d3e

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



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

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

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

            mTopIntroPreference.setVisible(false);

        }



        mToggleServiceSwitchPreference.applyPartnerCustomizationPaddingStyle();

    }



    @Override

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

+18 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 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;
@@ -33,6 +34,8 @@ import com.android.settings.widget.SettingsMainSwitchBar.OnBeforeCheckedChangeLi 
import com.android.settingslib.RestrictedPreferenceHelper;

import com.android.settingslib.widget.OnMainSwitchChangeListener;



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



import java.util.ArrayList;

import java.util.List;
@@ -48,6 +51,7 @@ 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;
@@ -95,6 +99,12 @@ 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) {
@@ -241,6 +251,14 @@ 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);