Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tarandeep Singh
2017-08-31 20:45:48 +00:00
committed by Android (Google) Code Review
parent 30175b958e c9c83a9ccb
commit 01b6ff0178
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/policy/DecorView.java
View File

@@ -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;

6
core/java/com/android/internal/widget/FloatingToolbar.java
View File

@@ -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());
}

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

@@ -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;