Switch fragments to SettingsPreferenceFragment
So all basic settings features are supported properly
Change-Id: I1702272cdbc6c13a5d3ca53840113169a37d4d20
Fixes: 28634520
diff --git a/src/com/android/settings/applications/ConfirmConvertToFbe.java b/src/com/android/settings/applications/ConfirmConvertToFbe.java
index 3687c05..76dcabc 100644
--- a/src/com/android/settings/applications/ConfirmConvertToFbe.java
+++ b/src/com/android/settings/applications/ConfirmConvertToFbe.java
@@ -23,9 +23,11 @@
import android.view.ViewGroup;
import android.widget.Button;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
-public class ConfirmConvertToFbe extends Fragment {
+public class ConfirmConvertToFbe extends SettingsPreferenceFragment {
static final String TAG = "ConfirmConvertToFBE";
@Override
@@ -45,4 +47,9 @@
return rootView;
}
+
+ @Override
+ protected int getMetricsCategory() {
+ return MetricsEvent.CONVERT_FBE_CONFIRM;
+ }
}
diff --git a/src/com/android/settings/applications/ConvertToFbe.java b/src/com/android/settings/applications/ConvertToFbe.java
index f32c52b..c1e6576 100644
--- a/src/com/android/settings/applications/ConvertToFbe.java
+++ b/src/com/android/settings/applications/ConvertToFbe.java
@@ -16,27 +16,24 @@
package com.android.settings.applications;
import android.app.Activity;
-import android.app.Fragment;
-import android.content.res.Resources;
import android.content.Intent;
+import android.content.res.Resources;
import android.os.Bundle;
-import android.os.RecoverySystem;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
-import com.android.settings.applications.ConfirmConvertToFbe;
+import com.android.internal.logging.MetricsProto;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.ChooseLockSettingsHelper;
-import com.android.settings.SettingsActivity;
import com.android.settings.R;
-
-import java.io.IOException;
+import com.android.settings.SettingsActivity;
+import com.android.settings.SettingsPreferenceFragment;
/* Class to prompt for conversion of userdata to file based encryption
*/
-public class ConvertToFbe extends Fragment {
+public class ConvertToFbe extends SettingsPreferenceFragment {
static final String TAG = "ConvertToFBE";
static final String CONVERT_FBE_EXTRA = "ConvertFBE";
private static final int KEYGUARD_REQUEST = 55;
@@ -85,4 +82,9 @@
sa.startPreferencePanel(ConfirmConvertToFbe.class.getName(), null,
R.string.convert_to_file_encryption, null, null, 0);
}
+
+ @Override
+ protected int getMetricsCategory() {
+ return MetricsEvent.CONVERT_FBE;
+ }
}
diff --git a/src/com/android/settings/applications/RunningServices.java b/src/com/android/settings/applications/RunningServices.java
index 1841f13..f50f3ad 100644
--- a/src/com/android/settings/applications/RunningServices.java
+++ b/src/com/android/settings/applications/RunningServices.java
@@ -24,10 +24,12 @@
import android.view.View;
import android.view.ViewGroup;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
-public class RunningServices extends Fragment {
+public class RunningServices extends SettingsPreferenceFragment {
private static final int SHOW_RUNNING_SERVICES = 1;
private static final int SHOW_BACKGROUND_PROCESSES = 2;
@@ -105,6 +107,11 @@
mOptionsMenu.findItem(SHOW_BACKGROUND_PROCESSES).setVisible(!showingBackground);
}
+ @Override
+ protected int getMetricsCategory() {
+ return MetricsEvent.RUNNING_SERVICES;
+ }
+
private final Runnable mRunningProcessesAvail = new Runnable() {
@Override
public void run() {