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

Commit 8e1be1ea authored by Winson Chung's avatar Winson Chung Committed by Android Git Automerger
Browse files

am 14f8fe33: Merge "Enabling shadows again." into lmp-preview-dev 

* commit '14f8fe336ab74576caa5885ffe21677cb7ba982f':
  Enabling shadows again.
parents e7e4e24a c87bfbd2

packages/SystemUI/res/values/dimens.xml

+5 −2
Original line number Diff line number Diff line
@@ -221,10 +221,13 @@ 
    <dimen name="recents_task_view_rounded_corners_radius">2dp</dimen>



    <!-- The min translation in the Z index for the last task. -->

    <dimen name="recents_task_view_z_min">3dp</dimen>

    <dimen name="recents_task_view_z_min">5dp</dimen>



    <!-- The translation in the Z index for each task above the last task. -->

    <dimen name="recents_task_view_z_increment">5dp</dimen>

    <dimen name="recents_task_view_z_increment">10dp</dimen>



    <!-- The amount of bottom inset in the shadow outline. -->

    <dimen name="recents_task_view_shadow_outline_bottom_inset">5dp</dimen>



    <!-- The amount to translate when animating the removal of a task. -->

    <dimen name="recents_task_view_remove_anim_translation_x">100dp</dimen>

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

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public class Constants { 
            // Enables the search bar layout

            public static final boolean EnableSearchLayout = true;

            // Enables the dynamic shadows behind each task

            public static final boolean EnableShadows = false;

            public static final boolean EnableShadows = true;

            // This disables the bitmap and icon caches

            public static final boolean DisableBackgroundCache = false;

            // For debugging, this enables us to create mock recents tasks

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

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ public class RecentsConfiguration { 
    public int taskViewRemoveAnimTranslationXPx;

    public int taskViewTranslationZMinPx;

    public int taskViewTranslationZIncrementPx;

    public int taskViewShadowOutlineBottomInsetPx;

    public int taskViewRoundedCornerRadiusPx;

    public int searchBarSpaceHeightPx;
@@ -132,6 +133,8 @@ public class RecentsConfiguration { 
        taskViewTranslationZMinPx = res.getDimensionPixelSize(R.dimen.recents_task_view_z_min);

        taskViewTranslationZIncrementPx =

                res.getDimensionPixelSize(R.dimen.recents_task_view_z_increment);

        taskViewShadowOutlineBottomInsetPx =

                res.getDimensionPixelSize(R.dimen.recents_task_view_shadow_outline_bottom_inset);

        searchBarSpaceHeightPx = res.getDimensionPixelSize(R.dimen.recents_search_bar_space_height);



        taskBarViewDefaultBackgroundColor =

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

+4 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ public class SwipeHelper { 
                if (FADE_OUT_DURING_SWIPE && canAnimViewBeDismissed) {

                    view.setAlpha(getAlphaForOffset(view));

                }

                mCallback.onSwipeChanged(mCurrView, view.getTranslationX());

            }

        });

        anim.addListener(new AnimatorListenerAdapter() {
@@ -313,6 +314,7 @@ public class SwipeHelper { 
                if (mCurrView != null) {

                    float delta = getPos(ev) - mInitialTouchPos;

                    setSwipeAmount(delta);

                    mCallback.onSwipeChanged(mCurrView, delta);

                }

                break;

            case MotionEvent.ACTION_UP:
@@ -393,6 +395,8 @@ public class SwipeHelper { 


        void onBeginDrag(View v);



        void onSwipeChanged(View v, float delta);



        void onChildDismissed(View v);



        void onSnapBackCompleted(View v);

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

+5 −0
Original line number Diff line number Diff line
@@ -1555,6 +1555,11 @@ class TaskStackViewTouchHandler implements SwipeHelper.Callback { 
        }

    }



    @Override

    public void onSwipeChanged(View v, float delta) {

        // Do nothing

    }



    @Override

    public void onChildDismissed(View v) {

        TaskView tv = (TaskView) v;