Merge "VideoView2/MediaControlView2: Remove overriden onKeyDown/dispatchKeyEvent" (2c13ebf8) · Commits · e / os / android_frameworks_base

core/java/android/widget/MediaControlView2.java

+0 −21

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.media.update.ApiLoader;
		import android.media.update.MediaControlView2Provider;
		import android.media.update.ViewProvider;
		import android.util.AttributeSet;
		import android.view.KeyEvent;
		import android.view.MotionEvent;
		import android.view.View;

		@@ -210,21 +209,11 @@ public class MediaControlView2 extends FrameLayout {
		return mProvider.onTrackballEvent_impl(ev);
		}

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

		@Override
		public void onFinishInflate() {
		mProvider.onFinishInflate_impl();
		}

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

		@Override
		public void setEnabled(boolean enabled) {
		mProvider.setEnabled_impl(enabled);
		@@ -256,21 +245,11 @@ public class MediaControlView2 extends FrameLayout {
		return MediaControlView2.super.onTrackballEvent(ev);
		}

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

		@Override
		public void onFinishInflate_impl() {
		MediaControlView2.super.onFinishInflate();
		}

		@Override
		public boolean dispatchKeyEvent_impl(KeyEvent event) {
		return MediaControlView2.super.dispatchKeyEvent(event);
		}

		@Override
		public void setEnabled_impl(boolean enabled) {
		MediaControlView2.super.setEnabled(enabled);

+0 −21

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import android.media.update.ViewProvider;
		import android.net.Uri;
		import android.os.Bundle;
		import android.util.AttributeSet;
		import android.view.KeyEvent;
		import android.view.MotionEvent;
		import android.view.View;

		@@ -511,21 +510,11 @@ public class VideoView2 extends FrameLayout {
		return mProvider.onTrackballEvent_impl(ev);
		}

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

		@Override
		public void onFinishInflate() {
		mProvider.onFinishInflate_impl();
		}

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

		@Override
		public void setEnabled(boolean enabled) {
		mProvider.setEnabled_impl(enabled);
		@@ -557,21 +546,11 @@ public class VideoView2 extends FrameLayout {
		return VideoView2.super.onTrackballEvent(ev);
		}

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

		@Override
		public void onFinishInflate_impl() {
		VideoView2.super.onFinishInflate();
		}

		@Override
		public boolean dispatchKeyEvent_impl(KeyEvent event) {
		return VideoView2.super.dispatchKeyEvent(event);
		}

		@Override
		public void setEnabled_impl(boolean enabled) {
		VideoView2.super.setEnabled(enabled);

+0 −4

Original line number	Diff line number	Diff line
		@@ -17,8 +17,6 @@
		package android.media.update;

		import android.annotation.SystemApi;
		import android.graphics.Canvas;
		import android.view.KeyEvent;
		import android.view.MotionEvent;

		/**
		@@ -42,8 +40,6 @@ public interface ViewProvider {
		CharSequence getAccessibilityClassName_impl();
		boolean onTouchEvent_impl(MotionEvent ev);
		boolean onTrackballEvent_impl(MotionEvent ev);
		boolean onKeyDown_impl(int keyCode, KeyEvent event);
		void onFinishInflate_impl();
		boolean dispatchKeyEvent_impl(KeyEvent event);
		void setEnabled_impl(boolean enabled);
		}