diff options
| author | jeffreyhuang <jeffreyhuang@google.com> | 2017-10-06 11:37:56 -0700 |
|---|---|---|
| committer | jeffreyhuang <jeffreyhuang@google.com> | 2017-10-09 10:17:44 -0700 |
| commit | 37df3d6d1f3114fbf4906889f9855de2e11990ef (patch) | |
| tree | 9ace56a59c772d8c495ea36903b6204cf7a60c9d /src/com/android/settings/development/OemUnlockPreferenceController.java | |
| parent | aa410eba1d8bba558233677881e7626eb0761065 (diff) | |
| download | packages_apps_Settings-37df3d6d1f3114fbf4906889f9855de2e11990ef.tar.gz packages_apps_Settings-37df3d6d1f3114fbf4906889f9855de2e11990ef.tar.bz2 packages_apps_Settings-37df3d6d1f3114fbf4906889f9855de2e11990ef.zip | |
Move DevOptionsPrefCtrl to SettingsLib
- Move DeveloperOptionsPreferenceController
Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ie434d479d8d3f7527ffce54f241ac2e090e0fc44
Diffstat (limited to 'src/com/android/settings/development/OemUnlockPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/development/OemUnlockPreferenceController.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/development/OemUnlockPreferenceController.java b/src/com/android/settings/development/OemUnlockPreferenceController.java index cb391a8e89..91994c2d64 100644 --- a/src/com/android/settings/development/OemUnlockPreferenceController.java +++ b/src/com/android/settings/development/OemUnlockPreferenceController.java @@ -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"; |