summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/TestingSettings.java
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2016-06-06 16:01:58 -0400
committerJason Monk <jmonk@google.com>2016-06-08 09:48:58 -0400
commitb7e4380cd27ffd8a060ecb61201057fb6843e408 (patch)
treebfb199e650b8ba1ba9d5643a98d8d37b11b5ed13 /src/com/android/settings/TestingSettings.java
parentf8c64089b10acf0e43bb74c176379aa6ce1756e5 (diff)
downloadpackages_apps_Settings-b7e4380cd27ffd8a060ecb61201057fb6843e408.tar.gz
packages_apps_Settings-b7e4380cd27ffd8a060ecb61201057fb6843e408.tar.bz2
packages_apps_Settings-b7e4380cd27ffd8a060ecb61201057fb6843e408.zip
Remove PreferenceActivity
Its broken and isn't worth maintaining, instead port the few things using it over to SettingsPreferenceActivity with wrapping blank Activities like the rest of Settings. Change-Id: Ic82f0dcb63ed9b4078f7da6a79c0c52f0130e8d1 Fixes: 28779941
Diffstat (limited to 'src/com/android/settings/TestingSettings.java')
-rw-r--r--src/com/android/settings/TestingSettings.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/settings/TestingSettings.java b/src/com/android/settings/TestingSettings.java
index 7a6f252f77..264db52bf8 100644
--- a/src/com/android/settings/TestingSettings.java
+++ b/src/com/android/settings/TestingSettings.java
@@ -20,15 +20,17 @@ import android.os.Bundle;
import android.os.UserManager;
import android.support.v7.preference.PreferenceScreen;
-public class TestingSettings extends PreferenceActivity {
+import com.android.internal.logging.MetricsProto.MetricsEvent;
+
+public class TestingSettings extends SettingsPreferenceFragment {
@Override
- protected void onCreate(Bundle savedInstanceState) {
+ public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.testing_settings);
- final UserManager um = UserManager.get(this);
+ final UserManager um = UserManager.get(getContext());
if (!um.isAdminUser()) {
PreferenceScreen preferenceScreen = (PreferenceScreen)
findPreference("radio_info_settings");
@@ -36,4 +38,8 @@ public class TestingSettings extends PreferenceActivity {
}
}
+ @Override
+ protected int getMetricsCategory() {
+ return MetricsEvent.TESTING;
+ }
}