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

Move DevOptionsPrefCtrl to SettingsLib

Browse Source 
- Move DeveloperOptionsPreferenceController

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ie434d479d8d3f7527ffce54f241ac2e090e0fc44
This commit is contained in:
jeffreyhuang
2017-10-06 11:37:56 -07:00
parent aa410eba1d
commit 37df3d6d1f
54 changed files with 237 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/development/AdbPreferenceController.java
View File

@@ -27,8 +27,11 @@ import android.support.v4.content.LocalBroadcastManager;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class AdbPreferenceController extends DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener {
Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
public static final String ADB_STATE_CHANGED =
"com.android.settings.development.AdbPreferenceController.ADB_STATE_CHANGED";

6
src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java
View File

@@ -23,8 +23,12 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class AllowAppsOnExternalPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String FORCE_ALLOW_ON_EXTERNAL_KEY = "force_allow_on_external";

6
src/com/android/settings/development/AppsNotRespondingPreferenceController.java
View File

@@ -22,8 +22,12 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class AppsNotRespondingPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs";

6
src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java
View File

@@ -23,8 +23,12 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class BluetoothAbsoluteVolumePreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_KEY =
"bluetooth_disable_absolute_volume";

6
src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java
View File

@@ -23,8 +23,12 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class BluetoothDeviceNoNamePreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_KEY =
"bluetooth_show_devices_without_names";

6
src/com/android/settings/development/BluetoothInbandRingingPreferenceController.java
View File

@@ -24,8 +24,12 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class BluetoothInbandRingingPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String BLUETOOTH_ENABLE_INBAND_RINGING_KEY =
"bluetooth_enable_inband_ringing";

6
src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java
View File

@@ -23,8 +23,12 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class BluetoothSnoopLogPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String PREFERENCE_KEY = "bt_hci_snoop_log";
@VisibleForTesting

5
src/com/android/settings/development/BugReportInPowerPreferenceControllerV2.java
View File

@@ -26,10 +26,13 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;
public class BugReportInPowerPreferenceControllerV2 extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String KEY_BUGREPORT_IN_POWER = "bugreport_in_power";

6
src/com/android/settings/development/BugReportPreferenceControllerV2.java
View File

@@ -19,7 +19,11 @@ package com.android.settings.development;
import android.content.Context;
import android.os.UserManager;
public class BugReportPreferenceControllerV2 extends DeveloperOptionsPreferenceController {
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class BugReportPreferenceControllerV2 extends DeveloperOptionsPreferenceController implements
PreferenceControllerMixin {
private static final String KEY_BUGREPORT = "bugreport";

4
src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java
View File

@@ -26,10 +26,12 @@ import android.widget.Toast;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class CameraHalHdrPlusPreferenceControllerV2 extends
DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener {
Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String KEY_CAMERA_HAL_HDRPLUS_SWITCH = "camera_hal_hdrplus_switch";
@VisibleForTesting

4
src/com/android/settings/development/CameraLaserSensorPreferenceControllerV2.java
View File

@@ -26,10 +26,12 @@ import android.text.TextUtils;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class CameraLaserSensorPreferenceControllerV2 extends
DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener {
Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String KEY_CAMERA_LASER_SENSOR_SWITCH = "camera_laser_sensor_switch";
@VisibleForTesting

6
src/com/android/settings/development/ClearAdbKeysPreferenceController.java
View File

@@ -28,7 +28,11 @@ import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.Log;
public class ClearAdbKeysPreferenceController extends DeveloperOptionsPreferenceController {
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class ClearAdbKeysPreferenceController extends
DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
private static final String TAG = "ClearAdbPrefCtrl";
private static final String CLEAR_ADB_KEYS = "clear_adb_keys";

5
src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2.java
View File

@@ -26,9 +26,12 @@ import android.widget.Toast;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class ConnectivityMonitorPreferenceControllerV2 extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String KEY_CONNECTIVITY_MONITOR_SWITCH = "connectivity_monitor_switch";
@VisibleForTesting

4
src/com/android/settings/development/CoolColorTemperaturePreferenceController.java
View File

@@ -25,11 +25,13 @@ import android.support.v7.preference.PreferenceScreen;
import android.widget.Toast;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
public class CoolColorTemperaturePreferenceController extends
DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener {
Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String COLOR_TEMPERATURE_KEY = "color_temperature";

6
src/com/android/settings/development/DebugViewAttributesPreferenceController.java
View File

@@ -23,8 +23,12 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class DebugViewAttributesPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String DEBUG_VIEW_ATTRIBUTES_KEY = "debug_view_attributes";

92
src/com/android/settings/development/DeveloperOptionsPreferenceController.java
View File

@@ -1,92 +0,0 @@
/*
* 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.settings.development;
import android.content.Context;
import android.content.Intent;
import com.android.settings.core.PreferenceControllerMixin;
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 implements PreferenceControllerMixin {
public DeveloperOptionsPreferenceController(Context context) {
super(context);
}
/**
* Called when an activity returns to the DeveloperSettingsDashboardFragment.
*
* @param requestCode The integer request code originally supplied to
* startActivityForResult(), allowing you to identify who this
* result came from.
* @param resultCode The integer result code returned by the child activity
* through its setResult().
* @param data An Intent, which can return result data to the caller
* (various data can be attached to Intent "extras").
* @return true if the controller handled the activity result
*/
public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
return false;
}
/**
* 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 abstract void onDeveloperOptionsSwitchEnabled();
/**
* Called when developer options is disabled and the preference is available
*/
protected abstract void onDeveloperOptionsSwitchDisabled();
}

5
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -42,6 +42,7 @@ import com.android.settings.search.Indexable;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.development.SystemPropPoker;
@@ -182,11 +183,11 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
public void onActivityResult(int requestCode, int resultCode, Intent data) {
boolean handledResult = false;
for (AbstractPreferenceController controller : mPreferenceControllers) {
if (controller instanceof DeveloperOptionsPreferenceController) {
if (controller instanceof OnActivityResultListener) {
// We do not break early because it is possible for multiple controllers to
// handle the same result code.
handledResult |=
((DeveloperOptionsPreferenceController) controller).onActivityResult(
((OnActivityResultListener) controller).onActivityResult(
requestCode, resultCode, data);
}
}

5
src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java
View File

@@ -23,9 +23,12 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class DisableAutomaticUpdatesPreferenceController extends
DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener {
Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String OTA_DISABLE_AUTOMATIC_UPDATE_KEY = "ota_disable_automatic_update";

5
src/com/android/settings/development/FileEncryptionPreferenceController.java
View File

@@ -27,8 +27,11 @@ import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class FileEncryptionPreferenceController extends DeveloperOptionsPreferenceController {
public class FileEncryptionPreferenceController extends
DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
private static final String KEY_CONVERT_FBE = "convert_to_file_encryption";
private static final String KEY_STORAGE_MANAGER = "mount";

5
src/com/android/settings/development/ForceGpuRenderingPreferenceController.java
View File

@@ -23,10 +23,13 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
public class ForceGpuRenderingPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui";

4
src/com/android/settings/development/ForceMSAAPreferenceController.java
View File

@@ -23,10 +23,12 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
public class ForceMSAAPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener {
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String FORCE_MSAA_KEY = "force_msaa";

5
src/com/android/settings/development/GpuViewUpdatesPreferenceController.java
View File

@@ -23,10 +23,13 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.view.ThreadedRenderer;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
public class GpuViewUpdatesPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_updates";

5
src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java
View File

@@ -23,10 +23,13 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.view.ThreadedRenderer;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
public class HardwareLayersUpdatesPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_updates";

5
src/com/android/settings/development/HardwareOverlaysPreferenceController.java
View File

@@ -26,8 +26,11 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class HardwareOverlaysPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener {
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String DISABLE_OVERLAYS_KEY = "disable_overlays";

5
src/com/android/settings/development/HdcpCheckingPreferenceController.java
View File

@@ -26,10 +26,13 @@ import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
public class HdcpCheckingPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String HDCP_CHECKING_KEY = "hdcp_checking";

5
src/com/android/settings/development/KeepActivitiesPreferenceController.java
View File

@@ -26,8 +26,11 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class KeepActivitiesPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener {
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY =
"immediately_destroy_activities";

5
src/com/android/settings/development/LocalBackupPasswordPreferenceController.java
View File

@@ -26,8 +26,11 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class LocalBackupPasswordPreferenceController extends DeveloperOptionsPreferenceController {
public class LocalBackupPasswordPreferenceController extends
DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
private static final String LOCAL_BACKUP_PASSWORD = "local_backup_password";

5
src/com/android/settings/development/LocalTerminalPreferenceController.java
View File

@@ -8,10 +8,13 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;
public class LocalTerminalPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String ENABLE_TERMINAL_KEY = "enable_terminal";

6
src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java
View File

@@ -23,8 +23,12 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class MobileDataAlwaysOnPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String MOBILE_DATA_ALWAYS_ON = "mobile_data_always_on";

6
src/com/android/settings/development/MockLocationAppPreferenceController.java
View File

@@ -31,11 +31,15 @@ import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import java.util.List;
public class MockLocationAppPreferenceController extends DeveloperOptionsPreferenceController {
public class MockLocationAppPreferenceController extends
DeveloperOptionsPreferenceController implements PreferenceControllerMixin,
OnActivityResultListener {
private static final String MOCK_LOCATION_APP_KEY = "mock_location_app";
private static final int[] MOCK_LOCATION_APP_OPS = new int[]{AppOpsManager.OP_MOCK_LOCATION};

6
src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java
View File

@@ -24,8 +24,12 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class NotificationChannelWarningsPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String SHOW_NOTIFICATION_CHANNEL_WARNINGS_KEY =
"show_notification_channel_warnings";

4
src/com/android/settings/development/OemUnlockPreferenceController.java
View File

@@ -32,11 +32,13 @@ import android.support.v7.preference.PreferenceScreen;
import android.telephony.TelephonyManager;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener {
Preference.OnPreferenceChangeListener, PreferenceControllerMixin, OnActivityResultListener {
private static final String PREFERENCE_KEY = "oem_unlock_enable";

22
src/com/android/settings/development/OnActivityResultListener.java Normal file
View File

@@ -0,0 +1,22 @@
package com.android.settings.development;
import android.content.Intent;
/**
* Interface for activity result callbacks in the {@link DevelopmentSettingsDashboardFragment}
*/
public interface OnActivityResultListener {
/**
* Called when an activity returns to the {@link DevelopmentSettingsDashboardFragment}.
*
* @param requestCode The integer request code originally supplied to
* startActivityForResult(), allowing you to identify who this
* result came from.
* @param resultCode The integer result code returned by the child activity
* through its setResult().
* @param data An Intent, which can return result data to the caller
* (various data can be attached to Intent "extras").
* @return true if the controller handled the result.
*/
boolean onActivityResult(int requestCode, int resultCode, Intent data);
}

4
src/com/android/settings/development/PictureColorModePreferenceController.java
View File

@@ -20,14 +20,16 @@ import android.content.Context;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class PictureColorModePreferenceController extends
DeveloperOptionsPreferenceController implements
LifecycleObserver, OnResume, OnPause {
LifecycleObserver, OnResume, OnPause, PreferenceControllerMixin {
private static final String KEY_COLOR_MODE = "picture_color_mode";

5
src/com/android/settings/development/PointerLocationPreferenceController.java
View File

@@ -23,8 +23,11 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class PointerLocationPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener {
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String POINTER_LOCATION_KEY = "pointer_location";

6
src/com/android/settings/development/ResizableActivityPreferenceController.java
View File

@@ -23,8 +23,12 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class ResizableActivityPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String FORCE_RESIZABLE_KEY = "force_resizable_activities";

4
src/com/android/settings/development/RtlLayoutPreferenceController.java
View File

@@ -25,9 +25,11 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.app.LocalePicker;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class RtlLayoutPreferenceController extends DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener {
Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String FORCE_RTL_LAYOUT_KEY = "force_rtl_layout_all_locales";

6
src/com/android/settings/development/SelectDebugAppPreferenceController.java
View File

@@ -30,9 +30,13 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;
public class SelectDebugAppPreferenceController extends DeveloperOptionsPreferenceController {
public class SelectDebugAppPreferenceController extends
DeveloperOptionsPreferenceController implements PreferenceControllerMixin,
OnActivityResultListener {
private static final String DEBUG_APP_KEY = "debug_app";

5
src/com/android/settings/development/SelectUsbConfigPreferenceController.java
View File

@@ -29,14 +29,17 @@ import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
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;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class SelectUsbConfigPreferenceController extends
DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener, LifecycleObserver, OnCreate, OnDestroy {
Preference.OnPreferenceChangeListener, LifecycleObserver, OnCreate, OnDestroy,
PreferenceControllerMixin {
private static final String USB_CONFIGURATION_KEY = "select_usb_configuration";

4
src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java
View File

@@ -26,9 +26,11 @@ import android.util.Log;
import android.widget.Toast;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class ShortcutManagerThrottlingPreferenceController extends
DeveloperOptionsPreferenceController {
DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
private static final String TAG = "ShortcutMgrPrefCtrl";

4
src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java
View File

@@ -23,10 +23,12 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.view.View;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
public class ShowLayoutBoundsPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener {
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String DEBUG_LAYOUT_KEY = "debug_layout";

5
src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java
View File

@@ -26,8 +26,11 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class ShowSurfaceUpdatesPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener {
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String SHOW_SCREEN_UPDATES_KEY = "show_screen_updates";

5
src/com/android/settings/development/ShowTapsPreferenceController.java
View File

@@ -23,8 +23,11 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class ShowTapsPreferenceController extends DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener {
Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String SHOW_TOUCHES_KEY = "show_touches";

4
src/com/android/settings/development/StayAwakePreferenceController.java
View File

@@ -27,17 +27,19 @@ import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class StayAwakePreferenceController extends DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener, LifecycleObserver,
OnResume, OnPause {
OnResume, OnPause, PreferenceControllerMixin {
private static final String TAG = "StayAwakeCtrl";
private static final String PREFERENCE_KEY = "keep_screen_on";

6
src/com/android/settings/development/StrictModePreferenceController.java
View File

@@ -25,11 +25,13 @@ import android.support.annotation.VisibleForTesting;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import android.view.IWindowManager;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class StrictModePreferenceController extends DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener {
Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String STRICT_MODE_KEY = "strict_mode";
private static final String WINDOW_MANAGER_KEY = "window";

6
src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java
View File

@@ -23,8 +23,12 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class TetheringHardwareAccelPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String TETHERING_HARDWARE_OFFLOAD = "tethering_hardware_offload";

5
src/com/android/settings/development/UsbAudioRoutingPreferenceController.java
View File

@@ -23,8 +23,11 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class UsbAudioRoutingPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener {
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String USB_AUDIO_KEY = "usb_audio";

4
src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2.java
View File

@@ -26,9 +26,11 @@ import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import java.util.List;
@@ -38,7 +40,7 @@ import java.util.List;
*/
public class VerifyAppsOverUsbPreferenceControllerV2 extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
AdbOnChangeListener {
AdbOnChangeListener, PreferenceControllerMixin {
private static final String VERIFY_APPS_OVER_USB_KEY = "verify_apps_over_usb";
private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";

6
src/com/android/settings/development/WaitForDebuggerPreferenceController.java
View File

@@ -32,8 +32,12 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class WaitForDebuggerPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin, OnActivityResultListener {
private static final String WAIT_FOR_DEBUGGER_KEY = "wait_for_debugger";

5
src/com/android/settings/development/WebViewAppPreferenceControllerV2.java
View File

@@ -27,10 +27,13 @@ import android.util.Log;
import com.android.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppInfo;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.webview.WebViewUpdateServiceWrapper;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;
public class WebViewAppPreferenceControllerV2 extends DeveloperOptionsPreferenceController {
public class WebViewAppPreferenceControllerV2 extends
DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
private static final String TAG = "WebViewAppPrefCtrl";
private static final String WEBVIEW_APP_KEY = "select_webview_provider";

6
src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java
View File

@@ -23,8 +23,12 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class WifiAggressiveHandoverPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String WIFI_AGGRESSIVE_HANDOVER_KEY = "wifi_aggressive_handover";

5
src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java
View File

@@ -23,9 +23,12 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class WifiDisplayCertificationPreferenceController extends
DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener {
Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String WIFI_DISPLAY_CERTIFICATION_KEY = "wifi_display_certification";

6
src/com/android/settings/development/WifiRoamScansPreferenceController.java
View File

@@ -23,8 +23,12 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class WifiRoamScansPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY = "wifi_allow_scan_with_traffic";

6
src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
View File

@@ -23,8 +23,12 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class WifiVerboseLoggingPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String WIFI_VERBOSE_LOGGING_KEY = "wifi_verbose_logging";