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

Commit fb764b70 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "2D Recents: round task thumbnails properly." into nyc-mr2-dev

parents a2bbc269 90f4f529

packages/SystemUI/res/drawable/recents_grid_task_view_focus_frame_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ 
-->

<shape xmlns:android="http://schemas.android.com/apk/res/android">

  <solid android:color="#61FFFFFF" />

  <corners android:radius="8dp"/>

  <corners android:radius="@dimen/recents_grid_task_view_rounded_corners_radius"/>

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/recents_grid_task_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:focusable="true">

    <com.android.systemui.recents.views.TaskViewThumbnail

    <com.android.systemui.recents.views.grid.GridTaskViewThumbnail

        android:id="@+id/task_view_thumbnail"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />

packages/SystemUI/res/values/dimens_grid.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,5 +22,6 @@ 
  <dimen name="recents_grid_task_view_header_height">44dp</dimen>

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

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

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

</resources>

packages/SystemUI/src/com/android/systemui/recents/views/FakeShadowDrawable.java

+5 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.graphics.drawable.Drawable; 
import android.util.Log;



import com.android.systemui.R;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsConfiguration;



/**
@@ -90,8 +91,10 @@ class FakeShadowDrawable extends Drawable { 
        mCornerShadowPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);

        mCornerShadowPaint.setStyle(Paint.Style.FILL);

        mCornerShadowPaint.setDither(true);

        mCornerRadius = resources.getDimensionPixelSize(

                R.dimen.recents_task_view_rounded_corners_radius);

        mCornerRadius = Recents.getConfiguration().isGridEnabled ?

                resources.getDimensionPixelSize(

                    R.dimen.recents_grid_task_view_rounded_corners_radius) :

                resources.getDimensionPixelSize(R.dimen.recents_task_view_rounded_corners_radius);

        mCardBounds = new RectF();

        mEdgeShadowPaint = new Paint(mCornerShadowPaint);

    }

packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java

+3 −2
Original line number Diff line number Diff line
@@ -266,8 +266,9 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal 
        mStackScroller = new TaskStackViewScroller(context, this, mLayoutAlgorithm);

        mTouchHandler = new TaskStackViewTouchHandler(context, this, mStackScroller);

        mAnimationHelper = new TaskStackAnimationHelper(context, this);

        mTaskCornerRadiusPx = res.getDimensionPixelSize(

                R.dimen.recents_task_view_rounded_corners_radius);

        mTaskCornerRadiusPx = Recents.getConfiguration().isGridEnabled ?

                res.getDimensionPixelSize(R.dimen.recents_grid_task_view_rounded_corners_radius) :

                res.getDimensionPixelSize(R.dimen.recents_task_view_rounded_corners_radius);

        mDividerSize = ssp.getDockedDividerSize(context);

        mDisplayOrientation = Utilities.getAppConfiguration(mContext).orientation;

        mDisplayRect = ssp.getDisplayRect();