summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorDanesh Mondegarian <daneshm90@gmail.com>2014-11-16 22:06:35 -0600
committerd34d <clark@cyngn.com>2015-11-11 09:48:13 -0800
commit349895f406468622aef90ac599505f4cd30340fa (patch)
tree55f84d6804da35bef5e0e22c2674509c55f30c0d /src/com/android
parentdd6f7452d4bc5e6a4cb6497d48ed61e3f1d1faba (diff)
downloadpackages_apps_Settings-349895f406468622aef90ac599505f4cd30340fa.zip
packages_apps_Settings-349895f406468622aef90ac599505f4cd30340fa.tar.gz
packages_apps_Settings-349895f406468622aef90ac599505f4cd30340fa.tar.bz2
Settings: Forward port long-press-back to kill app (1/2)
PS4: Switch instead of Checkbox Change-Id: I60f4b95eb9cc2ef6cf73a5f9317bca066e6bb901
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/settings/DevelopmentSettings.java19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index bb31b79..6ab0b3c 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -178,6 +178,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs";
+ private static final String KILL_APP_LONGPRESS_BACK = "kill_app_longpress_back";
+
private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
private static final String TERMINAL_APP_PACKAGE = "com.android.terminal";
@@ -271,6 +273,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
private ListPreference mAppProcessLimit;
private SwitchPreference mShowAllANRs;
+ private SwitchPreference mKillAppLongpressBack;
private ListPreference mRootAccess;
private Object mSelectedRootValue;
@@ -441,6 +444,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
mAllPrefs.add(mShowAllANRs);
mResetSwitchPrefs.add(mShowAllANRs);
+ mKillAppLongpressBack = findAndInitSwitchPref(KILL_APP_LONGPRESS_BACK);
+
Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
if (hdcpChecking != null) {
mAllPrefs.add(hdcpChecking);
@@ -582,6 +587,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
setPrefsEnabledState(mLastEnabledState);
}
mSwitchBar.show();
+ updateKillAppLongpressBackOptions();
if (mColorModePreference != null) {
mColorModePreference.startListening();
@@ -853,6 +859,17 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
}
}
+ private void writeKillAppLongpressBackOptions() {
+ Settings.Secure.putInt(getActivity().getContentResolver(),
+ Settings.Secure.KILL_APP_LONGPRESS_BACK,
+ mKillAppLongpressBack.isChecked() ? 1 : 0);
+ }
+
+ private void updateKillAppLongpressBackOptions() {
+ mKillAppLongpressBack.setChecked(Settings.Secure.getInt(
+ getActivity().getContentResolver(), Settings.Secure.KILL_APP_LONGPRESS_BACK, 0) != 0);
+ }
+
private void updatePasswordSummary() {
try {
if (mBackupManager.hasBackupPassword()) {
@@ -1923,6 +1940,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
startInactiveAppsFragment();
} else if (preference == mDevelopmentShortcut) {
writeDevelopmentShortcutOptions();
+ } else if (preference == mKillAppLongpressBack) {
+ writeKillAppLongpressBackOptions();
} else {
return super.onPreferenceTreeClick(preferenceScreen, preference);
}