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

Commit 01834765 authored by Jeremy Sim's avatar Jeremy Sim Committed by Android (Google) Code Review
Browse files

Merge "Remove deprecated verticalBar layout in Overview" into tm-qpr-dev

parents 0ac64cba 3c2c3f1a

quickstep/res/values-land/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
     limitations under the License.

-->

<resources>

    <dimen name="overview_task_margin">8dp</dimen>

    <!--  Overview actions  -->

    <dimen name="overview_actions_top_margin">12dp</dimen>



    <!-- Tips Gesture Tutorial -->

    <dimen name="gesture_tutorial_feedback_margin_start_end">126dp</dimen>

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

+0 −12
Original line number Diff line number Diff line
@@ -22,10 +22,8 @@ import android.graphics.Rect; 
import android.util.AttributeSet;

import android.view.View;

import android.view.View.OnClickListener;

import android.view.ViewGroup;

import android.widget.Button;

import android.widget.FrameLayout;

import android.widget.LinearLayout;



import androidx.annotation.IntDef;

import androidx.annotation.Nullable;
@@ -233,10 +231,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo 
            return 0;

        }



        if (mDp.isVerticalBarLayout()) {

            return mDp.getInsets().bottom;

        }



        if (!mDp.isGestureMode && mDp.isTaskbarPresent) {

            return mDp.getOverviewActionsClaimedSpaceBelow();

        }
@@ -254,12 +248,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo 
        mTaskSize.set(taskSize);

        updateVerticalMargin(DisplayController.getNavigationMode(getContext()));



        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(

                dp.isVerticalBarLayout() ? 0 : dp.overviewActionsButtonSpacing,

                ViewGroup.LayoutParams.MATCH_PARENT);

        params.weight = dp.isVerticalBarLayout() ? 1 : 0;

        findViewById(R.id.action_split_space).setLayoutParams(params);



        requestLayout();



        mSplitButton.setCompoundDrawablesWithIntrinsicBounds(

src/com/android/launcher3/DeviceProfile.java

+1 −4
Original line number Diff line number Diff line
@@ -414,10 +414,7 @@ public class DeviceProfile { 
        overviewTaskIconDrawableSizeGridPx =

                res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_drawable_size_grid);

        overviewTaskThumbnailTopMarginPx = overviewTaskIconSizePx + overviewTaskMarginPx * 2;

        // In vertical bar, use the smaller task margin for the top regardless of mode.

        overviewActionsTopMarginPx = isVerticalBarLayout()

                ? overviewTaskMarginPx

                : res.getDimensionPixelSize(R.dimen.overview_actions_top_margin);

        overviewActionsTopMarginPx = res.getDimensionPixelSize(R.dimen.overview_actions_top_margin);

        overviewPageSpacing = res.getDimensionPixelSize(R.dimen.overview_page_spacing);

        overviewActionsButtonSpacing = res.getDimensionPixelSize(

                R.dimen.overview_actions_button_spacing);