Changes to about screen behavior for Android-x86

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 a7c584a..e9b4fe2 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/AboutFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/AboutFragment.java
@@ -79,7 +79,11 @@ public class AboutFragment extends SettingsFragment implements Preference.OnPref
             findPreference("pref_screen_recent_apps").setOnPreferenceClickListener(this);
             findPreference("pref_screen_advanced").setOnPreferenceClickListener(this);
             findPreference("about").setOnPreferenceClickListener(this);
-            findPreference("about").setSummary(getString(R.string.pref_about_description, new String(Character.toChars(0x1F601))));
+
+            if(getActivity().getPackageName().contains(U.ANDROIDX86_APPLICATION_ID))
+                findPreference("about").setSummary(R.string.pref_about_description_alt);
+            else
+                findPreference("about").setSummary(getString(R.string.pref_about_description, new String(Character.toChars(0x1F601))));
         }
 
         AppCompatActivity activity = (AppCompatActivity) getActivity();

diff --git a/app/src/main/java/com/farmerbb/taskbar/util/U.java b/app/src/main/java/com/farmerbb/taskbar/util/U.java
index f9cc588..7a37fde 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/util/U.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java
@@ -192,7 +192,6 @@ public class U {
         else
             toast = new ToastCompatImpl(context, message, length);
 
-
         toast.show();
 
         ToastHelper.getInstance().setLastToast(toast);
@@ -541,24 +540,26 @@ public class U {
     }
 
     public static void checkForUpdates(Context context) {
-        if(!BuildConfig.DEBUG) {
-            String url;
-            try {
-                context.getPackageManager().getPackageInfo("com.android.vending", 0);
-                url = "https://play.google.com/store/apps/details?id=" + BuildConfig.APPLICATION_ID;
-            } catch (PackageManager.NameNotFoundException e) {
-                url = "https://f-droid.org/repository/browse/?fdid=" + BuildConfig.BASE_APPLICATION_ID;
-            }
+        if(!BuildConfig.APPLICATION_ID.equals(BuildConfig.ANDROIDX86_APPLICATION_ID)) {
+            if(!BuildConfig.DEBUG) {
+                String url;
+                try {
+                    context.getPackageManager().getPackageInfo("com.android.vending", 0);
+                    url = "https://play.google.com/store/apps/details?id=" + BuildConfig.APPLICATION_ID;
+                } catch (PackageManager.NameNotFoundException e) {
+                    url = "https://f-droid.org/repository/browse/?fdid=" + BuildConfig.BASE_APPLICATION_ID;
+                }
 
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            intent.setData(Uri.parse(url));
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse(url));
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
-            try {
-                context.startActivity(intent);
-            } catch (ActivityNotFoundException e) { /* Gracefully fail */ }
-        } else
-            showToast(context, R.string.debug_build);
+                try {
+                    context.startActivity(intent);
+                } catch (ActivityNotFoundException e) { /* Gracefully fail */ }
+            } else
+                showToast(context, R.string.debug_build);
+        }
     }
 
     public static boolean launcherIsDefault(Context context) {

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b442dbd..c7a0996 100644 (file)
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -76,6 +76,7 @@
 
     <string name="pref_header_about">Über Taskbar</string>
     <string name="pref_about_description">Taskbar: Multitasking mit wenigen Fingertips\n\n&#169; 2017 Braden Farmer\nApps Logo von Mark Morilla\n\nKlicken Sie hier um auf Updates zu überprüfen oder eine Bewertung geben! %1$s</string>
+    <string name="pref_about_description_alt">Taskbar: Multitasking mit wenigen Fingertips\n\n&#169; 2017 Braden Farmer\nApps Logo von Mark Morilla</string>
 
     <string name="pref_title_hide_taskbar">Taskbar nach dem Auswählen der App verbergen</string>
 

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 23f67c8..c243bd8 100644 (file)
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -76,6 +76,7 @@
 
     <string name="pref_header_about">Taskbar について</string>
     <string name="pref_about_description">Taskbar: 指先でスタートメニューと最近使用したアプリ\n\n&#169; 2017 Braden Farmer\n\nここをクリックして更新の確認、または評価してください! %1$s</string>
+    <string name="pref_about_description_alt">Taskbar: 指先でスタートメニューと最近使用したアプリ\n\n&#169; 2017 Braden Farmer</string>
 
     <string name="pref_title_hide_taskbar">アプリを選択したときに Taskbar を折りたたむ</string>
 

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 86e8f21..02d21c1 100644 (file)
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -76,6 +76,7 @@
 
     <string name="pref_header_about">О Taskbar</string>
     <string name="pref_about_description">Taskbar: меню приложений и список недавних у вас под рукой\n\n&#169; 2017 Braden Farmer\nЛоготип: Mark Morilla\n\nНажмите сюда, чтобы оставить оценку или обновиться! %1$s</string>
+    <string name="pref_about_description_alt">Taskbar: меню приложений и список недавних у вас под рукой\n\n&#169; 2017 Braden Farmer\nЛоготип: Mark Morilla</string>
 
     <string name="pref_title_hide_taskbar">Скрыть Taskbar после выбора приложения</string>
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fa05998..809ae92 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -76,6 +76,7 @@
 
     <string name="pref_header_about">About Taskbar</string>
     <string name="pref_about_description">Taskbar: start menu and recent apps at your fingertips\n\n&#169; 2017 Braden Farmer\nApp logo by Mark Morilla\n\nClick here to check for updates or leave a rating! %1$s</string>
+    <string name="pref_about_description_alt">Taskbar: start menu and recent apps at your fingertips\n\n&#169; 2017 Braden Farmer\nApp logo by Mark Morilla</string>
 
     <string name="pref_title_hide_taskbar">Collapse Taskbar when selecting items</string>