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

Merge "Fix the problem that when the MainSwitchPreference is gone, there will be a blank area." into sc-dev am: 371f699681

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

Change-Id: I0c6616ba04ce29e43a7040f56851aa084bc17ac5
This commit is contained in:
Stanley Wang
2021-07-02 13:03:08 +00:00
committed by Automerger Merge Worker
parent 4284058c7c 371f699681
commit 1db13f7a60
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,6 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
private SettingsMainSwitchBar mMainSwitchBar; private SettingsMainSwitchBar mMainSwitchBar;
private CharSequence mTitle; private CharSequence mTitle;
private boolean mIsVisible;
private EnforcedAdmin mEnforcedAdmin; private EnforcedAdmin mEnforcedAdmin;
private RestrictedPreferenceHelper mRestrictedHelper; private RestrictedPreferenceHelper mRestrictedHelper;
@@ -87,7 +86,7 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
} }
mMainSwitchBar = (SettingsMainSwitchBar) holder.findViewById(R.id.main_switch_bar); mMainSwitchBar = (SettingsMainSwitchBar) holder.findViewById(R.id.main_switch_bar);
initMainSwitchBar(); initMainSwitchBar();
if (mIsVisible) { if (isVisible()) {
mMainSwitchBar.show(); mMainSwitchBar.show();
if (mMainSwitchBar.isChecked() != isChecked()) { if (mMainSwitchBar.isChecked() != isChecked()) {
setChecked(isChecked()); setChecked(isChecked());
@@ -101,7 +100,6 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
private void init(Context context, AttributeSet attrs) { private void init(Context context, AttributeSet attrs) {
setLayoutResource(R.layout.preference_widget_main_switch); setLayoutResource(R.layout.preference_widget_main_switch);
mSwitchChangeListeners.add(this); mSwitchChangeListeners.add(this);
mIsVisible = true;
if (attrs != null) { if (attrs != null) {
final TypedArray a = context.obtainStyledAttributes(attrs, final TypedArray a = context.obtainStyledAttributes(attrs,
@@ -151,7 +149,7 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
* Show the MainSwitchBar * Show the MainSwitchBar
*/ */
public void show() { public void show() {
mIsVisible = true; setVisible(true);
if (mMainSwitchBar != null) { if (mMainSwitchBar != null) {
mMainSwitchBar.show(); mMainSwitchBar.show();
} }
@@ -161,7 +159,7 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
* Hide the MainSwitchBar * Hide the MainSwitchBar
*/ */
public void hide() { public void hide() {
mIsVisible = false; setVisible(false);
if (mMainSwitchBar != null) { if (mMainSwitchBar != null) {
mMainSwitchBar.hide(); mMainSwitchBar.hide();
} }

2
tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java
View File

@@ -76,6 +76,7 @@ public class SettingsMainSwitchPreferenceTest {
mPreference.onBindViewHolder(mHolder); mPreference.onBindViewHolder(mHolder);
assertThat(mPreference.isShowing()).isTrue(); assertThat(mPreference.isShowing()).isTrue();
assertThat(mPreference.isVisible()).isTrue();
} }
@Test @Test
@@ -85,5 +86,6 @@ public class SettingsMainSwitchPreferenceTest {
mPreference.onBindViewHolder(mHolder); mPreference.onBindViewHolder(mHolder);
assertThat(mPreference.isShowing()).isFalse(); assertThat(mPreference.isShowing()).isFalse();
assertThat(mPreference.isVisible()).isFalse();
} }
} }