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

Commit 01b6ff01 authored by Tarandeep Singh's avatar Tarandeep Singh Committed by Android (Google) Code Review
Browse files

Merge "Add multi-display support to FloatingToolbar." into oc-mr1-dev

parents 30175b95 c9c83a9c

core/java/com/android/internal/policy/DecorView.java

+1 −1
Original line number Diff line number Diff line
@@ -1812,7 +1812,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
            mFloatingActionMode.finish();

        }

        cleanupFloatingActionModeViews();

        mFloatingToolbar = new FloatingToolbar(mContext, mWindow);

        mFloatingToolbar = new FloatingToolbar(mWindow);

        final FloatingActionMode mode =

                new FloatingActionMode(mContext, callback, originatingView, mFloatingToolbar);

        mFloatingActionModeOriginatingView = originatingView;

core/java/com/android/internal/widget/FloatingToolbar.java

+4 −2
Original line number Diff line number Diff line
@@ -120,8 +120,10 @@ public final class FloatingToolbar { 
    /**

     * Initializes a floating toolbar.

     */

    public FloatingToolbar(Context context, Window window) {

        mContext = applyDefaultTheme(Preconditions.checkNotNull(context));

    public FloatingToolbar(Window window) {

        // TODO(b/65172902): Pass context in constructor when DecorView (and other callers)

        // supports multi-display.

        mContext = applyDefaultTheme(window.getContext());

        mWindow = Preconditions.checkNotNull(window);

        mPopup = new FloatingToolbarPopup(mContext, window.getDecorView());

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ public class StatusBarWindowView extends FrameLayout { 
            mFloatingActionMode.finish();

        }

        cleanupFloatingActionModeViews();

        mFloatingToolbar = new FloatingToolbar(mContext, mFakeWindow);

        mFloatingToolbar = new FloatingToolbar(mFakeWindow);

        final FloatingActionMode mode =

                new FloatingActionMode(mContext, callback, originatingView, mFloatingToolbar);

        mFloatingActionModeOriginatingView = originatingView;