Preferences: Show Dock Divider

Change-Id: I5e4349e5b7539a66d5d96c5f9fd9780b7572d624

3 files changed, 23 insertions, 5 deletions

diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java
index 25e5cd583..3e758d414 100644
--- a/src/com/cyanogenmod/trebuchet/Launcher.java
+++ b/src/com/cyanogenmod/trebuchet/Launcher.java
@@ -259,6 +259,7 @@ public final class Launcher extends Activity
 
     // Preferences
     private boolean mShowSearchBar;
+    private boolean mShowDockDivider;
     private boolean mAutoRotate;
 
     private Runnable mBuildLayersRunnable = new Runnable() {
@@ -296,6 +297,7 @@ public final class Launcher extends Activity
 
         // Preferences
         mShowSearchBar = PreferencesProvider.Interface.Homescreen.getShowSearchBar(this);
+        mShowDockDivider = PreferencesProvider.Interface.Homescreen.Indicator.getShowDockDivider(this);
         mAutoRotate = PreferencesProvider.Interface.General.getAutoRotate(this);
 
         if (PROFILE_STARTUP) {
@@ -798,6 +800,10 @@ public final class Launcher extends Activity
             ((View) findViewById(R.id.qsb_divider)).setVisibility(View.GONE);
         }
 
+        if (!mShowDockDivider) {
+            ((View) findViewById(R.id.dock_divider)).setVisibility(View.GONE);
+        }
+
         // Setup AppsCustomize
         mAppsCustomizeTabHost = (AppsCustomizeTabHost)
                 findViewById(R.id.apps_customize_pane);
@@ -2574,7 +2580,9 @@ public final class Launcher extends Activity
             if (mShowSearchBar) {
                 mQsbDivider.setVisibility(View.INVISIBLE);
             }
-            mDockDivider.setVisibility(View.INVISIBLE);
+            if (mShowDockDivider) {
+                mDockDivider.setVisibility(View.INVISIBLE);
+            }
         }
     }
 
@@ -2583,7 +2591,9 @@ public final class Launcher extends Activity
             if (mShowSearchBar) {
                 mQsbDivider.setVisibility(View.VISIBLE);
             }
-            mDockDivider.setVisibility(View.VISIBLE);
+            if (mShowDockDivider) {
+                mDockDivider.setVisibility(View.VISIBLE);
+            }
             if (mDividerAnimator != null) {
                 mDividerAnimator.cancel();
                 if (mShowSearchBar) {
@@ -2594,10 +2604,12 @@ public final class Launcher extends Activity
             }
             if (animated) {
                 mDividerAnimator = new AnimatorSet();
-                if (mShowSearchBar) {
+                if (mShowSearchBar && mShowDockDivider) {
                     mDividerAnimator.playTogether(ObjectAnimator.ofFloat(mQsbDivider, "alpha", 1f),
                             ObjectAnimator.ofFloat(mDockDivider, "alpha", 1f));
-                } else {
+                } else if (mShowSearchBar) {
+                    mDividerAnimator.play(ObjectAnimator.ofFloat(mQsbDivider, "alpha", 1f));
+                } else if (mShowDockDivider) {
                     mDividerAnimator.play(ObjectAnimator.ofFloat(mDockDivider, "alpha", 1f));
                 }
                 mDividerAnimator.setDuration(mSearchDropTargetBar.getTransitionInDuration());
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java
index 8564d3f2a..5f163f2d7 100644
--- a/src/com/cyanogenmod/trebuchet/Workspace.java
+++ b/src/com/cyanogenmod/trebuchet/Workspace.java
@@ -254,6 +254,7 @@ public class Workspace extends PagedView
     private boolean mScrollWallpaper;
     private boolean mShowScrollingIndicator;
     private boolean mFadeScrollingIndicator;
+    private boolean mShowDockDivider;
     private TransitionEffect mTransitionEffect;
 
     /**
@@ -343,6 +344,7 @@ public class Workspace extends PagedView
                 res.getBoolean(R.bool.config_workspaceDefualtFadeInAdjacentScreens));
         mShowScrollingIndicator = PreferencesProvider.Interface.Homescreen.Indicator.getShowScrollingIndicator(context);
         mFadeScrollingIndicator = PreferencesProvider.Interface.Homescreen.Indicator.getFadeScrollingIndicator(context);
+        mShowDockDivider = PreferencesProvider.Interface.Homescreen.Indicator.getShowDockDivider(context);
 
         mLauncher = (Launcher) context;
         initWorkspace();
@@ -3691,7 +3693,7 @@ public class Workspace extends PagedView
 
         cancelScrollingIndicatorAnimations();
         if (qsbDivider != null && mShowSearchBar) qsbDivider.setAlpha(reducedFade);
-        if (dockDivider != null) dockDivider.setAlpha(reducedFade);
+        if (dockDivider != null && mShowDockDivider) dockDivider.setAlpha(reducedFade);
         if (scrollIndicator != null && mShowScrollingIndicator) scrollIndicator.setAlpha(1 - fade);
     }
 }
diff --git a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
index bac7ff74c..811b1dc89 100644
--- a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
+++ b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
@@ -68,6 +68,10 @@ public final class PreferencesProvider {
                     final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0);
                     return preferences.getBoolean("ui_homescreen_indicator_fade", true);
                 }
+                public static boolean getShowDockDivider(Context context) {
+                    final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0);
+                    return preferences.getBoolean("ui_homescreen_indicator_background", true);
+                }
             }
         }