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

Merge "Allow SettingsMainSwitchBars to be disabled" into sc-dev am: 8105206432

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

Change-Id: Id44284ef8988ebd80d3586fde4462aeab3754102
This commit is contained in:
TreeHugger Robot
2021-03-17 02:25:20 +00:00
committed by Automerger Merge Worker
parent 334b01e941 8105206432
commit a371de6413
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/widget/SettingsMainSwitchBar.java
View File

@@ -84,9 +84,8 @@ public class SettingsMainSwitchBar extends MainSwitchBar {
} }
/** /**
* If admin is not null, disables the text and switch but keeps the view clickable. * If admin is not null, disables the text and switch but keeps the view clickable (unless the
* Otherwise, calls setEnabled which will enables the entire view including * switch is disabled for other reasons). Otherwise, calls setEnabled.
* the text and switch.
*/ */
public void setDisabledByAdmin(RestrictedLockUtils.EnforcedAdmin admin) { public void setDisabledByAdmin(RestrictedLockUtils.EnforcedAdmin admin) {
mEnforcedAdmin = admin; mEnforcedAdmin = admin;
@@ -101,7 +100,7 @@ public class SettingsMainSwitchBar extends MainSwitchBar {
mDisabledByAdmin = false; mDisabledByAdmin = false;
mSwitch.setVisibility(View.VISIBLE); mSwitch.setVisibility(View.VISIBLE);
mRestrictedIcon.setVisibility(View.GONE); mRestrictedIcon.setVisibility(View.GONE);
setEnabled(true); setEnabled(isEnabled());
} }
} }

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

@@ -186,6 +186,7 @@ public class SettingsMainSwitchPreference extends TwoStatePreference {
* Enable or disable the text and switch. * Enable or disable the text and switch.
*/ */
public void setSwitchBarEnabled(boolean enabled) { public void setSwitchBarEnabled(boolean enabled) {
setEnabled(enabled);
if (mMainSwitchBar != null) { if (mMainSwitchBar != null) {
mMainSwitchBar.setEnabled(enabled); mMainSwitchBar.setEnabled(enabled);
} }