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

Commit 56bd2574 authored by Alex Chau's avatar Alex Chau
Browse files

Update overview clear all button to be larger

- Tuned the size and corner radius
- Tuned the margin from screen edge
- Tuned the vertical position

Bug: 204153113
Test: manual
Change-Id: Ibf3df599b31c7ecc2c9c951fc89e7e09c90253ef
parent 3b5dddbc
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@
    <item>
        <shape android:shape="rectangle"
            android:tint="?colorButtonNormal">
            <corners android:radius="18dp" />
            <corners android:radius="24dp" />
            <solid android:color="?androidprv:attr/colorSurface"/>
        </shape>
    </item>
+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@
    <dimen name="overview_actions_margin_three_button">8dp</dimen>
    <dimen name="overview_actions_horizontal_margin">16dp</dimen>

    <dimen name="overview_grid_side_margin">50dp</dimen>
    <dimen name="overview_grid_side_margin_portrait">60dp</dimen>
    <dimen name="overview_grid_side_margin_landscape">52dp</dimen>
    <dimen name="overview_grid_row_spacing_portrait">17.13dp</dimen>
    <dimen name="overview_grid_row_spacing_landscape">13.38dp</dimen>
    <dimen name="overview_grid_focus_vertical_margin">0dp</dimen>
+2 −2
Original line number Diff line number Diff line
@@ -137,8 +137,8 @@

    <style name="OverviewClearAllButton" parent="@android:style/Widget.DeviceDefault.Button">
        <item name="android:background">@drawable/bg_overview_clear_all_button</item>
        <item name="android:minWidth">85dp</item>
        <item name="android:minHeight">36dp</item>
        <item name="android:minWidth">96dp</item>
        <item name="android:minHeight">48dp</item>
        <item name="android:stateListAnimator">@null</item>
    </style>

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
        Rect insets = dp.getInsets();
        int topMargin = dp.overviewTaskThumbnailTopMarginPx;
        int bottomMargin = getOverviewActionsHeight(context, dp);
        int sideMargin = res.getDimensionPixelSize(R.dimen.overview_grid_side_margin);
        int sideMargin = dp.overviewGridSideMargin;

        outRect.set(0, 0, dp.widthPx, dp.heightPx);
        outRect.inset(Math.max(insets.left, sideMargin), insets.top + topMargin,
+5 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.util.AttributeSet;
import android.util.FloatProperty;
import android.widget.Button;

import com.android.launcher3.DeviceProfile;
import com.android.launcher3.statemanager.StatefulActivity;
import com.android.launcher3.touch.PagedOrientationHandler;

@@ -245,6 +246,9 @@ public class ClearAllButton extends Button {
     * Get the Y translation that is set in the original layout position, before scrolling.
     */
    private float getOriginalTranslationY() {
        return mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx / 2.0f;
        DeviceProfile deviceProfile = mActivity.getDeviceProfile();
        return deviceProfile.overviewShowAsGrid
                ? deviceProfile.overviewRowSpacing
                : deviceProfile.overviewTaskThumbnailTopMarginPx / 2.0f;
    }
}
Loading