fix typo (status bar -> navigation bar), this is going to be a "break…

…ing change" because key name has changed, however a new signing key has been introduced, which means the app has to be installed cleanly anyway
hundeva · Feb 18, 2018 · 72327bf · 72327bf
1 parent 14903e1
commit 72327bf
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/res/values/lean_strings.xml b/res/values/lean_strings.xml
@@ -46,8 +46,8 @@
     <string name="about_based_on_title">Based on Rootless Pixel Launcher</string>
     <string name="about_based_on_summary">by Amir Zaidi</string>
 
-    <string name="transparent_status_bar_title">Transparent Status Bar</string>
-    <string name="transparent_status_bar_summary">On the app drawer</string>
+    <string name="transparent_navigation_bar_title">Transparent Navigation Bar</string>
+    <string name="transparent_navigation_bar_summary">On the app drawer</string>
 
     <string name="extra_bottom_padding_title">Extra bottom padding</string>
     <string name="extra_bottom_padding_summary">Enable if icons are too close to bottom search bar</string>

diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml
@@ -116,9 +116,9 @@
         />
 
     <SwitchPreference
-        android:key="pref_transparent_status_bar"
-        android:title="@string/transparent_status_bar_title"
-        android:summary="@string/transparent_status_bar_summary"
+        android:key="pref_transparent_navigation_bar"
+        android:title="@string/transparent_navigation_bar_title"
+        android:summary="@string/transparent_navigation_bar_summary"
         android:defaultValue="false"
         android:persistent="true"
         />

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -358,7 +358,7 @@ public void setInsets(Rect insets) {
             navBarBgLp.height = insets.bottom;
             navBarBg.setLayoutParams(navBarBgLp);
 
-            if (LeanSettings.isStatusBarTransparent(getContext())) {
+            if (LeanSettings.isNavigationBarTransparent(getContext())) {
                 navBarBg.setBackgroundResource(R.color.transparent);
             }
         }

diff --git a/src/com/google/android/apps/nexuslauncher/SettingsActivity.java b/src/com/google/android/apps/nexuslauncher/SettingsActivity.java
@@ -99,7 +99,7 @@ public void onCreate(Bundle bundle) {
             findPreference(LeanSettings.BOTTOM_SEARCH_BAR_KEY).setOnPreferenceChangeListener(this);
             findPreference(LeanSettings.TOP_SEARCH_BAR_KEY).setOnPreferenceChangeListener(this);
             findPreference(LeanSettings.PHYSICAL_ANIMATION_KEY).setOnPreferenceChangeListener(this);
-            findPreference(LeanSettings.TRANSPARENT_STATUS_BAR).setOnPreferenceChangeListener(this);
+            findPreference(LeanSettings.TRANSPARENT_NAVIGATION_BAR).setOnPreferenceChangeListener(this);
             findPreference(LeanSettings.EXTRA_BOTTOM_PADDING).setOnPreferenceChangeListener(this);
             findPreference(LeanSettings.GRID_COLUMNS).setOnPreferenceChangeListener(this);
             findPreference(LeanSettings.GRID_ROWS).setOnPreferenceChangeListener(this);
@@ -166,7 +166,7 @@ public boolean onPreferenceChange(Preference preference, final Object newValue)
                 case LeanSettings.EXTRA_BOTTOM_PADDING:
                 case LeanSettings.TOP_SEARCH_BAR_KEY:
                 case LeanSettings.PHYSICAL_ANIMATION_KEY:
-                case LeanSettings.TRANSPARENT_STATUS_BAR:
+                case LeanSettings.TRANSPARENT_NAVIGATION_BAR:
                 case LeanSettings.FORCE_COLORED_G_ICON:
                     if (preference instanceof TwoStatePreference) {
                         ((TwoStatePreference) preference).setChecked((boolean) newValue);

diff --git a/src/com/hdeva/launcher/LeanSettings.java b/src/com/hdeva/launcher/LeanSettings.java
@@ -16,7 +16,7 @@ public class LeanSettings {
     public static final String BOTTOM_SEARCH_BAR_KEY = "pref_bottom_search_bar";
     public static final String TOP_SEARCH_BAR_KEY = "pref_top_search_bar";
     public static final String PHYSICAL_ANIMATION_KEY = "pref_physical_animation";
-    public static final String TRANSPARENT_STATUS_BAR = "pref_transparent_status_bar";
+    public static final String TRANSPARENT_NAVIGATION_BAR = "pref_transparent_navigation_bar";
     public static final String EXTRA_BOTTOM_PADDING = "pref_extra_bottom_padding";
     public static final String GRID_COLUMNS = "pref_grid_columns";
     public static final String GRID_ROWS = "pref_grid_rows";
@@ -32,7 +32,7 @@ public class LeanSettings {
     private static final boolean BOTTOM_SEARCH_BAR_DEFAULT = true;
     private static final boolean TOP_SEARCH_BAR_DEFAULT = true;
     private static final boolean PHYSICAL_ANIMATION_DEFAULT = true;
-    private static final boolean TRANSPARENT_STATUS_BAR_DEFAULT = false;
+    private static final boolean TRANSPARENT_NAVIGATION_BAR_DEFAULT = false;
     private static final boolean EXTRA_BOTTOM_PADDING_DEFAULT = false;
     private static final String GRID_COLUMNS_DEFAULT = "default";
     private static final String GRID_ROWS_DEFAULT = "default";
@@ -104,8 +104,8 @@ public static void setComponentHidden(Context context, ComponentName component,
         hiddenAppsPrefs(context).edit().putBoolean(component.getClassName(), hidden).apply();
     }
 
-    public static boolean isStatusBarTransparent(Context context) {
-        return prefs(context).getBoolean(TRANSPARENT_STATUS_BAR, TRANSPARENT_STATUS_BAR_DEFAULT);
+    public static boolean isNavigationBarTransparent(Context context) {
+        return prefs(context).getBoolean(TRANSPARENT_NAVIGATION_BAR, TRANSPARENT_NAVIGATION_BAR_DEFAULT);
     }
 
     public static boolean shouldExtraBottomPaddingForBottomSearchBar(Context context) {