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

Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev

Browse Source
This commit is contained in:
Alan Viverette
2014-10-29 21:14:55 +00:00
committed by Android (Google) Code Review
parent 85d6f29994 3abf5c4bd1
commit d86d7bce78
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/com/android/internal/app/WindowDecorActionBar.java
View File

@@ -876,7 +876,7 @@ public class WindowDecorActionBar extends ActionBar implements
currentTheme.resolveAttribute(com.android.internal.R.attr.actionBarWidgetTheme, currentTheme.resolveAttribute(com.android.internal.R.attr.actionBarWidgetTheme,
outValue, true); outValue, true);
final int targetThemeRes = outValue.resourceId; final int targetThemeRes = outValue.resourceId;
if (targetThemeRes != 0 && mContext.getThemeResId() != targetThemeRes) { if (targetThemeRes != 0 && mContext.getThemeResId() != targetThemeRes) {
mThemedContext = new ContextThemeWrapper(mContext, targetThemeRes); mThemedContext = new ContextThemeWrapper(mContext, targetThemeRes);
} else { } else {
@@ -885,7 +885,7 @@ public class WindowDecorActionBar extends ActionBar implements
} }
return mThemedContext; return mThemedContext;
} }
@Override @Override
public boolean isTitleTruncated() { public boolean isTitleTruncated() {
return mDecorToolbar != null && mDecorToolbar.isTitleTruncated(); return mDecorToolbar != null && mDecorToolbar.isTitleTruncated();
@@ -933,14 +933,17 @@ public class WindowDecorActionBar extends ActionBar implements
} }
/** /**
* @hide * @hide
*/ */
public class ActionModeImpl extends ActionMode implements MenuBuilder.Callback { public class ActionModeImpl extends ActionMode implements MenuBuilder.Callback {
private final Context mActionModeContext;
private final MenuBuilder mMenu;
private ActionMode.Callback mCallback; private ActionMode.Callback mCallback;
private MenuBuilder mMenu;
private WeakReference<View> mCustomView; private WeakReference<View> mCustomView;
public ActionModeImpl(Context context, ActionMode.Callback callback) { public ActionModeImpl(Context context, ActionMode.Callback callback) {
mActionModeContext = context;
mCallback = callback; mCallback = callback;
mMenu = new MenuBuilder(context) mMenu = new MenuBuilder(context)
.setDefaultShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); .setDefaultShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
@@ -949,7 +952,7 @@ public class WindowDecorActionBar extends ActionBar implements
@Override @Override
public MenuInflater getMenuInflater() { public MenuInflater getMenuInflater() {
return new MenuInflater(getThemedContext()); return new MenuInflater(mActionModeContext);
} }
@Override @Override
@@ -1042,7 +1045,7 @@ public class WindowDecorActionBar extends ActionBar implements
public CharSequence getSubtitle() { public CharSequence getSubtitle() {
return mContextView.getSubtitle(); return mContextView.getSubtitle();
} }
@Override @Override
public void setTitleOptionalHint(boolean titleOptional) { public void setTitleOptionalHint(boolean titleOptional) {
super.setTitleOptionalHint(titleOptional); super.setTitleOptionalHint(titleOptional);