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

Commit f78b11d4 authored by Manu Cornet's avatar Manu Cornet
Browse files

2D Recents: tweak task view header height 

Bug: 32101881
Test: On local sw600dp device, checked recents layout
Change-Id: Ia463fa67a59e51e4644a84ba85ec61cb567dfb9b
parent 2f042c92

packages/SystemUI/res/values/dimens_grid.xml

+2 −0
Original line number Diff line number Diff line
@@ -19,5 +19,7 @@ 
  <dimen name="recents_grid_padding_left_right">32dp</dimen>

  <dimen name="recents_grid_padding_top_bottom">84dp</dimen>

  <dimen name="recents_grid_padding_task_view">20dp</dimen>

  <dimen name="recents_grid_task_view_header_height">44dp</dimen>

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

</resources>

packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -576,7 +576,8 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener 
                R.dimen.recents_task_view_header_height,

                R.dimen.recents_task_view_header_height_tablet_land,

                R.dimen.recents_task_view_header_height,

                R.dimen.recents_task_view_header_height_tablet_land);

                R.dimen.recents_task_view_header_height_tablet_land,

                R.dimen.recents_grid_task_view_header_height);



        LayoutInflater inflater = LayoutInflater.from(mContext);

        mHeaderBar = (TaskViewHeader) inflater.inflate(R.layout.recents_task_view_header,

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

+12 −6
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ public class TaskStackLayoutAlgorithm { 
                R.dimen.recents_layout_initial_top_offset_tablet,

                R.dimen.recents_layout_initial_top_offset_tablet,

                R.dimen.recents_layout_initial_top_offset_tablet,

                R.dimen.recents_layout_initial_top_offset_tablet,

                R.dimen.recents_layout_initial_top_offset_tablet);

        mBaseInitialBottomOffset = getDimensionForDevice(context,

                R.dimen.recents_layout_initial_bottom_offset_phone_port,
@@ -377,6 +378,7 @@ public class TaskStackLayoutAlgorithm { 
                R.dimen.recents_layout_initial_bottom_offset_tablet,

                R.dimen.recents_layout_initial_bottom_offset_tablet,

                R.dimen.recents_layout_initial_bottom_offset_tablet,

                R.dimen.recents_layout_initial_bottom_offset_tablet,

                R.dimen.recents_layout_initial_bottom_offset_tablet);

        mFreeformLayoutAlgorithm.reloadOnConfigurationChange(context);

        mTaskGridLayoutAlgorithm.reloadOnConfigurationChange(context);
@@ -384,11 +386,13 @@ public class TaskStackLayoutAlgorithm { 
        mBaseTopMargin = getDimensionForDevice(context,

                R.dimen.recents_layout_top_margin_phone,

                R.dimen.recents_layout_top_margin_tablet,

                R.dimen.recents_layout_top_margin_tablet_xlarge);

                R.dimen.recents_layout_top_margin_tablet_xlarge,

                R.dimen.recents_layout_top_margin_tablet);

        mBaseSideMargin = getDimensionForDevice(context,

                R.dimen.recents_layout_side_margin_phone,

                R.dimen.recents_layout_side_margin_tablet,

                R.dimen.recents_layout_side_margin_tablet_xlarge);

                R.dimen.recents_layout_side_margin_tablet_xlarge,

                R.dimen.recents_layout_side_margin_tablet);

        mBaseBottomMargin = res.getDimensionPixelSize(R.dimen.recents_layout_bottom_margin);

        mFreeformStackGap =

                res.getDimensionPixelSize(R.dimen.recents_freeform_layout_bottom_margin);
@@ -1100,9 +1104,9 @@ public class TaskStackLayoutAlgorithm { 
     * Retrieves resources that are constant regardless of the current configuration of the device.

     */

    public static int getDimensionForDevice(Context ctx, int phoneResId,

            int tabletResId, int xlargeTabletResId) {

            int tabletResId, int xlargeTabletResId, int gridLayoutResId) {

        return getDimensionForDevice(ctx, phoneResId, phoneResId, tabletResId, tabletResId,

                xlargeTabletResId, xlargeTabletResId);

                xlargeTabletResId, xlargeTabletResId, gridLayoutResId);

    }



    /**
@@ -1110,12 +1114,14 @@ public class TaskStackLayoutAlgorithm { 
     */

    public static int getDimensionForDevice(Context ctx, int phonePortResId, int phoneLandResId,

            int tabletPortResId, int tabletLandResId, int xlargeTabletPortResId,

            int xlargeTabletLandResId) {

            int xlargeTabletLandResId, int gridLayoutResId) {

        RecentsConfiguration config = Recents.getConfiguration();

        Resources res = ctx.getResources();

        boolean isLandscape = Utilities.getAppConfiguration(ctx).orientation ==

                Configuration.ORIENTATION_LANDSCAPE;

        if (config.isXLargeScreen) {

        if (config.isGridEnabled) {

            return res.getDimensionPixelSize(gridLayoutResId);

        } else if (config.isXLargeScreen) {

            return res.getDimensionPixelSize(isLandscape

                    ? xlargeTabletLandResId

                    : xlargeTabletPortResId);

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

+4 −2
Original line number Diff line number Diff line
@@ -290,14 +290,16 @@ public class TaskViewHeader extends FrameLayout 
                R.dimen.recents_task_view_header_height,

                R.dimen.recents_task_view_header_height_tablet_land,

                R.dimen.recents_task_view_header_height,

                R.dimen.recents_task_view_header_height_tablet_land);

                R.dimen.recents_task_view_header_height_tablet_land,

                R.dimen.recents_grid_task_view_header_height);

        int headerButtonPadding = TaskStackLayoutAlgorithm.getDimensionForDevice(getContext(),

                R.dimen.recents_task_view_header_button_padding,

                R.dimen.recents_task_view_header_button_padding,

                R.dimen.recents_task_view_header_button_padding,

                R.dimen.recents_task_view_header_button_padding_tablet_land,

                R.dimen.recents_task_view_header_button_padding,

                R.dimen.recents_task_view_header_button_padding_tablet_land);

                R.dimen.recents_task_view_header_button_padding_tablet_land,

                R.dimen.recents_grid_task_view_header_button_padding);

        if (headerBarHeight != mHeaderBarHeight || headerButtonPadding != mHeaderButtonPadding) {

            mHeaderBarHeight = headerBarHeight;

            mHeaderButtonPadding = headerButtonPadding;