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

Commit 95cdb3a0 authored by Tony Wickham's avatar Tony Wickham
Browse files

Remove scrim on highlighted spring-loaded panel. 

Bug: 27135377
Change-Id: I470955ed082a45ae7dc5f8fdd1f3decb2b573dbc
parent 16466f1b

res/drawable/bg_celllayout.xml

+4 −3
Original line number Diff line number Diff line
@@ -22,13 +22,14 @@ 


    <item>

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

            <solid android:color="#3fffffff" />

            <solid android:color="@color/spring_loaded_panel_color" />

        </shape>

    </item>

    <item>

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

            <solid android:color="#3fffffff" />

            <stroke android:width="1dp" android:color="#fff" />

            <stroke

                android:width="@dimen/spring_loaded_panel_border"

                android:color="@color/spring_loaded_highlighted_panel_border_color" />

        </shape>

    </item>

res/values/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ 
    <color name="outline_color">#FFFFFFFF</color>

    <color name="launcher_accent_color">#ff009688</color>



    <color name="spring_loaded_panel_color">#40FFFFFF</color>

    <color name="spring_loaded_highlighted_panel_border_color">#FFF</color>



    <!-- Containers -->

    <color name="container_fastscroll_thumb_inactive_color">#009688</color>

    <color name="container_fastscroll_thumb_active_color">#009688</color>

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -134,6 +134,8 @@ 


    <dimen name="drag_flingToDeleteMinVelocity">-1500dp</dimen>



    <dimen name="spring_loaded_panel_border">1dp</dimen>



<!-- Theme -->

    <dimen name="quantum_panel_outer_padding">4dp</dimen>

src/com/android/launcher3/Hotseat.java

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public class Hotseat extends FrameLayout 
        mHasVerticalHotseat = mLauncher.getDeviceProfile().isVerticalBarLayout();

    }



    CellLayout getLayout() {

    public CellLayout getLayout() {

        return mContent;

    }

src/com/android/launcher3/PagedView.java

+9 −3
Original line number Diff line number Diff line
@@ -625,6 +625,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 


    // we moved this functionality to a helper function so SmoothPagedView can reuse it

    protected boolean computeScrollHelper() {

        return computeScrollHelper(true);

    }



    protected boolean computeScrollHelper(boolean shouldInvalidate) {

        if (mScroller.computeScrollOffset()) {

            // Don't bother scrolling if the page does not need to be moved

            if (getScrollX() != mScroller.getCurrX()
@@ -633,9 +637,11 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 
                int scrollX = (int) (mScroller.getCurrX() * (1 / scaleX));

                scrollTo(scrollX, mScroller.getCurrY());

            }

            if (shouldInvalidate) {

                invalidate();

            }

            return true;

        } else if (mNextPage != INVALID_PAGE) {

        } else if (mNextPage != INVALID_PAGE && shouldInvalidate) {

            sendScrollAccessibilityEvent();



            mCurrentPage = validateNewPage(mNextPage);