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

Commit 379f158b authored by Tarandeep Singh's avatar Tarandeep Singh Committed by android-build-merger
Browse files

Merge "Add multi-display support to FloatingToolbar." into oc-mr1-dev am: 01b6ff01 

am: a040bae5

Change-Id: I29cea04f2a2401ee8aa50794db3612216e50a29c
parents fe12d97a a040bae5

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

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

            mFloatingActionMode.finish();

        }

        }

        cleanupFloatingActionModeViews();

        cleanupFloatingActionModeViews();

        mFloatingToolbar = new FloatingToolbar(mContext, mWindow);

        mFloatingToolbar = new FloatingToolbar(mWindow);

        final FloatingActionMode mode =

        final FloatingActionMode mode =

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

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

        mFloatingActionModeOriginatingView = originatingView;

        mFloatingActionModeOriginatingView = originatingView;

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

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

    /**

     * Initializes a floating toolbar.

     * Initializes a floating toolbar.

     */

     */

    public FloatingToolbar(Context context, Window window) {

    public FloatingToolbar(Window window) {

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

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

        // supports multi-display.

        mContext = applyDefaultTheme(window.getContext());

        mWindow = Preconditions.checkNotNull(window);

        mWindow = Preconditions.checkNotNull(window);

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

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

    }

    }

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

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

            mFloatingActionMode.finish();

        }

        }

        cleanupFloatingActionModeViews();

        cleanupFloatingActionModeViews();

        mFloatingToolbar = new FloatingToolbar(mContext, mFakeWindow);

        mFloatingToolbar = new FloatingToolbar(mFakeWindow);

        final FloatingActionMode mode =

        final FloatingActionMode mode =

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

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

        mFloatingActionModeOriginatingView = originatingView;

        mFloatingActionModeOriginatingView = originatingView;