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

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

Browse Source 
* commit 'd86d7bce78a5f6e70bdac8f6d4bb1a968d440128':
  Use action mode context for ActionMode menu inflater
This commit is contained in:
Alan Viverette
2014-10-29 22:55:09 +00:00
committed by Android Git Automerger
parent 0904509ff8 d86d7bce78
commit b2449a399b
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,
outValue, true);
final int targetThemeRes = outValue.resourceId;
if (targetThemeRes != 0 && mContext.getThemeResId() != targetThemeRes) {
mThemedContext = new ContextThemeWrapper(mContext, targetThemeRes);
} else {
@@ -885,7 +885,7 @@ public class WindowDecorActionBar extends ActionBar implements
}
return mThemedContext;
}
@Override
public boolean 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 {
private final Context mActionModeContext;
private final MenuBuilder mMenu;
private ActionMode.Callback mCallback;
private MenuBuilder mMenu;
private WeakReference<View> mCustomView;
public ActionModeImpl(Context context, ActionMode.Callback callback) {
mActionModeContext = context;
mCallback = callback;
mMenu = new MenuBuilder(context)
.setDefaultShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
@@ -949,7 +952,7 @@ public class WindowDecorActionBar extends ActionBar implements
@Override
public MenuInflater getMenuInflater() {
return new MenuInflater(getThemedContext());
return new MenuInflater(mActionModeContext);
}
@Override
@@ -1042,7 +1045,7 @@ public class WindowDecorActionBar extends ActionBar implements
public CharSequence getSubtitle() {
return mContextView.getSubtitle();
}
@Override
public void setTitleOptionalHint(boolean titleOptional) {
super.setTitleOptionalHint(titleOptional);