diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4ea45a8e..fd1d0854 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -23,8 +23,8 @@ THE SOFTWARE. --> @@ -33,8 +33,7 @@ THE SOFTWARE. + android:label="@string/app_name"> ; -} - --keepclasseswithmembers class org.kreed.vanilla.*,com.viewpagerindicator.*,android.support.v4.view.ViewPager { - public (android.content.Context, android.util.AttributeSet); -} - --keepclasseswithmembers class org.kreed.vanilla.* { - public (android.content.Context, android.util.AttributeSet, int); -} - --keepclassmembers class org.kreed.vanilla.* extends android.app.Activity { - public void *(android.view.View); -} - --keep class org.kreed.vanilla.*,android.support.v4.view.ViewPager$SavedState implements android.os.Parcelable { - public static final android.os.Parcelable$* *; -} - --assumenosideeffects class android.util.Log { - public static *** d(...); - public static *** v(...); - public static *** i(...); - public static *** w(...); -} - --assumenosideeffects class java.lang.String { - public *** format(...); -} - --assumenosideeffects class junit.framework.Assert { - ; -} - --keep public class org.kreed.vanilla.Compat* --keep public class android.support.v4.view.*Compat diff --git a/src/ch/blinkenlights/android/vanilla/PreferencesBackupAgent.java b/src/ch/blinkenlights/android/vanilla/PreferencesBackupAgent.java deleted file mode 100644 index dfb40ea0..00000000 --- a/src/ch/blinkenlights/android/vanilla/PreferencesBackupAgent.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2011 Christopher Eby - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -package ch.blinkenlights.android.vanilla; - -import android.annotation.TargetApi; -import android.app.backup.BackupAgentHelper; -import android.app.backup.SharedPreferencesBackupHelper; - -/** - * Saves application preferences to the backup manager. - */ -@TargetApi(8) -public class PreferencesBackupAgent extends BackupAgentHelper { - private static final String BACKUP_KEY = "prefs"; - - @Override - public void onCreate() - { - // This is the preference name used by PreferenceManager.getDefaultSharedPreferences - String prefs = getPackageName() + "_preferences"; - addHelper(BACKUP_KEY, new SharedPreferencesBackupHelper(this, prefs)); - } -}