PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Iaa9faf78d8fd4813e9725f246745744e98d0c325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
PETER LIANG
2022-07-25 12:44:12 +00:00
committed by Automerger Merge Worker
parent 873a47576d 26c3c3a95c
commit e000f54431
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
View File

@@ -49,8 +49,6 @@ public class ToggleScreenReaderPreferenceFragmentForSetupWizard
if (mTopIntroPreference != null) { if (mTopIntroPreference != null) {
mTopIntroPreference.setVisible(false); mTopIntroPreference.setVisible(false);
} }
mToggleServiceSwitchPreference.applyPartnerCustomizationPaddingStyle();
} }
@Override @Override

18
src/com/android/settings/widget/SettingsMainSwitchPreference.java
View File

@@ -22,7 +22,6 @@ import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.ViewGroup;
import android.widget.Switch; import android.widget.Switch;
import androidx.core.content.res.TypedArrayUtils; 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.core.instrumentation.SettingsJankMonitor;
import com.android.settingslib.widget.OnMainSwitchChangeListener; import com.android.settingslib.widget.OnMainSwitchChangeListener;
import com.google.android.setupdesign.util.LayoutStyler;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -52,7 +49,6 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
new ArrayList<>(); new ArrayList<>();
private final List<OnMainSwitchChangeListener> mSwitchChangeListeners = new ArrayList<>(); private final List<OnMainSwitchChangeListener> mSwitchChangeListeners = new ArrayList<>();
private boolean mApplyPartnerCustomizationPaddingStyle;
private SettingsMainSwitchBar mMainSwitchBar; private SettingsMainSwitchBar mMainSwitchBar;
private CharSequence mTitle; private CharSequence mTitle;
private EnforcedAdmin mEnforcedAdmin; private EnforcedAdmin mEnforcedAdmin;
@@ -100,12 +96,6 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
} else { } else {
mMainSwitchBar.hide(); 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) { 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() { private void initMainSwitchBar() {
if (mMainSwitchBar != null) { if (mMainSwitchBar != null) {
mMainSwitchBar.setTitle(mTitle); mMainSwitchBar.setTitle(mTitle);