Merge changes from topics "RefactorDevControllers", "MoveDevOptionPrefCtrl" (a08d7489) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java

+11 −7

Original line number	Diff line number	Diff line
		@@ -28,17 +28,20 @@ import android.support.v7.preference.PreferenceScreen;
		import android.support.v7.preference.TwoStatePreference;
		import android.text.TextUtils;

		import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.core.ConfirmationDialogController;

		public abstract class AbstractEnableAdbPreferenceController extends AbstractPreferenceController
		implements ConfirmationDialogController {
		public abstract class AbstractEnableAdbPreferenceController extends
		DeveloperOptionsPreferenceController implements ConfirmationDialogController {
		private static final String KEY_ENABLE_ADB = "enable_adb";
		public static final String ACTION_ENABLE_ADB_STATE_CHANGED =
		"com.android.settingslib.development.AbstractEnableAdbController."
		+ "ENABLE_ADB_STATE_CHANGED";

		private SwitchPreference mPreference;
		public static final int ADB_SETTING_ON = 1;
		public static final int ADB_SETTING_OFF = 0;


		protected SwitchPreference mPreference;

		public AbstractEnableAdbPreferenceController(Context context) {
		super(context);
		@@ -64,7 +67,8 @@ public abstract class AbstractEnableAdbPreferenceController extends AbstractPref

		private boolean isAdbEnabled() {
		final ContentResolver cr = mContext.getContentResolver();
		return Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED, 0) != 0;
		return Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED, ADB_SETTING_OFF)
		!= ADB_SETTING_OFF;
		}

		@Override
		@@ -105,7 +109,7 @@ public abstract class AbstractEnableAdbPreferenceController extends AbstractPref

		protected void writeAdbSetting(boolean enabled) {
		Settings.Global.putInt(mContext.getContentResolver(),
		Settings.Global.ADB_ENABLED, enabled ? 1 : 0);
		Settings.Global.ADB_ENABLED, enabled ? ADB_SETTING_ON : ADB_SETTING_OFF);
		notifyStateChanged();
		}

packages/SettingsLib/src/com/android/settingslib/development/AbstractLogdSizePreferenceController.java

+2 −8

Original line number	Diff line number	Diff line
		@@ -26,10 +26,9 @@ import android.support.v7.preference.Preference;
		import android.support.v7.preference.PreferenceScreen;

		import com.android.settingslib.R;
		import com.android.settingslib.core.AbstractPreferenceController;

		public abstract class AbstractLogdSizePreferenceController extends AbstractPreferenceController
		implements Preference.OnPreferenceChangeListener {
		public abstract class AbstractLogdSizePreferenceController extends
		DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
		public static final String ACTION_LOGD_SIZE_UPDATED = "com.android.settingslib.development."
		+ "AbstractLogdSizePreferenceController.LOGD_SIZE_UPDATED";
		public static final String EXTRA_CURRENT_LOGD_VALUE = "CURRENT_LOGD_VALUE";
		@@ -56,11 +55,6 @@ public abstract class AbstractLogdSizePreferenceController extends AbstractPrefe
		super(context);
		}

		@Override
		public boolean isAvailable() {
		return true;
		}

		@Override
		public String getPreferenceKey() {
		return SELECT_LOGD_SIZE_KEY;

packages/SettingsLib/src/com/android/settingslib/development/AbstractLogpersistPreferenceController.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -30,16 +30,15 @@ import android.support.v7.preference.PreferenceScreen;
		import android.text.TextUtils;

		import com.android.settingslib.R;
		import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.core.ConfirmationDialogController;
		import com.android.settingslib.core.lifecycle.Lifecycle;
		import com.android.settingslib.core.lifecycle.LifecycleObserver;
		import com.android.settingslib.core.lifecycle.events.OnCreate;
		import com.android.settingslib.core.lifecycle.events.OnDestroy;

		public abstract class AbstractLogpersistPreferenceController extends AbstractPreferenceController
		implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnCreate, OnDestroy,
		ConfirmationDialogController {
		public abstract class AbstractLogpersistPreferenceController extends
		DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
		LifecycleObserver, OnCreate, OnDestroy, ConfirmationDialogController {

		private static final String SELECT_LOGPERSIST_KEY = "select_logpersist";
		private static final String SELECT_LOGPERSIST_PROPERTY = "persist.logd.logpersistd";

packages/SettingsLib/src/com/android/settingslib/development/DeveloperOptionsPreferenceController.java

0 → 100644

+76 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settingslib.development;

		import android.content.Context;

		import com.android.settingslib.core.AbstractPreferenceController;

		/**
		* This controller is used handle changes for the master switch in the developer options page.
		*
		* All Preference Controllers that are a part of the developer options page should inherit this
		* class.
		*/
		public abstract class DeveloperOptionsPreferenceController extends
		AbstractPreferenceController {

		public DeveloperOptionsPreferenceController(Context context) {
		super(context);
		}

		/**
		* Child classes should override this method to create custom logic for hiding preferences.
		*
		* @return true if the preference is to be displayed.
		*/
		@Override
		public boolean isAvailable() {
		return true;
		}

		/**
		* Called when developer options is enabled
		*/
		public void onDeveloperOptionsEnabled() {
		if (isAvailable()) {
		onDeveloperOptionsSwitchEnabled();
		}
		}

		/**
		* Called when developer options is disabled
		*/
		public void onDeveloperOptionsDisabled() {
		if (isAvailable()) {
		onDeveloperOptionsSwitchDisabled();
		}
		}

		/**
		* Called when developer options is enabled and the preference is available
		*/
		protected void onDeveloperOptionsSwitchEnabled() {
		}

		/**
		* Called when developer options is disabled and the preference is available
		*/
		protected void onDeveloperOptionsSwitchDisabled() {
		}

		}