VideoView2/MediaControlView2: Remove overriden onKeyDown/dispatchKeyEvent (0511cdbc) · Commits · e / os / android_frameworks_av

packages/MediaComponents/src/com/android/widget/MediaControlView2Impl.java

+0 −52

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.media.update.MediaControlView2Provider;
		import android.media.update.ViewProvider;
		import android.os.Bundle;
		import android.util.Log;
		import android.view.KeyEvent;
		import android.view.MotionEvent;
		import android.view.View;
		import android.view.ViewGroup;
		@@ -307,62 +306,11 @@ public class MediaControlView2Impl implements MediaControlView2Provider {
		return false;
		}

		@Override
		public boolean onKeyDown_impl(int keyCode, KeyEvent event) {
		return mSuperProvider.onKeyDown_impl(keyCode, event);
		}

		@Override
		public void onFinishInflate_impl() {
		mSuperProvider.onFinishInflate_impl();
		}

		@Override
		public boolean dispatchKeyEvent_impl(KeyEvent event) {
		int keyCode = event.getKeyCode();
		final boolean uniqueDown = event.getRepeatCount() == 0
		&& event.getAction() == KeyEvent.ACTION_DOWN;
		if (keyCode == KeyEvent.KEYCODE_HEADSETHOOK
		\|\| keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE
		\|\| keyCode == KeyEvent.KEYCODE_SPACE) {
		if (uniqueDown) {
		togglePausePlayState();
		mInstance.show(DEFAULT_TIMEOUT_MS);
		if (mPlayPauseButton != null) {
		mPlayPauseButton.requestFocus();
		}
		}
		return true;
		} else if (keyCode == KeyEvent.KEYCODE_MEDIA_PLAY) {
		if (uniqueDown && !isPlaying()) {
		togglePausePlayState();
		mInstance.show(DEFAULT_TIMEOUT_MS);
		}
		return true;
		} else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP
		\|\| keyCode == KeyEvent.KEYCODE_MEDIA_PAUSE) {
		if (uniqueDown && isPlaying()) {
		togglePausePlayState();
		mInstance.show(DEFAULT_TIMEOUT_MS);
		}
		return true;
		} else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN
		\|\| keyCode == KeyEvent.KEYCODE_VOLUME_UP
		\|\| keyCode == KeyEvent.KEYCODE_VOLUME_MUTE
		\|\| keyCode == KeyEvent.KEYCODE_CAMERA) {
		// don't show the controls for volume adjustment
		return mSuperProvider.dispatchKeyEvent_impl(event);
		} else if (keyCode == KeyEvent.KEYCODE_BACK \|\| keyCode == KeyEvent.KEYCODE_MENU) {
		if (uniqueDown) {
		mInstance.hide();
		}
		return true;
		}

		mInstance.show(DEFAULT_TIMEOUT_MS);
		return mSuperProvider.dispatchKeyEvent_impl(event);
		}

		@Override
		public void setEnabled_impl(boolean enabled) {
		if (mPlayPauseButton != null) {

packages/MediaComponents/src/com/android/widget/VideoView2Impl.java

+0 −48

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ import android.support.annotation.Nullable;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.view.Gravity;
		import android.view.KeyEvent;
		import android.view.MotionEvent;
		import android.view.View;
		import android.widget.FrameLayout.LayoutParams;
		@@ -395,58 +394,11 @@ public class VideoView2Impl implements VideoView2Provider, VideoViewInterface.Su
		return mSuperProvider.onTrackballEvent_impl(ev);
		}

		@Override
		public boolean onKeyDown_impl(int keyCode, KeyEvent event) {
		Log.v(TAG, "onKeyDown_impl: " + keyCode);
		boolean isKeyCodeSupported = keyCode != KeyEvent.KEYCODE_BACK
		&& keyCode != KeyEvent.KEYCODE_VOLUME_UP
		&& keyCode != KeyEvent.KEYCODE_VOLUME_DOWN
		&& keyCode != KeyEvent.KEYCODE_VOLUME_MUTE
		&& keyCode != KeyEvent.KEYCODE_MENU
		&& keyCode != KeyEvent.KEYCODE_CALL
		&& keyCode != KeyEvent.KEYCODE_ENDCALL;
		if (isInPlaybackState() && isKeyCodeSupported && mMediaControlView != null) {
		if (keyCode == KeyEvent.KEYCODE_HEADSETHOOK
		\|\| keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE) {
		if (mMediaPlayer.isPlaying()) {
		mMediaController.getTransportControls().pause();
		mMediaControlView.show();
		} else {
		mMediaController.getTransportControls().play();
		mMediaControlView.hide();
		}
		return true;
		} else if (keyCode == KeyEvent.KEYCODE_MEDIA_PLAY) {
		if (!mMediaPlayer.isPlaying()) {
		mMediaController.getTransportControls().play();
		mMediaControlView.hide();
		}
		return true;
		} else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP
		\|\| keyCode == KeyEvent.KEYCODE_MEDIA_PAUSE) {
		if (mMediaPlayer.isPlaying()) {
		mMediaController.getTransportControls().pause();
		mMediaControlView.show();
		}
		return true;
		} else {
		toggleMediaControlViewVisibility();
		}
		}

		return mSuperProvider.onKeyDown_impl(keyCode, event);
		}

		@Override
		public void onFinishInflate_impl() {
		mSuperProvider.onFinishInflate_impl();
		}

		@Override
		public boolean dispatchKeyEvent_impl(KeyEvent event) {
		return mSuperProvider.dispatchKeyEvent_impl(event);
		}

		@Override
		public void setEnabled_impl(boolean enabled) {
		mSuperProvider.setEnabled_impl(enabled);