diff --git a/proguard.flags b/proguard.flags
index f3c218a54df..3b1749d93be 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,31 +1,12 @@
 # Keep all Fragments in this package, which are used by reflection.
--keep class com.android.settings.*Fragment
--keep class com.android.settings.*Picker
--keep class com.android.settings.*Settings
--keep class com.android.settings.wifi.*Settings
--keep class com.android.settings.deviceinfo.*
--keep class com.android.settings.bluetooth.*
--keep class com.android.settings.datausage.*
--keep class com.android.settings.applications.*
--keep class com.android.settings.inputmethod.*
--keep class com.android.settings.ResetNetwork
--keep class com.android.settings.ResetNetworkConfirm
--keep class com.android.settings.MasterClear
--keep class com.android.settings.MasterClearConfirm
--keep class com.android.settings.accounts.*
--keep class com.android.settings.fuelgauge.*
--keep class com.android.settings.users.*
--keep class com.android.settings.nfc.*
--keep class com.android.settings.notification.*
--keep class com.android.settings.overlay.FeatureFactoryImpl
--keep class com.android.settings.accessibility.*FragmentForSetupWizard
--keep class com.android.settings.display.*FragmentForSetupWizard
+-keep public class com.android.settings.** extends android.app.Fragment
 
-# Keep click responders
--keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity {
-  *** onClick*(...);
+# Keep click handlers.
+-keepclassmembers class * extends android.app.Activity {
+   public void *(android.view.View);
 }
 
--keep public class * extends com.android.setupwizardlib.items.ItemHierarchy {
+-keepclasseswithmembers class * {
     public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
 }