summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/applications/RunningProcessesView.java
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2014-01-17 19:17:58 -0800
committerFabrice Di Meglio <fdimeglio@google.com>2014-02-03 16:36:46 -0800
commit263bcc8b732dbb47d3ce63904e0e05191fabbad6 (patch)
treedc8fd51052ac94e418473d378c1244cb42594665 /src/com/android/settings/applications/RunningProcessesView.java
parentaf79ddb358ff6ed078708ce5995da9ff269f1679 (diff)
downloadpackages_apps_Settings-263bcc8b732dbb47d3ce63904e0e05191fabbad6.tar.gz
packages_apps_Settings-263bcc8b732dbb47d3ce63904e0e05191fabbad6.tar.bz2
packages_apps_Settings-263bcc8b732dbb47d3ce63904e0e05191fabbad6.zip
Use Drawer in Settings app
- get rid of PreferenceActivity as much as we can and use fragments instead - add Drawer widget - add Dashboard high level entry into the Drawer (but this is work in progress and would be done in another CL) - add bypass of fragment's Header validation when launched from the Drawer but *force* validation if external call thru an Intent Be aware that WifiPickerActivity should remain for now a PreferenceActivity. It is used by SetupWizard and should not trigger running the SettingsActivity's header building code. SetupWizard is a Home during the provisionnig process and then deactivate itself as a Home but would make the Home header to appear in the Drawer (because momentarily we would have two Home). Also, verified that: - the WiFi settings still work when called from SetupWizard - when you have multiple Launchers, the Home header will appear in the list of Headers in the Drawer Change-Id: I407a5e0fdd843ad7615d3d511c416a44e3d97c90
Diffstat (limited to 'src/com/android/settings/applications/RunningProcessesView.java')
-rw-r--r--src/com/android/settings/applications/RunningProcessesView.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index 8eb0496cd..caa545076 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -28,7 +28,6 @@ import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.SystemClock;
import android.os.UserHandle;
-import android.preference.PreferenceActivity;
import android.text.format.DateUtils;
import android.text.format.Formatter;
import android.util.AttributeSet;
@@ -42,6 +41,7 @@ import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.AbsListView.RecyclerListener;
+import com.android.settings.SettingsActivity;
import java.util.ArrayList;
import java.util.Collections;
@@ -397,9 +397,9 @@ public class RunningProcessesView extends FrameLayout
}
args.putInt(RunningServiceDetails.KEY_USER_ID, mi.mUserId);
args.putBoolean(RunningServiceDetails.KEY_BACKGROUND, mAdapter.mShowBackground);
-
- PreferenceActivity pa = (PreferenceActivity)mOwner.getActivity();
- pa.startPreferencePanel(RunningServiceDetails.class.getName(), args,
+
+ SettingsActivity sa = (SettingsActivity) mOwner.getActivity();
+ sa.startPreferencePanel(RunningServiceDetails.class.getName(), args,
R.string.runningservicedetails_settings_title, null, null, 0);
}
}