diff options
| author | Maurice Lam <yukl@google.com> | 2017-04-28 16:18:47 -0700 |
|---|---|---|
| committer | Maurice Lam <yukl@google.com> | 2017-05-12 15:35:20 -0700 |
| commit | 2eb170cd6ff43db01dc0ff3c1fcac5ebba4489de (patch) | |
| tree | 6dc871a5692bdb9ee99bfa79befed631933ffc0a /src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java | |
| parent | 1949776c599ffa4653b055571f57b06e84dd5ed4 (diff) | |
| download | packages_apps_Settings-2eb170cd6ff43db01dc0ff3c1fcac5ebba4489de.tar.gz packages_apps_Settings-2eb170cd6ff43db01dc0ff3c1fcac5ebba4489de.tar.bz2 packages_apps_Settings-2eb170cd6ff43db01dc0ff3c1fcac5ebba4489de.zip | |
Clean up choose lock intent creation
Consolidated the many variants of ChooseLock*.createIntent, so that
it will take the same set of arguments.
Also modified SetupChooseLock*.createIntent to modifyIntentForSetup,
which will take the intent created by ChooseLock* and modify it for
use with setup.
Test: cd tests/robotests && mma
Change-Id: I5ff033f459c33ec9980872a536b3996d89f2bbbb
Diffstat (limited to 'src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java index 5a1835df68..92328386c5 100644 --- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java @@ -30,7 +30,6 @@ import android.util.Pair; import android.widget.Toast; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.PreferenceController; @@ -38,6 +37,7 @@ import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.development.DevelopmentSettings; import com.android.settings.development.DevelopmentSettingsEnabler; import com.android.settings.overlay.FeatureFactory; +import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; |