diff options
| -rw-r--r-- | core/java/android/widget/Editor.java | 9 | ||||
| -rw-r--r-- | media/java/android/media/tv/TvView.java | 9 | ||||
| -rw-r--r-- | tools/aapt/Command.cpp | 1 |
3 files changed, 18 insertions, 1 deletions
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index 66c4b81e8533..58f98013ee8a 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -19,6 +19,7 @@ package android.widget; import android.content.UndoManager; import android.content.UndoOperation; import android.content.UndoOwner; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.InputFilter; @@ -26,6 +27,7 @@ import android.text.SpannableString; import com.android.internal.util.ArrayUtils; import com.android.internal.util.GrowingArrayUtils; +import com.android.internal.view.menu.MenuBuilder; import com.android.internal.widget.EditableInputConnection; import android.R; @@ -2810,7 +2812,12 @@ public class Editor { @Override public boolean onCreateActionMode(ActionMode mode, Menu menu) { - TypedArray styledAttributes = mTextView.getContext().obtainStyledAttributes( + final boolean legacy = mTextView.getContext().getApplicationInfo().targetSdkVersion < + Build.VERSION_CODES.L; + final Context context = !legacy && menu instanceof MenuBuilder ? + ((MenuBuilder) menu).getContext() : + mTextView.getContext(); + final TypedArray styledAttributes = context.obtainStyledAttributes( com.android.internal.R.styleable.SelectionModeDrawables); mode.setTitle(mTextView.getContext().getString( diff --git a/media/java/android/media/tv/TvView.java b/media/java/android/media/tv/TvView.java index 66daf87fc929..591f5430fbd9 100644 --- a/media/java/android/media/tv/TvView.java +++ b/media/java/android/media/tv/TvView.java @@ -78,6 +78,10 @@ public class TvView extends ViewGroup { private static final int ZORDER_MEDIA_OVERLAY = 1; private static final int ZORDER_ON_TOP = 2; + private static final int CAPTION_DEFAULT = 0; + private static final int CAPTION_ENABLED = 1; + private static final int CAPTION_DISABLED = 2; + private static final Object sMainTvViewLock = new Object(); private static TvView sMainTvView; @@ -107,6 +111,7 @@ public class TvView extends ViewGroup { private int mSurfaceViewRight; private int mSurfaceViewTop; private int mSurfaceViewBottom; + private int mCaptionEnabled; private final SurfaceHolder.Callback mSurfaceHolderCallback = new SurfaceHolder.Callback() { @Override @@ -353,6 +358,7 @@ public class TvView extends ViewGroup { * @param enabled {@code true} to enable, {@code false} to disable. */ public void setCaptionEnabled(boolean enabled) { + mCaptionEnabled = enabled ? CAPTION_ENABLED : CAPTION_DISABLED; if (mSession != null) { mSession.setCaptionEnabled(enabled); } @@ -832,6 +838,9 @@ public class TvView extends ViewGroup { } } createSessionOverlayView(); + if (mCaptionEnabled != CAPTION_DEFAULT) { + mSession.setCaptionEnabled(mCaptionEnabled == CAPTION_ENABLED); + } mSession.tune(mChannelUri, mTuneParams); if (mHasStreamVolume) { mSession.setStreamVolume(mStreamVolume); diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index 755a77ab19c1..ccbdadd9418c 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -752,6 +752,7 @@ int doDump(Bundle* bundle) config.screenWidthDp = 320; config.screenHeightDp = 480; config.smallestScreenWidthDp = 320; + config.screenLayout |= ResTable_config::SCREENSIZE_NORMAL; assets.setConfiguration(config); const ResTable& res = assets.getResources(false); |