commit cab0ee611d375d70a3803d857e62c745ccd98de2
author Leif Wilden <leifhendrik@google.com> Mon Jan 22 20:22:02 2018 +0000
committer Leif Wilden <leifhendrik@google.com> Mon Jan 22 20:57:36 2018 +0000
tree cb39d6c3c102c284c4abc29e4f8241a43bb118b3
parent 1546cca529bf56430332e15b05ceb6efb37e57bf

Revert "Migrate to use instrumentation classes from settingslib."

This reverts commit 1546cca529bf56430332e15b05ceb6efb37e57bf.

Reason for revert: Broke fingerprint setup flow. b/72267201

Change-Id: I8321265ae64732c526325882ddea51080decddf5

src/com/android/settings/SettingsPreferenceFragment.java

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index c5d477a..d9e264b 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -45,6 +45,7 @@
 
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.InstrumentedPreferenceFragment;
+import com.android.settings.core.instrumentation.Instrumentable;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.search.actionbar.SearchMenuController;
 import com.android.settings.support.actionbar.HelpMenuController;
@@ -52,7 +53,6 @@
 import com.android.settings.widget.LoadingViewController;
 import com.android.settingslib.CustomDialogPreference;
 import com.android.settingslib.CustomEditTextPreference;
-import com.android.settingslib.core.instrumentation.Instrumentable;
 import com.android.settingslib.widget.FooterPreferenceMixin;
 
 import java.util.UUID;