Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 471e2178 authored by Federico Baron's avatar Federico Baron
Browse files

Fix page indicator dots height in workspace 

In workspace, the page indicator dots end up in the bottom because we were missing a setInsets method (WorkspacePageInidcator.java uses this method to set the page indicator to the right height).

Bug: 249773534
Test: manual
Change-Id: I03636e28244f329b249453a6d22eb0ec7d85c45f
parent 7539d764

src/com/android/launcher3/Workspace.java

+22 −0
Original line number Diff line number Diff line
@@ -53,12 +53,14 @@ import android.os.Parcelable; 
import android.util.AttributeSet;

import android.util.Log;

import android.util.SparseArray;

import android.view.Gravity;

import android.view.LayoutInflater;

import android.view.MotionEvent;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewTreeObserver;

import android.view.accessibility.AccessibilityNodeInfo;

import android.widget.FrameLayout;

import android.widget.Toast;



import androidx.annotation.Nullable;
@@ -322,6 +324,26 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T> 


        updateCellLayoutPadding();

        updateWorkspaceWidgetsSizes();

        setPageIndicatorInset();

    }



    private void setPageIndicatorInset() {

        DeviceProfile grid = mLauncher.getDeviceProfile();



        FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) mPageIndicator.getLayoutParams();



        // Set insets for page indicator

        Rect padding = grid.workspacePadding;

        if (grid.isVerticalBarLayout()) {

            lp.leftMargin = padding.left + grid.workspaceCellPaddingXPx;

            lp.rightMargin = padding.right + grid.workspaceCellPaddingXPx;

            lp.bottomMargin = padding.bottom;

        } else {

            lp.leftMargin = lp.rightMargin = 0;

            lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;

            lp.bottomMargin = grid.hotseatBarSizePx;

        }

        mPageIndicator.setLayoutParams(lp);

    }



    private void updateCellLayoutPadding() {

src/com/android/launcher3/pageindicators/PageIndicatorDots.java

+11 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.graphics.Canvas; 
import android.graphics.Outline;

import android.graphics.Paint;

import android.graphics.Paint.Style;

import android.graphics.Rect;

import android.graphics.RectF;

import android.graphics.drawable.Drawable;

import android.util.AttributeSet;
@@ -38,6 +39,7 @@ import android.view.ViewOutlineProvider; 
import android.view.animation.Interpolator;

import android.view.animation.OvershootInterpolator;



import com.android.launcher3.Insettable;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.anim.Interpolators;
@@ -47,7 +49,7 @@ import com.android.launcher3.util.Themes; 
 * {@link PageIndicator} which shows dots per page. The active page is shown with the current

 * accent color.

 */

public class PageIndicatorDots extends View implements PageIndicator {

public class PageIndicatorDots extends View implements Insettable, PageIndicator {



    private static final float SHIFT_PER_ANIMATION = 0.5f;

    private static final float SHIFT_THRESHOLD = 0.1f;
@@ -128,7 +130,6 @@ public class PageIndicatorDots extends View implements PageIndicator { 
        mPaginationPaint.setColor(Themes.getAttrColor(context, R.attr.folderPaginationColor));

        mDotRadius = getResources().getDimension(R.dimen.page_indicator_dot_size) / 2;





        if (SHOW_DELIGHTFUL_PAGINATION.get()) {

            mPageIndicatorSize = getResources().getDimension(

                    R.dimen.page_indicator_size);
@@ -483,4 +484,12 @@ public class PageIndicatorDots extends View implements PageIndicator { 
            }

        }

    }



    /**

     * We need to override setInsets to prevent InsettableFrameLayout from applying different

     * margins on the pagination.

     */

    @Override

    public void setInsets(Rect insets) {

    }

}

src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java

+4 −17
Original line number Diff line number Diff line
@@ -14,12 +14,9 @@ import android.os.Handler; 
import android.os.Looper;

import android.util.AttributeSet;

import android.util.Property;

import android.view.Gravity;

import android.view.View;

import android.view.ViewConfiguration;

import android.widget.FrameLayout;



import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Insettable;

import com.android.launcher3.Launcher;

import com.android.launcher3.R;
@@ -258,21 +255,11 @@ public class WorkspacePageIndicator extends View implements Insettable, PageIndi 
        }

    }



    /**

     * We need to override setInsets to prevent InsettableFrameLayout from applying different

     * margins on the page indicator.

     */

    @Override

    public void setInsets(Rect insets) {

        DeviceProfile grid = mLauncher.getDeviceProfile();

        FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) getLayoutParams();



        if (grid.isVerticalBarLayout()) {

            Rect padding = grid.workspacePadding;

            lp.leftMargin = padding.left + grid.workspaceCellPaddingXPx;

            lp.rightMargin = padding.right + grid.workspaceCellPaddingXPx;

            lp.bottomMargin = padding.bottom;

        } else {

            lp.leftMargin = lp.rightMargin = 0;

            lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;

            lp.bottomMargin = grid.hotseatBarSizePx;

        }

        setLayoutParams(lp);

    }

}