summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/SettingsActivity.java
diff options
context:
space:
mode:
authorSam Mortimer <sam@mortimer.me.uk>2014-11-14 23:15:15 -0800
committerRoman Birg <roman@cyngn.com>2015-11-03 12:21:35 -0800
commitdb521697716ce627bb9dd574de86e60b756ca2fa (patch)
tree2eb2f067129e8d059f66a1d9fa0b7d75f7993527 /src/com/android/settings/SettingsActivity.java
parent45b8df16fd9f45f5bb4f4ecb72dbd567e829dcbd (diff)
downloadpackages_apps_Settings-db521697716ce627bb9dd574de86e60b756ca2fa.zip
packages_apps_Settings-db521697716ce627bb9dd574de86e60b756ca2fa.tar.gz
packages_apps_Settings-db521697716ce627bb9dd574de86e60b756ca2fa.tar.bz2
[2/2] Settings: Privacy Guard
PS2: * add ic_privacy_guard*.png from frameworks/base * rebase PS3: * enable AppOpsSummaryActivity * use SubSettings on longclick PS4: * move privacyguard settings category to just below security PS5: * rebase Pulled together mostly (if not all) from: Author: Steve Kondik <shade@chemlab.org> Date: Tue Feb 25 14:02:16 2014 +0100 settings: Relocate Privacy Guard icons to framework * So we can use them in the permission dialog for MODE_ASK Change-Id: Ia9bac7dff0bbe91ae48db5d4b0d8f46feb9fdf86 Author: DvTonder <david.vantonder@gmail.com> Date: Thu Jan 16 19:01:23 2014 -0500 Settings: Fix up top level "Privacy" section Change-Id: Id4dbda10a891c793bc6eb3c42807cc0e3f6092cc Author: Danny Baumann <dannybaumann@web.de> Date: Fri Nov 8 13:37:07 2013 +0100 Add back privacy guard manager. Change-Id: Ic9fbbae137bb8425fe72a6cdb2f17117351b5709 Author: Chirayu Desai <cdesai@cyanogenmod.org> Date: Sat Dec 28 18:51:46 2013 +0530 PrivacyGuard: Specify a default value in Settings.getInt method call * While privacy guard is enabled by default, the default value specified here is returned only when the setting is not defined or not an integer. Change-Id: Iaedffcc76a23a310aa7915f6a42ccce83ba5d2a6 Author: Matt Mower <mowerm@gmail.com> Date: Wed Feb 5 19:40:37 2014 -0600 PrivacyGuard: confirm permissions reset The button to reset all application permissions to enabled looks suspiciously like a refresh button. Prompt the user with a confirmation dialog to make sure they know what they've pressed. Change-Id: I0444c5bf8e9533feccf890055d34d3200609c6f6 Change-Id: I2e10cb4d395e2e7e5141d2fadada9e9b21cd7fbf
Diffstat (limited to 'src/com/android/settings/SettingsActivity.java')
-rw-r--r--src/com/android/settings/SettingsActivity.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 7f48cc4..bb289a2 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -120,6 +120,7 @@ import com.android.settings.print.PrintJobSettingsFragment;
import com.android.settings.print.PrintSettingsFragment;
import com.android.settings.search.DynamicIndexableContentMonitor;
import com.android.settings.search.Index;
+import com.android.settings.privacyguard.PrivacyGuardPrefs;
import com.android.settings.sim.SimSettings;
import com.android.settings.tts.TextToSpeechSettings;
import com.android.settings.users.UserSettings;
@@ -286,7 +287,8 @@ public class SettingsActivity extends Activity
R.id.print_settings,
R.id.nfc_payment_settings,
R.id.home_settings,
- R.id.dashboard
+ R.id.dashboard,
+ R.id.privacy_settings_cyanogenmod
};
private static final String[] ENTRY_FRAGMENTS = {
@@ -362,7 +364,8 @@ public class SettingsActivity extends Activity
ProcessStatsSummary.class.getName(),
DrawOverlayDetails.class.getName(),
WriteSettingsDetails.class.getName(),
- LiveDisplay.class.getName()
+ LiveDisplay.class.getName(),
+ com.android.settings.cyanogenmod.PrivacySettings.class.getName()
};