From db521697716ce627bb9dd574de86e60b756ca2fa Mon Sep 17 00:00:00 2001 From: Sam Mortimer Date: Fri, 14 Nov 2014 23:15:15 -0800 Subject: [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 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 Date: Thu Jan 16 19:01:23 2014 -0500 Settings: Fix up top level "Privacy" section Change-Id: Id4dbda10a891c793bc6eb3c42807cc0e3f6092cc Author: Danny Baumann Date: Fri Nov 8 13:37:07 2013 +0100 Add back privacy guard manager. Change-Id: Ic9fbbae137bb8425fe72a6cdb2f17117351b5709 Author: Chirayu Desai 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 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 --- proguard.flags | 3 +++ 1 file changed, 3 insertions(+) (limited to 'proguard.flags') diff --git a/proguard.flags b/proguard.flags index 991c31c..22d7de6 100644 --- a/proguard.flags +++ b/proguard.flags @@ -18,6 +18,9 @@ -keep class com.android.settings.notification.* -keep class com.android.settings.cyanogenmod.* +-keep class com.android.settings.cyanogenmod.*Settings +-keep class com.android.settings.privacyguard.* + # Keep click responders -keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity { *** onClick*(...); -- cgit v1.1