Taskbar 3.0.5

• Fix occasional blank settings screen

diff --git a/app/build.gradle b/app/build.gradle
index 88235c6..c10967c 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,7 +31,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 25
 
-        versionCode 113
+        versionCode 114
         versionName "3.0.5"
 
         resConfigs "en", "ja", "ru"

diff --git a/app/src/main/java/com/farmerbb/taskbar/fragment/AboutFragment.java b/app/src/main/java/com/farmerbb/taskbar/fragment/AboutFragment.java
index adfd6ab..a9acdf1 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/AboutFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/AboutFragment.java
@@ -46,7 +46,7 @@ public class AboutFragment extends SettingsFragment implements Preference.OnPref
 
         super.onActivityCreated(savedInstanceState);
 
-        if(savedInstanceState == null) {
+        if(findPreference("dummy") == null) {
             // Add preferences
             addPreferencesFromResource(R.xml.pref_base);
 

diff --git a/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java b/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java
index e851772..4811b91 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java
@@ -50,7 +50,7 @@ public class AdvancedFragment extends SettingsFragment implements Preference.OnP
 
         super.onActivityCreated(savedInstanceState);
 
-        if(savedInstanceState == null) {
+        if(findPreference("dummy") == null) {
             // Add preferences
             addPreferencesFromResource(R.xml.pref_advanced);
 

diff --git a/app/src/main/java/com/farmerbb/taskbar/fragment/AppearanceFragment.java b/app/src/main/java/com/farmerbb/taskbar/fragment/AppearanceFragment.java
index d5159f8..dcbac35 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/AppearanceFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/AppearanceFragment.java
@@ -40,7 +40,7 @@ public class AppearanceFragment extends SettingsFragment implements Preference.O
 
         super.onActivityCreated(savedInstanceState);
 
-        if(savedInstanceState == null) {
+        if(findPreference("dummy") == null) {
             // Add preferences
             addPreferencesFromResource(R.xml.pref_appearance);
 

diff --git a/app/src/main/java/com/farmerbb/taskbar/fragment/FreeformModeFragment.java b/app/src/main/java/com/farmerbb/taskbar/fragment/FreeformModeFragment.java
index 828bda7..c638c53 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/FreeformModeFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/FreeformModeFragment.java
@@ -42,7 +42,7 @@ public class FreeformModeFragment extends SettingsFragment implements Preference
 
         super.onActivityCreated(savedInstanceState);
 
-        if(savedInstanceState == null) {
+        if(findPreference("dummy") == null) {
             // Add preferences
             addPreferencesFromResource(R.xml.pref_freeform_hack);
 

diff --git a/app/src/main/java/com/farmerbb/taskbar/fragment/GeneralFragment.java b/app/src/main/java/com/farmerbb/taskbar/fragment/GeneralFragment.java
index 36e4336..3aaffd4 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/GeneralFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/GeneralFragment.java
@@ -39,7 +39,7 @@ public class GeneralFragment extends SettingsFragment implements Preference.OnPr
 
         super.onActivityCreated(savedInstanceState);
 
-        if(savedInstanceState == null) {
+        if(findPreference("dummy") == null) {
             // Add preferences
             addPreferencesFromResource(R.xml.pref_general);
 

diff --git a/app/src/main/java/com/farmerbb/taskbar/fragment/RecentAppsFragment.java b/app/src/main/java/com/farmerbb/taskbar/fragment/RecentAppsFragment.java
index 39b45f3..ec95324 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/RecentAppsFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/RecentAppsFragment.java
@@ -41,7 +41,7 @@ public class RecentAppsFragment extends SettingsFragment implements Preference.O
 
         super.onActivityCreated(savedInstanceState);
 
-        if(savedInstanceState == null) {
+        if(findPreference("dummy") == null) {
             // Add preferences
             addPreferencesFromResource(R.xml.pref_recent_apps);
 

diff --git a/app/src/main/res/xml/pref_about.xml b/app/src/main/res/xml/pref_about.xml
index 9e1a4c1..885f35c 100644 (file)
--- a/app/src/main/res/xml/pref_about.xml
+++ b/app/src/main/res/xml/pref_about.xml
@@ -22,6 +22,6 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="\n\n" />
+    <PreferenceCategory android:key="dummy" android:title="\n\n" />
 
 </PreferenceScreen>

diff --git a/app/src/main/res/xml/pref_about_donate.xml b/app/src/main/res/xml/pref_about_donate.xml
index 480d68f..8ba6011 100644 (file)
--- a/app/src/main/res/xml/pref_about_donate.xml
+++ b/app/src/main/res/xml/pref_about_donate.xml
@@ -30,6 +30,6 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="\n\n" />
+    <PreferenceCategory android:key="dummy" android:title="\n\n" />
 
 </PreferenceScreen>

diff --git a/app/src/main/res/xml/pref_advanced.xml b/app/src/main/res/xml/pref_advanced.xml
index 13b20e1..8640c09 100644 (file)
--- a/app/src/main/res/xml/pref_advanced.xml
+++ b/app/src/main/res/xml/pref_advanced.xml
@@ -42,6 +42,6 @@
         android:key="clear_pinned_apps"
         android:title="@string/clear_pinned_apps"/>
 
-    <PreferenceCategory android:title="\n\n" />
+    <PreferenceCategory android:key="dummy" android:title="\n\n" />
 
 </PreferenceScreen>

diff --git a/app/src/main/res/xml/pref_appearance.xml b/app/src/main/res/xml/pref_appearance.xml
index 5b4b943..fd6cc0b 100644 (file)
--- a/app/src/main/res/xml/pref_appearance.xml
+++ b/app/src/main/res/xml/pref_appearance.xml
@@ -70,6 +70,6 @@
         android:key="reset_colors"
         android:title="@string/reset_colors" />
 
-    <PreferenceCategory android:title="\n\n" />
+    <PreferenceCategory android:key="dummy" android:title="\n\n" />
 
 </PreferenceScreen>

diff --git a/app/src/main/res/xml/pref_freeform_hack.xml b/app/src/main/res/xml/pref_freeform_hack.xml
index 0cecc4e..4a38825 100644 (file)
--- a/app/src/main/res/xml/pref_freeform_hack.xml
+++ b/app/src/main/res/xml/pref_freeform_hack.xml
@@ -57,6 +57,6 @@
         android:key="freeform_mode_help"
         android:title="@string/pref_title_freeform_mode_help" />
 
-    <PreferenceCategory android:title="\n\n" />
+    <PreferenceCategory android:key="dummy" android:title="\n\n" />
 
 </PreferenceScreen>
\ No newline at end of file

diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index a229f73..ea71fca 100644 (file)
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -82,6 +82,6 @@
         android:key="notification_settings"
         android:title="@string/notification_settings"/>
 
-    <PreferenceCategory android:title="\n\n" />
+    <PreferenceCategory android:key="dummy" android:title="\n\n" />
 
 </PreferenceScreen>

diff --git a/app/src/main/res/xml/pref_recent_apps.xml b/app/src/main/res/xml/pref_recent_apps.xml
index 9f7f24a..4eea205 100644 (file)
--- a/app/src/main/res/xml/pref_recent_apps.xml
+++ b/app/src/main/res/xml/pref_recent_apps.xml
@@ -61,6 +61,6 @@
         android:key="disable_scrolling_list"
         android:title="@string/disable_scrolling_list"/>
 
-    <PreferenceCategory android:title="\n\n" />
+    <PreferenceCategory android:key="dummy" android:title="\n\n" />
 
 </PreferenceScreen>