Merge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev (9275814c) · Commits · e / os / android_packages_apps_Settings

res/values/attrs.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -138,12 +138,6 @@
		<attr name="allowDividerBelow" format="boolean" />
		</declare-styleable>

		<!-- For GesturePreference -->
		<declare-styleable name="GesturePreference">
		<attr name="animation" format="reference" />
		<attr name="preview" format="reference" />
		</declare-styleable>

		<declare-styleable name="VideoPreference">
		<attr name="animation" format="reference" />
		<attr name="preview" format="reference" />

src/com/android/settings/gestures/GesturePreference.java

deleted100644 → 0

+0 −188

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
		* except in compliance with the License. You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software distributed under the
		* License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
		* KIND, either express or implied. See the License for the specific language governing
		* permissions and limitations under the License.
		*/

		package com.android.settings.gestures;

		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.res.TypedArray;
		import android.graphics.SurfaceTexture;
		import android.media.MediaPlayer;
		import android.net.Uri;
		import android.support.v14.preference.SwitchPreference;
		import android.support.v7.preference.PreferenceViewHolder;
		import android.view.View;
		import android.view.Surface;
		import android.view.TextureView;
		import android.widget.ImageView;
		import android.util.AttributeSet;
		import android.util.Log;

		import com.android.settings.R;

		/**
		* Preference item for a gesture with a switch to signify if it should be enabled.
		* This shows the title and description of the gesture along with an animation showing how to do
		* the gesture
		*/
		public final class GesturePreference extends SwitchPreference {
		private static final String TAG = "GesturePreference";
		private final Context mContext;

		private Uri mVideoPath;
		private MediaPlayer mMediaPlayer;
		private boolean mAnimationAvailable;
		private boolean mVideoReady;
		private boolean mScrolling;
		private int mPreviewResource;

		public GesturePreference(Context context, AttributeSet attrs) {
		super(context, attrs);
		mContext = context;
		TypedArray attributes = context.getTheme().obtainStyledAttributes(
		attrs,
		R.styleable.GesturePreference,
		0, 0);
		try {
		int animation = attributes.getResourceId(R.styleable.GesturePreference_animation, 0);
		mVideoPath = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
		.authority(context.getPackageName())
		.appendPath(String.valueOf(animation))
		.build();
		mMediaPlayer = MediaPlayer.create(mContext, mVideoPath);
		if (mMediaPlayer != null && mMediaPlayer.getDuration() > 0) {
		setLayoutResource(R.layout.gesture_preference);

		mPreviewResource = attributes.getResourceId(
		R.styleable.GesturePreference_preview, 0);

		mMediaPlayer.setOnSeekCompleteListener(new MediaPlayer.OnSeekCompleteListener() {
		@Override
		public void onSeekComplete(MediaPlayer mp) {
		mVideoReady = true;
		}
		});

		mMediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
		@Override
		public void onPrepared(MediaPlayer mediaPlayer) {
		mediaPlayer.setLooping(true);
		}
		});
		mAnimationAvailable = true;
		}
		} catch (Exception e) {
		Log.w(TAG, "Animation resource not found. Will not show animation.");
		} finally {
		attributes.recycle();
		}
		}

		@Override
		public void onBindViewHolder(PreferenceViewHolder holder) {
		super.onBindViewHolder(holder);

		if (!mAnimationAvailable) {
		return;
		}

		final TextureView video = (TextureView) holder.findViewById(R.id.gesture_video);
		final ImageView imageView = (ImageView) holder.findViewById(R.id.gesture_image);
		imageView.setImageResource(mPreviewResource);
		final ImageView playButton = (ImageView) holder.findViewById(R.id.gesture_play_button);

		video.setOnClickListener(new View.OnClickListener() {
		@Override
		public void onClick(View v) {
		if (mMediaPlayer != null) {
		if (mMediaPlayer.isPlaying()) {
		mMediaPlayer.pause();
		playButton.setVisibility(View.VISIBLE);
		} else {
		mMediaPlayer.start();
		playButton.setVisibility(View.GONE);
		}
		}
		}
		});

		video.setSurfaceTextureListener(new TextureView.SurfaceTextureListener() {
		@Override
		public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int width,
		int height) {
		if (mMediaPlayer != null) {
		mMediaPlayer.setSurface(new Surface(surfaceTexture));
		mVideoReady = false;
		mMediaPlayer.seekTo(0);
		}
		}

		@Override
		public void onSurfaceTextureSizeChanged(SurfaceTexture surfaceTexture, int width,
		int height) {
		}

		@Override
		public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) {
		imageView.setVisibility(View.VISIBLE);
		return false;
		}

		@Override
		public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture) {
		if (mVideoReady && imageView.getVisibility() == View.VISIBLE) {
		imageView.setVisibility(View.GONE);
		} else if (mScrolling) {
		mScrolling = false;
		if (mMediaPlayer != null && mMediaPlayer.isPlaying()) {
		mMediaPlayer.pause();
		playButton.setVisibility(View.VISIBLE);
		}
		}
		if (mMediaPlayer != null && !mMediaPlayer.isPlaying() &&
		playButton.getVisibility() != View.VISIBLE) {
		playButton.setVisibility(View.VISIBLE);
		}
		}
		});

		}

		@Override
		public void onDetached() {
		if (mMediaPlayer != null) {
		mMediaPlayer.stop();
		mMediaPlayer.reset();
		mMediaPlayer.release();
		}
		super.onDetached();
		}

		void setScrolling(boolean scrolling) {
		mScrolling = scrolling;
		}

		void onViewVisible() {
		if (mVideoReady && mMediaPlayer != null && !mMediaPlayer.isPlaying()) {
		mMediaPlayer.seekTo(0);
		}
		}

		void onViewInvisible() {
		if (mMediaPlayer != null && mMediaPlayer.isPlaying()) {
		mMediaPlayer.pause();
		}
		}

		}

src/com/android/settings/gestures/GesturePreferenceController.java

+8 −9

Original line number	Diff line number	Diff line
		@@ -30,19 +30,20 @@ import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.core.lifecycle.Lifecycle;
		import com.android.settingslib.core.lifecycle.LifecycleObserver;
		import com.android.settingslib.core.lifecycle.events.OnCreate;
		import com.android.settingslib.core.lifecycle.events.OnPause;
		import com.android.settingslib.core.lifecycle.events.OnResume;
		import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
		import com.android.settingslib.core.lifecycle.events.OnStart;
		import com.android.settingslib.core.lifecycle.events.OnStop;

		public abstract class GesturePreferenceController extends AbstractPreferenceController
		implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
		LifecycleObserver, OnStart, OnStop, OnCreate, OnSaveInstanceState {
		LifecycleObserver, OnResume, OnPause, OnCreate, OnSaveInstanceState {

		@VisibleForTesting
		static final String KEY_VIDEO_PAUSED = "key_video_paused";

		private VideoPreference mVideoPreference;
		private boolean mVideoPaused;
		@VisibleForTesting
		boolean mVideoPaused;

		public GesturePreferenceController(Context context, Lifecycle lifecycle) {
		super(context);
		@@ -85,21 +86,19 @@ public abstract class GesturePreferenceController extends AbstractPreferenceCont

		@Override
		public void onSaveInstanceState(Bundle outState) {
		if (mVideoPreference != null) {
		mVideoPaused = mVideoPreference.isVideoPaused();
		}
		outState.putBoolean(KEY_VIDEO_PAUSED, mVideoPaused);
		}

		@Override
		public void onStop() {
		public void onPause() {
		if (mVideoPreference != null) {
		mVideoPaused = mVideoPreference.isVideoPaused();
		mVideoPreference.onViewInvisible();
		}
		}

		@Override
		public void onStart() {
		public void onResume() {
		if (mVideoPreference != null) {
		mVideoPreference.onViewVisible(mVideoPaused);
		}

src/com/android/settings/widget/VideoPreference.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -134,8 +134,10 @@ public class VideoPreference extends Preference {

		@Override
		public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture) {
		if (mVideoReady && imageView.getVisibility() == View.VISIBLE) {
		if (mVideoReady) {
		if (imageView.getVisibility() == View.VISIBLE) {
		imageView.setVisibility(View.GONE);
		}
		if (!mVideoPaused && mMediaPlayer != null && !mMediaPlayer.isPlaying()) {
		mMediaPlayer.start();
		playButton.setVisibility(View.GONE);

tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java

+22 −10

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.robolectric.annotation.Config;

		import static com.google.common.truth.Truth.assertThat;
		import static org.mockito.Matchers.any;
		import static org.mockito.Matchers.anyString;
		import static org.mockito.Mockito.mock;
		@@ -86,7 +87,7 @@ public class GesturePreferenceControllerTest {
		}

		@Test
		public void onStart_shouldStartVideoPreferenceWithVideoPauseState() {
		public void onResume_shouldStartVideoPreferenceWithVideoPauseState() {
		final VideoPreference videoPreference = mock(VideoPreference.class);
		when(mScreen.findPreference(mController.getVideoPrefKey())).thenReturn(videoPreference);
		mController.mIsPrefAvailable = true;
		@@ -95,48 +96,59 @@ public class GesturePreferenceControllerTest {
		final Bundle savedState = new Bundle();

		mController.onCreate(null);
		mController.onStart();
		mController.onResume();
		verify(videoPreference).onViewVisible(false);

		reset(videoPreference);
		savedState.putBoolean(mController.KEY_VIDEO_PAUSED, true);
		mController.onCreate(savedState);
		mController.onStart();
		mController.onResume();
		verify(videoPreference).onViewVisible(true);

		reset(videoPreference);
		savedState.putBoolean(mController.KEY_VIDEO_PAUSED, false);
		mController.onCreate(savedState);
		mController.onStart();
		mController.onResume();
		verify(videoPreference).onViewVisible(false);
		}

		@Test
		public void onStop_shouldStopVideoPreference() {
		public void onPause_shouldStopVideoPreference() {
		final VideoPreference videoPreference = mock(VideoPreference.class);
		when(mScreen.findPreference(mController.getVideoPrefKey())).thenReturn(videoPreference);
		mController.mIsPrefAvailable = true;

		mController.displayPreference(mScreen);
		mController.onStop();
		mController.onPause();

		verify(videoPreference).onViewInvisible();
		}

		@Test
		public void onSaveInstanceState_shouldSaveVideoPauseState() {
		public void onPause_shouldUpdateVideoPauseState() {
		final VideoPreference videoPreference = mock(VideoPreference.class);
		when(mScreen.findPreference(mController.getVideoPrefKey())).thenReturn(videoPreference);
		mController.mIsPrefAvailable = true;
		mController.displayPreference(mScreen);
		final Bundle outState = mock(Bundle.class);

		when(videoPreference.isVideoPaused()).thenReturn(true);
		mController.onPause();
		assertThat(mController.mVideoPaused).isTrue();

		when(videoPreference.isVideoPaused()).thenReturn(false);
		mController.onPause();
		assertThat(mController.mVideoPaused).isFalse();
		}

		@Test
		public void onSaveInstanceState_shouldSaveVideoPauseState() {
		final Bundle outState = mock(Bundle.class);

		mController.mVideoPaused = true;
		mController.onSaveInstanceState(outState);
		verify(outState).putBoolean(mController.KEY_VIDEO_PAUSED, true);

		reset(outState);
		when(videoPreference.isVideoPaused()).thenReturn(false);
		mController.mVideoPaused = false;
		mController.onSaveInstanceState(outState);
		verify(outState).putBoolean(mController.KEY_VIDEO_PAUSED, false);
		}