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

Commit 0472d496 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Change NavBar to transparent black b/30615471" into ub-launcher3-calgary

parents 37aba27b 4ebc3d07

res/layout/all_apps.xml

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

        android:layout_height="0dp"

        android:layout_gravity="bottom"

        android:background="@android:color/black"

        android:elevation="16dp"

        android:background="@color/all_apps_navbar_color"

        android:focusable="false"

        android:visibility="invisible" />

</com.android.launcher3.allapps.AllAppsContainerView>
 
 No newline at end of file

res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
    <color name="all_apps_caret_color">#FFFFFFFF</color>

    <color name="all_apps_caret_shadow_color">#22000000</color>

    <color name="all_apps_container_color">#FFF2F2F2</color>

    <color name="all_apps_navbar_color">#28000000</color>



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

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

src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java

+5 −4
Original line number Diff line number Diff line
@@ -136,11 +136,11 @@ public class BaseRecyclerViewFastScrollBar { 
    // Setter/getter for the track bar width for animations

    public void setTrackWidth(int width) {

        mInvalidateRect.set(mThumbOffset.x - mThumbCurvature, 0, mThumbOffset.x + mThumbWidth,

                mRv.getHeight());

                mRv.getVisibleHeight());

        mTrackWidth = width;

        updateThumbPath();

        mInvalidateRect.union(mThumbOffset.x - mThumbCurvature, 0, mThumbOffset.x + mThumbWidth,

                mRv.getHeight());

                mRv.getVisibleHeight());

        mRv.invalidate(mInvalidateRect);

    }
@@ -198,7 +198,7 @@ public class BaseRecyclerViewFastScrollBar { 
                if (mIsDragging) {

                    // Update the fastscroller section name at this touch position

                    int top = mRv.getBackgroundPadding().top;

                    int bottom = mRv.getHeight() - mRv.getBackgroundPadding().bottom - mThumbHeight;

                    int bottom = top + mRv.getVisibleHeight() - mThumbHeight;

                    float boundedY = (float) Math.max(top, Math.min(bottom, y - mTouchOffset));

                    String sectionName = mRv.scrollToPositionAtProgress((boundedY - top) /

                            (bottom - top));
@@ -230,7 +230,8 @@ public class BaseRecyclerViewFastScrollBar { 


        // Draw the scroll bar track and thumb

        if (mTrackPaint.getAlpha() > 0) {

            canvas.drawRect(mThumbOffset.x, 0, mThumbOffset.x + mThumbWidth, mRv.getHeight(), mTrackPaint);

            canvas.drawRect(mThumbOffset.x, 0, mThumbOffset.x + mThumbWidth,

                    mRv.getVisibleHeight(), mTrackPaint);

        }

        canvas.drawPath(mThumbPath, mThumbPaint);

src/com/android/launcher3/BaseRecyclerViewFastScrollPopup.java

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ public class BaseRecyclerViewFastScrollPopup { 
            }

            mBgBounds.top = lastTouchY - (int) (FAST_SCROLL_OVERLAY_Y_OFFSET_FACTOR * bgHeight);

            mBgBounds.top = Math.max(edgePadding,

                    Math.min(mBgBounds.top, mRv.getHeight() - edgePadding - bgHeight));

                    Math.min(mBgBounds.top, mRv.getVisibleHeight() - edgePadding - bgHeight));

            mBgBounds.bottom = mBgBounds.top + bgHeight;



            // Generate a bitmap for a shadow matching these bounds

src/com/android/launcher3/allapps/AllAppsContainerView.java

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc 
                MarginLayoutParams mlp = (MarginLayoutParams) mAppsRecyclerView.getLayoutParams();



                Rect insets = mLauncher.getDragLayer().getInsets();

                getContentView().setPadding(0, 0, 0, insets.bottom);

                getContentView().setPadding(0, 0, 0, 0);

                int height = insets.top + grid.hotseatCellHeightPx;



                mlp.topMargin = height;