diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/view/KeyEvent.java | 46 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 2 | ||||
| -rw-r--r-- | media/java/android/media/AudioManager.java | 3 | ||||
| -rw-r--r-- | media/java/android/media/session/MediaSession.java | 2 |
6 files changed, 26 insertions, 30 deletions
diff --git a/api/current.txt b/api/current.txt index f329a3878996..f1b5459513b1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -49201,7 +49201,6 @@ package android.view { method public final boolean isFunctionPressed(); method public static final boolean isGamepadButton(int); method public final boolean isLongPress(); - method public static final boolean isMediaSessionKey(int); method public final boolean isMetaPressed(); method public static boolean isModifierKey(int); method public final boolean isNumLockOn(); diff --git a/api/system-current.txt b/api/system-current.txt index beacace402a6..04bddc1f6dc5 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -231,7 +231,6 @@ package android { } public static final class R.dimen { - field public static final int config_mediaMetadataBitmapMaxSize = 17104904; // 0x1050008 field public static final int config_restrictedIconSize = 17104903; // 0x1050007 } @@ -3495,7 +3494,6 @@ package android.media { field public static final int AUDIOFOCUS_FLAG_DELAY_OK = 1; // 0x1 field public static final int AUDIOFOCUS_FLAG_LOCK = 4; // 0x4 field public static final int AUDIOFOCUS_FLAG_PAUSES_ON_DUCKABLE_LOSS = 2; // 0x2 - field public static final int FLAG_FROM_KEY = 65536; // 0x10000 field public static final int SUCCESS = 0; // 0x0 } diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index f700d32fa797..87dd5b47c448 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -1806,28 +1806,6 @@ public class KeyEvent extends InputEvent implements Parcelable { } /** - * Returns whether this key will be sent to the - * {@link android.media.session.MediaSession.Callback} if not handled. - */ - public static final boolean isMediaSessionKey(int keyCode) { - switch (keyCode) { - case KeyEvent.KEYCODE_MEDIA_PLAY: - case KeyEvent.KEYCODE_MEDIA_PAUSE: - case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE: - case KeyEvent.KEYCODE_MUTE: - case KeyEvent.KEYCODE_HEADSETHOOK: - case KeyEvent.KEYCODE_MEDIA_STOP: - case KeyEvent.KEYCODE_MEDIA_NEXT: - case KeyEvent.KEYCODE_MEDIA_PREVIOUS: - case KeyEvent.KEYCODE_MEDIA_REWIND: - case KeyEvent.KEYCODE_MEDIA_RECORD: - case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: - return true; - } - return false; - } - - /** * Returns true if the specified keycode is a gamepad button. * @return True if the keycode is a gamepad button, such as {@link #KEYCODE_BUTTON_A}. */ @@ -1886,6 +1864,30 @@ public class KeyEvent extends InputEvent implements Parcelable { } } + /** + * Returns whether this key will be sent to the + * {@link android.media.session.MediaSession.Callback} if not handled. + * + * @hide + */ + public static final boolean isMediaSessionKey(int keyCode) { + switch (keyCode) { + case KeyEvent.KEYCODE_MEDIA_PLAY: + case KeyEvent.KEYCODE_MEDIA_PAUSE: + case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE: + case KeyEvent.KEYCODE_MUTE: + case KeyEvent.KEYCODE_HEADSETHOOK: + case KeyEvent.KEYCODE_MEDIA_STOP: + case KeyEvent.KEYCODE_MEDIA_NEXT: + case KeyEvent.KEYCODE_MEDIA_PREVIOUS: + case KeyEvent.KEYCODE_MEDIA_REWIND: + case KeyEvent.KEYCODE_MEDIA_RECORD: + case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: + return true; + } + return false; + } + /** Is this a system key? System keys can not be used for menu shortcuts. * @hide */ diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 840cd63cee67..3505994060d8 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3006,8 +3006,6 @@ <public-group type="dimen" first-id="0x01050007"> <!-- @hide @SystemApi --> <public name="config_restrictedIconSize" /> - <!-- @hide @SystemApi --> - <public name="config_mediaMetadataBitmapMaxSize" /> </public-group> <public-group type="color" first-id="0x0106001c"> diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 669baeadad65..7783a4d6c869 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -553,8 +553,7 @@ public class AudioManager { * request is from a hardware key press. (e.g. {@link MediaController}). * @hide */ - @SystemApi - public static final int FLAG_FROM_KEY = 1 << 16; + public static final int FLAG_FROM_KEY = 1 << 12; // The iterator of TreeMap#entrySet() returns the entries in ascending key order. private static final TreeMap<Integer, String> FLAG_NAMES = new TreeMap<>(); diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java index e0cb86e04183..c4f8b79354e7 100644 --- a/media/java/android/media/session/MediaSession.java +++ b/media/java/android/media/session/MediaSession.java @@ -166,7 +166,7 @@ public final class MediaSession { SessionLink sessionLink = manager.createSession(cbLink, tag, sessionInfo); mImpl = new MediaSessionEngine(context, sessionLink, cbLink); mMaxBitmapSize = context.getResources().getDimensionPixelSize( - android.R.dimen.config_mediaMetadataBitmapMaxSize); + com.android.internal.R.dimen.config_mediaMetadataBitmapMaxSize); } catch (RuntimeException e) { throw new RuntimeException("Remote error creating session.", e); } |