Merge pull request #90 from utzcoz/master

Extract  *START_MENU* string to TaskbarIntent contants

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/HSLConfigActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/HSLConfigActivity.java
index 2a814fe..d4ab8f8 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/HSLConfigActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/HSLConfigActivity.java
@@ -58,7 +58,7 @@ public class HSLConfigActivity extends AppCompatActivity {
                 convertView = LayoutInflater.from(getContext()).inflate(R.layout.tb_hsl_row_layout, parent, false);
             }
             // Lookup view for data population
-            TextView launcherTitle = (TextView) convertView.findViewById(R.id.launcherTitle);
+            TextView launcherTitle = convertView.findViewById(R.id.launcherTitle);
             // Populate the data into the template view using the data object
             launcherTitle.setText(launcher);
 
@@ -117,8 +117,8 @@ public class HSLConfigActivity extends AppCompatActivity {
             }
         }
 
-        ListView listView = (ListView) findViewById(R.id.listView);
-        TextView textView = (TextView) findViewById(R.id.textView);
+        ListView listView = findViewById(R.id.listView);
+        TextView textView = findViewById(R.id.textView);
 
         // Display the list of launchers
         if(packageNames.size() > 0) {

diff --git a/app/src/main/java/com/farmerbb/taskbar/fragment/DesktopModeFragment.java b/app/src/main/java/com/farmerbb/taskbar/fragment/DesktopModeFragment.java
index e3a9d68..969e51f 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/DesktopModeFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/DesktopModeFragment.java
@@ -16,6 +16,7 @@
 package com.farmerbb.taskbar.fragment;
 
 import android.annotation.TargetApi;
+import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -23,6 +24,7 @@ import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
+import android.provider.Settings;
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
@@ -46,6 +48,7 @@ public class DesktopModeFragment extends SettingsFragment {
 
         // Set OnClickListeners for certain preferences
         findPreference("desktop_mode").setOnPreferenceClickListener(this);
+        findPreference("set_launcher_default").setOnPreferenceClickListener(this);
         findPreference("primary_launcher").setOnPreferenceClickListener(this);
 
         SharedPreferences pref = U.getSharedPreferences(getActivity());
@@ -54,6 +57,12 @@ public class DesktopModeFragment extends SettingsFragment {
         else
             bindPreferenceSummaryToValue(findPreference("desktop_mode"));
 
+        bindPreferenceSummaryToValue(findPreference("display_density"));
+
+        boolean writeSecureSettings = U.hasWriteSecureSettingsPermission(getActivity());
+        findPreference("display_density").setEnabled(writeSecureSettings);
+        findPreference("auto_hide_navbar").setEnabled(writeSecureSettings);
+
         finishedLoadingPrefs = true;
     }
 
@@ -76,10 +85,18 @@ public class DesktopModeFragment extends SettingsFragment {
         if(primaryLauncherPref != null) {
             SharedPreferences pref = U.getSharedPreferences(getActivity());
             String primaryLauncherName = pref.getString("hsl_name", "null");
-
-            primaryLauncherPref.setSummary(primaryLauncherName.equals("null")
-                    ? getString(R.string.tb_icon_pack_none)
-                    : primaryLauncherName
+            String primaryLauncherPackage = pref.getString("hsl_id", "null");
+
+            boolean primaryLauncherValid = true;
+            try {
+                getActivity().getPackageManager().getPackageInfo(primaryLauncherPackage, 0);
+            } catch (PackageManager.NameNotFoundException e) {
+                primaryLauncherValid = false;
+            }
+
+            primaryLauncherPref.setSummary(primaryLauncherValid
+                    ? primaryLauncherName
+                    : getString(R.string.tb_icon_pack_none)
             );
         }
     }
@@ -104,6 +121,14 @@ public class DesktopModeFragment extends SettingsFragment {
                         PackageManager.DONT_KILL_APP);
 
                break;
+            case "set_launcher_default":
+                try {
+                    startActivity(new Intent(Settings.ACTION_HOME_SETTINGS));
+                } catch (ActivityNotFoundException e) {
+                    U.showToastLong(getActivity(), R.string.tb_unable_to_set_default_home);
+                }
+
+                break;
             case "primary_launcher":
                 Intent intent = new Intent(getActivity(), HSLConfigActivity.class);
                 intent.putExtra("return_to_settings", true);

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6b1bbdf..c7d4aba 100644 (file)
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -413,9 +413,21 @@
 
     <string name="tb_pref_header_desktop_mode">Desktop mode</string>
     <string name="tb_primary_launcher">Primary launcher</string>
-
-    <string name="tb_hsl_no_launchers_found">No third-party launchers were found.\n\nPlease download and install one, then re-open this application.</string>
+    <string name="tb_set_launcher_default_title">Set Taskbar as default Home app</string>
+    <string name="tb_set_launcher_default_summary">Required for desktop mode to work</string>
+    <string name="tb_unable_to_set_default_home">Unable to set default Home app. Please do so manually via system settings.</string>
+    <string name="tb_display_density">Display density</string>
+    <string name="tb_auto_hide_navbar_alt">Hide navbar while on desktop</string>
+    <string name="tb_enable_additional_settings">Enable additional settings</string>
+
+    <string name="tb_hsl_no_launchers_found">No primary launchers were found. Please download and install one, then try again.</string>
     <string name="tb_hsl_launcher_uninstalled">%1$s was uninstalled. Please select a different launcher from the list.</string>
-    <string name="tb_hsl_main_activity_text">Select your primary launcher from the list below.\n\nYou can change this selection at any time from within Taskbar\'s desktop mode settings.</string>
+    <string name="tb_hsl_main_activity_text">Select your primary launcher from the list below. You can change this selection at any time from within Taskbar\'s desktop mode settings.</string>
+
+    <string-array name="tb_pref_display_density_list">
+        <item>Default</item>
+        <item>Low-density (160dpi)</item>
+        <item>High-density (320dpi)</item>
+    </string-array>
 
 </resources>

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 6c8b0df..1cad50b 100644 (file)
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -413,9 +413,21 @@
 
     <string name="tb_pref_header_desktop_mode">Desktop mode</string>
     <string name="tb_primary_launcher">Primary launcher</string>
-
-    <string name="tb_hsl_no_launchers_found">No third-party launchers were found.\n\nPlease download and install one, then re-open this application.</string>
+    <string name="tb_set_launcher_default_title">Set Taskbar as default Home app</string>
+    <string name="tb_set_launcher_default_summary">Required for desktop mode to work</string>
+    <string name="tb_unable_to_set_default_home">Unable to set default Home app. Please do so manually via system settings.</string>
+    <string name="tb_display_density">Display density</string>
+    <string name="tb_auto_hide_navbar_alt">Hide navbar while on desktop</string>
+    <string name="tb_enable_additional_settings">Enable additional settings</string>
+
+    <string name="tb_hsl_no_launchers_found">No primary launchers were found. Please download and install one, then try again.</string>
     <string name="tb_hsl_launcher_uninstalled">%1$s was uninstalled. Please select a different launcher from the list.</string>
-    <string name="tb_hsl_main_activity_text">Select your primary launcher from the list below.\n\nYou can change this selection at any time from within Taskbar\'s desktop mode settings.</string>
+    <string name="tb_hsl_main_activity_text">Select your primary launcher from the list below. You can change this selection at any time from within Taskbar\'s desktop mode settings.</string>
+
+    <string-array name="tb_pref_display_density_list">
+        <item>Default</item>
+        <item>Low-density (160dpi)</item>
+        <item>High-density (320dpi)</item>
+    </string-array>
 
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 783c4df..4344366 100644 (file)
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -413,9 +413,21 @@
 
     <string name="tb_pref_header_desktop_mode">Desktop mode</string>
     <string name="tb_primary_launcher">Primary launcher</string>
-
-    <string name="tb_hsl_no_launchers_found">No third-party launchers were found.\n\nPlease download and install one, then re-open this application.</string>
+    <string name="tb_set_launcher_default_title">Set Taskbar as default Home app</string>
+    <string name="tb_set_launcher_default_summary">Required for desktop mode to work</string>
+    <string name="tb_unable_to_set_default_home">Unable to set default Home app. Please do so manually via system settings.</string>
+    <string name="tb_display_density">Display density</string>
+    <string name="tb_auto_hide_navbar_alt">Hide navbar while on desktop</string>
+    <string name="tb_enable_additional_settings">Enable additional settings</string>
+
+    <string name="tb_hsl_no_launchers_found">No primary launchers were found. Please download and install one, then try again.</string>
     <string name="tb_hsl_launcher_uninstalled">%1$s was uninstalled. Please select a different launcher from the list.</string>
-    <string name="tb_hsl_main_activity_text">Select your primary launcher from the list below.\n\nYou can change this selection at any time from within Taskbar\'s desktop mode settings.</string>
+    <string name="tb_hsl_main_activity_text">Select your primary launcher from the list below. You can change this selection at any time from within Taskbar\'s desktop mode settings.</string>
+
+    <string-array name="tb_pref_display_density_list">
+        <item>Default</item>
+        <item>Low-density (160dpi)</item>
+        <item>High-density (320dpi)</item>
+    </string-array>
 
 </resources>

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 34cd94a..15c2c6f 100644 (file)
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -430,9 +430,21 @@ W takim przypadku może być konieczne flashowanie niestandardowego ROM-u w celu
 
     <string name="tb_pref_header_desktop_mode">Desktop mode</string>
     <string name="tb_primary_launcher">Primary launcher</string>
-
-    <string name="tb_hsl_no_launchers_found">No third-party launchers were found.\n\nPlease download and install one, then re-open this application.</string>
+    <string name="tb_set_launcher_default_title">Set Taskbar as default Home app</string>
+    <string name="tb_set_launcher_default_summary">Required for desktop mode to work</string>
+    <string name="tb_unable_to_set_default_home">Unable to set default Home app. Please do so manually via system settings.</string>
+    <string name="tb_display_density">Display density</string>
+    <string name="tb_auto_hide_navbar_alt">Hide navbar while on desktop</string>
+    <string name="tb_enable_additional_settings">Enable additional settings</string>
+
+    <string name="tb_hsl_no_launchers_found">No primary launchers were found. Please download and install one, then try again.</string>
     <string name="tb_hsl_launcher_uninstalled">%1$s was uninstalled. Please select a different launcher from the list.</string>
-    <string name="tb_hsl_main_activity_text">Select your primary launcher from the list below.\n\nYou can change this selection at any time from within Taskbar\'s desktop mode settings.</string>
+    <string name="tb_hsl_main_activity_text">Select your primary launcher from the list below. You can change this selection at any time from within Taskbar\'s desktop mode settings.</string>
+
+    <string-array name="tb_pref_display_density_list">
+        <item>Default</item>
+        <item>Low-density (160dpi)</item>
+        <item>High-density (320dpi)</item>
+    </string-array>
 
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 4025c4d..f5eef99 100644 (file)
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -413,9 +413,21 @@
 
     <string name="tb_pref_header_desktop_mode">Desktop mode</string>
     <string name="tb_primary_launcher">Primary launcher</string>
-
-    <string name="tb_hsl_no_launchers_found">No third-party launchers were found.\n\nPlease download and install one, then re-open this application.</string>
+    <string name="tb_set_launcher_default_title">Set Taskbar as default Home app</string>
+    <string name="tb_set_launcher_default_summary">Required for desktop mode to work</string>
+    <string name="tb_unable_to_set_default_home">Unable to set default Home app. Please do so manually via system settings.</string>
+    <string name="tb_display_density">Display density</string>
+    <string name="tb_auto_hide_navbar_alt">Hide navbar while on desktop</string>
+    <string name="tb_enable_additional_settings">Enable additional settings</string>
+
+    <string name="tb_hsl_no_launchers_found">No primary launchers were found. Please download and install one, then try again.</string>
     <string name="tb_hsl_launcher_uninstalled">%1$s was uninstalled. Please select a different launcher from the list.</string>
-    <string name="tb_hsl_main_activity_text">Select your primary launcher from the list below.\n\nYou can change this selection at any time from within Taskbar\'s desktop mode settings.</string>
+    <string name="tb_hsl_main_activity_text">Select your primary launcher from the list below. You can change this selection at any time from within Taskbar\'s desktop mode settings.</string>
+
+    <string-array name="tb_pref_display_density_list">
+        <item>Default</item>
+        <item>Low-density (160dpi)</item>
+        <item>High-density (320dpi)</item>
+    </string-array>
 
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index a7220a3..6d94536 100644 (file)
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -405,9 +405,21 @@ Bu durumda, bu cihazdaki serbest biçimli modu kullanmak için özel bir ROM fla
 
     <string name="tb_pref_header_desktop_mode">Desktop mode</string>
     <string name="tb_primary_launcher">Primary launcher</string>
-
-    <string name="tb_hsl_no_launchers_found">No third-party launchers were found.\n\nPlease download and install one, then re-open this application.</string>
+    <string name="tb_set_launcher_default_title">Set Taskbar as default Home app</string>
+    <string name="tb_set_launcher_default_summary">Required for desktop mode to work</string>
+    <string name="tb_unable_to_set_default_home">Unable to set default Home app. Please do so manually via system settings.</string>
+    <string name="tb_display_density">Display density</string>
+    <string name="tb_auto_hide_navbar_alt">Hide navbar while on desktop</string>
+    <string name="tb_enable_additional_settings">Enable additional settings</string>
+
+    <string name="tb_hsl_no_launchers_found">No primary launchers were found. Please download and install one, then try again.</string>
     <string name="tb_hsl_launcher_uninstalled">%1$s was uninstalled. Please select a different launcher from the list.</string>
-    <string name="tb_hsl_main_activity_text">Select your primary launcher from the list below.\n\nYou can change this selection at any time from within Taskbar\'s desktop mode settings.</string>
+    <string name="tb_hsl_main_activity_text">Select your primary launcher from the list below. You can change this selection at any time from within Taskbar\'s desktop mode settings.</string>
+
+    <string-array name="tb_pref_display_density_list">
+        <item>Default</item>
+        <item>Low-density (160dpi)</item>
+        <item>High-density (320dpi)</item>
+    </string-array>
 
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 7dd6c71..f0a7018 100644 (file)
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -413,9 +413,21 @@
 
     <string name="tb_pref_header_desktop_mode">Desktop mode</string>
     <string name="tb_primary_launcher">Primary launcher</string>
-
-    <string name="tb_hsl_no_launchers_found">No third-party launchers were found.\n\nPlease download and install one, then re-open this application.</string>
+    <string name="tb_set_launcher_default_title">Set Taskbar as default Home app</string>
+    <string name="tb_set_launcher_default_summary">Required for desktop mode to work</string>
+    <string name="tb_unable_to_set_default_home">Unable to set default Home app. Please do so manually via system settings.</string>
+    <string name="tb_display_density">Display density</string>
+    <string name="tb_auto_hide_navbar_alt">Hide navbar while on desktop</string>
+    <string name="tb_enable_additional_settings">Enable additional settings</string>
+
+    <string name="tb_hsl_no_launchers_found">No primary launchers were found. Please download and install one, then try again.</string>
     <string name="tb_hsl_launcher_uninstalled">%1$s was uninstalled. Please select a different launcher from the list.</string>
-    <string name="tb_hsl_main_activity_text">Select your primary launcher from the list below.\n\nYou can change this selection at any time from within Taskbar\'s desktop mode settings.</string>
+    <string name="tb_hsl_main_activity_text">Select your primary launcher from the list below. You can change this selection at any time from within Taskbar\'s desktop mode settings.</string>
+
+    <string-array name="tb_pref_display_density_list">
+        <item>Default</item>
+        <item>Low-density (160dpi)</item>
+        <item>High-density (320dpi)</item>
+    </string-array>
 
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 1e93990..3765c0d 100644 (file)
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -109,4 +109,10 @@
         <item>custom</item>
     </string-array>
 
+    <string-array name="tb_pref_display_density_list_values">
+        <item>reset</item>
+        <item>160</item>
+        <item>320</item>
+    </string-array>
+
 </resources>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5c651e9..7bf4c71 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -413,9 +413,21 @@
 
     <string name="tb_pref_header_desktop_mode">Desktop mode</string>
     <string name="tb_primary_launcher">Primary launcher</string>
+    <string name="tb_set_launcher_default_title">Set Taskbar as default Home app</string>
+    <string name="tb_set_launcher_default_summary">Required for desktop mode to work</string>
+    <string name="tb_unable_to_set_default_home">Unable to set default Home app. Please do so manually via system settings.</string>
+    <string name="tb_display_density">Display density</string>
+    <string name="tb_auto_hide_navbar_alt">Hide navbar while on desktop</string>
+    <string name="tb_enable_additional_settings">Enable additional settings</string>
 
     <string name="tb_hsl_no_launchers_found">No primary launchers were found. Please download and install one, then try again.</string>
     <string name="tb_hsl_launcher_uninstalled">%1$s was uninstalled. Please select a different launcher from the list.</string>
     <string name="tb_hsl_main_activity_text">Select your primary launcher from the list below. You can change this selection at any time from within Taskbar\'s desktop mode settings.</string>
 
+    <string-array name="tb_pref_display_density_list">
+        <item>Default</item>
+        <item>Low-density (160dpi)</item>
+        <item>High-density (320dpi)</item>
+    </string-array>
+
 </resources>

diff --git a/app/src/main/res/xml/tb_pref_desktop_mode.xml b/app/src/main/res/xml/tb_pref_desktop_mode.xml
index d3de176..22c8cc0 100644 (file)
--- a/app/src/main/res/xml/tb_pref_desktop_mode.xml
+++ b/app/src/main/res/xml/tb_pref_desktop_mode.xml
@@ -22,10 +22,38 @@
         android:title="@string/tb_pref_header_desktop_mode"/>
 
     <Preference
+        android:key="set_launcher_default"
+        android:title="@string/tb_set_launcher_default_title"
+        android:summary="@string/tb_set_launcher_default_summary"/>
+
+    <Preference
         android:key="primary_launcher"
         android:title="@string/tb_primary_launcher"
         android:dependency="desktop_mode"/>
 
+    <PreferenceCategory
+        android:key="additional_settings">
+
+        <Preference
+            android:key="enable_additional_settings"
+            android:title="@string/tb_enable_additional_settings"/>
+
+        <ListPreference
+            android:defaultValue="reset"
+            android:entries="@array/tb_pref_display_density_list"
+            android:entryValues="@array/tb_pref_display_density_list_values"
+            android:key="display_density"
+            android:negativeButtonText="@null"
+            android:positiveButtonText="@null"
+            android:title="@string/tb_display_density"/>
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="auto_hide_navbar"
+            android:title="@string/tb_auto_hide_navbar_alt"/>
+
+    </PreferenceCategory>
+
     <PreferenceCategory android:key="dummy" android:title="\n\n" />
 
 </PreferenceScreen>