Merge changes from topics "ww_4_delete_data", "ww_3_checkconfig", "ww_2_uploadIntent...

[android-x86/packages-apps-Settings.git] / proguard.flags

diff --git a/proguard.flags b/proguard.flags
index 7a403a4..091211d 100644 (file)
--- a/proguard.flags
+++ b/proguard.flags
@@ -27,6 +27,9 @@
 -keepclasseswithmembers class * {
     public <init>(android.content.Context, android.util.AttributeSet, int);
 }
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet, int, int);
+}
 
 # Keep annotated classes or class members.
 -keep @android.support.annotation.Keep class *
@@ -39,21 +42,3 @@
     public static ** SEARCH_INDEX_DATA_PROVIDER;
     public static ** SUMMARY_PROVIDER_FACTORY;
 }
-
-# Keep classes, annotations and members used by Lifecycle
--keepattributes *Annotation*
-
--keepclassmembers enum android.arch.lifecycle.Lifecycle$Event {
-    <fields>;
-}
-
--keep class * implements android.arch.lifecycle.LifecycleObserver {
-}
-
--keep class * implements android.arch.lifecycle.GeneratedAdapter {
-    <init>(...);
-}
-
--keepclassmembers class ** {
-    @android.arch.lifecycle.OnLifecycleEvent *;
-}