Merge "Optimize poking to happen in dashboard fragment"

This commit is contained in:
Jeffrey Huang
2017-09-29 16:46:37 +00:00
committed by Android (Google) Code Review

View File

@@ -43,6 +43,7 @@ import com.android.settings.widget.SwitchBar;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.development.SystemPropPoker;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@@ -126,12 +127,16 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
EnableDevelopmentSettingWarningDialog.show(this /* host */); EnableDevelopmentSettingWarningDialog.show(this /* host */);
} else { } else {
DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(getContext(), false); DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(getContext(), false);
final SystemPropPoker poker = SystemPropPoker.getInstance();
poker.blockPokes();
for (AbstractPreferenceController controller : mPreferenceControllers) { for (AbstractPreferenceController controller : mPreferenceControllers) {
if (controller instanceof DeveloperOptionsPreferenceController) { if (controller instanceof DeveloperOptionsPreferenceController) {
((DeveloperOptionsPreferenceController) controller) ((DeveloperOptionsPreferenceController) controller)
.onDeveloperOptionsDisabled(); .onDeveloperOptionsDisabled();
} }
} }
poker.unblockPokes();
poker.poke();
} }
} }
} }