Launcher3: Update meminfo margin when using taskbar

On tablet, when meminfo is at the bottom, the margin only set to 15dp,
so you can't be able to see it when you are using a tablet with taskbar
enabled.

@neobuddy89:
* Keep dimens only for transient taskbar
* Tune dimens for 3-button navbar

Change-Id: Id5968736b44628cf69fed0fe76fd3ee47e621a00
Signed-off-by: hmtheboy154 <[email protected]>
Signed-off-by: Pranav Vashi <[email protected]>

Author: hmtheboy154

quickstep/src/com/android/quickstep/views/MemInfoView.java

@@ -16,6 +16,7 @@
 
 package com.android.quickstep.views;
 
+import static com.android.launcher3.util.NavigationMode.TWO_BUTTONS;
 import static com.android.launcher3.util.NavigationMode.THREE_BUTTONS;
 
 import android.app.ActivityManager;
@@ -118,8 +119,10 @@ public void updateVerticalMargin(NavigationMode mode) {
         LayoutParams lp = (LayoutParams)getLayoutParams();
         int bottomMargin;
 
-        if (mode == THREE_BUTTONS)
+        if (!mDp.isTaskbarPresent && ((mode == THREE_BUTTONS) || (mode == TWO_BUTTONS)))
             bottomMargin = mDp.memInfoMarginThreeButtonPx;
+        else if (mDp.isTaskbarPresent && !((mode == THREE_BUTTONS) || (mode == TWO_BUTTONS)))
+            bottomMargin = mDp.memInfoMarginTransientTaskbarPx;
         else
             bottomMargin = mDp.memInfoMarginGesturePx;
 

res/values/cr_dimens.xml

@@ -18,5 +18,7 @@
 
      <!-- Meminfo in overview -->
     <dimen name="meminfo_bottom_margin_gesture">15dp</dimen>
+    <dimen name="meminfo_bottom_margin_transient_taskbar">96dp</dimen>
     <dimen name="meminfo_bottom_margin_three_button">15dp</dimen>
+    <dimen name="meminfo_top_margin">12dp</dimen>
 </resources>

src/com/android/launcher3/DeviceProfile.java

@@ -323,6 +323,7 @@ public class DeviceProfile {
 
     // Meminfo in overview
     public int memInfoMarginGesturePx;
+    public int memInfoMarginTransientTaskbarPx;
     public int memInfoMarginThreeButtonPx;
 
     /** TODO: Once we fully migrate to staged split, remove "isMultiWindowMode" */
@@ -740,6 +741,8 @@ public class DeviceProfile {
 
         memInfoMarginGesturePx = res.getDimensionPixelSize(
                 R.dimen.meminfo_bottom_margin_gesture);
+        memInfoMarginTransientTaskbarPx = res.getDimensionPixelSize(
+                R.dimen.meminfo_bottom_margin_transient_taskbar);
         memInfoMarginThreeButtonPx = res.getDimensionPixelSize(
                 R.dimen.meminfo_bottom_margin_three_button);