From df1dee9d96515a80bd108aecd76c09e8ed2b87a1 Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Sun, 4 Jan 2015 21:03:45 +0100 Subject: [PATCH] target lollipop SDK --- AndroidManifest.xml | 2 +- project.properties | 2 +- .../android/vanilla/PreferencesActivity.java | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index df836e49..987abe85 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -26,7 +26,7 @@ THE SOFTWARE. android:versionName="0.9.40" android:versionCode="0940" android:installLocation="auto"> - + diff --git a/project.properties b/project.properties index 03c5e078..b11c6cd7 100644 --- a/project.properties +++ b/project.properties @@ -10,7 +10,7 @@ # Indicates whether an apk should be generated for each density. split.density=false # Project target. -target=android-16 +target=android-21 ## do not enable: breaks settings in SDK15 ##proguard.config=proguard.config diff --git a/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java b/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java index 123ed72f..3417779e 100644 --- a/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java +++ b/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java @@ -287,4 +287,12 @@ public class PreferencesActivity extends PreferenceActivity { return view; } } + + + @Override + protected boolean isValidFragment(String fragmentName) { + return true; + } + + }