PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch fragments to SettingsPreferenceFragment

Browse Source 
So all basic settings features are supported properly

Change-Id: I1702272cdbc6c13a5d3ca53840113169a37d4d20
Fixes: 28634520
This commit is contained in:
Jason Monk
2016-05-10 13:27:20 -04:00
parent ab30931d41
commit 019aad4c61
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/applications/ConfirmConvertToFbe.java
View File

@@ -23,9 +23,11 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R; 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"; static final String TAG = "ConfirmConvertToFBE";
@Override @Override
@@ -45,4 +47,9 @@ public class ConfirmConvertToFbe extends Fragment {
return rootView; return rootView;
} }
@Override
protected int getMetricsCategory() {
return MetricsEvent.CONVERT_FBE_CONFIRM;
}
} }

20
src/com/android/settings/applications/ConvertToFbe.java
View File

@@ -16,27 +16,24 @@
package com.android.settings.applications; package com.android.settings.applications;
import android.app.Activity; import android.app.Activity;
import android.app.Fragment;
import android.content.res.Resources;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.os.RecoverySystem;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; 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.ChooseLockSettingsHelper;
import com.android.settings.SettingsActivity;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsActivity;
import java.io.IOException; import com.android.settings.SettingsPreferenceFragment;
/* Class to prompt for conversion of userdata to file based encryption /* 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 TAG = "ConvertToFBE";
static final String CONVERT_FBE_EXTRA = "ConvertFBE"; static final String CONVERT_FBE_EXTRA = "ConvertFBE";
private static final int KEYGUARD_REQUEST = 55; private static final int KEYGUARD_REQUEST = 55;
@@ -85,4 +82,9 @@ public class ConvertToFbe extends Fragment {
sa.startPreferencePanel(ConfirmConvertToFbe.class.getName(), null, sa.startPreferencePanel(ConfirmConvertToFbe.class.getName(), null,
R.string.convert_to_file_encryption, null, null, 0); R.string.convert_to_file_encryption, null, null, 0);
} }
@Override
protected int getMetricsCategory() {
return MetricsEvent.CONVERT_FBE;
}
} }

9
src/com/android/settings/applications/RunningServices.java
View File

@@ -24,10 +24,12 @@ import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils; 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_RUNNING_SERVICES = 1;
private static final int SHOW_BACKGROUND_PROCESSES = 2; private static final int SHOW_BACKGROUND_PROCESSES = 2;
@@ -105,6 +107,11 @@ public class RunningServices extends Fragment {
mOptionsMenu.findItem(SHOW_BACKGROUND_PROCESSES).setVisible(!showingBackground); mOptionsMenu.findItem(SHOW_BACKGROUND_PROCESSES).setVisible(!showingBackground);
} }
@Override
protected int getMetricsCategory() {
return MetricsEvent.RUNNING_SERVICES;
}
private final Runnable mRunningProcessesAvail = new Runnable() { private final Runnable mRunningProcessesAvail = new Runnable() {
@Override @Override
public void run() { public void run() {