PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update dark theme to have new screen

Browse Source 
The dark theme preference should have it's own screen rather than
being a dialog. This adds some boilerplate code that will be
needed for the illustration as well as converting the current
list preference to open a new screen.

Test: robotests
Bug: 128686189
Change-Id: I5b62276353c0d39ad2ad00d21d2280e76cceb09b
This commit is contained in:
Salvador Martinez
2019-03-20 10:52:52 -07:00
parent 12256ca49f
commit 1053ec04b4
10 changed files with 433 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java
View File

@@ -18,6 +18,10 @@ package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
@@ -29,6 +33,8 @@ import android.media.MediaPlayer;
import android.view.LayoutInflater;
import android.view.TextureView;
import android.view.View;
import android.widget.ImageView;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
@@ -45,8 +51,13 @@ import org.robolectric.RuntimeEnvironment;
public class VideoPreferenceTest {
private static final int VIDEO_WIDTH = 100;
private static final int VIDEO_HEIGHT = 150;
@Mock
private MediaPlayer mMediaPlayer;
@Mock
private ImageView fakePreview;
@Mock
private ImageView fakePlayButton;
private Context mContext;
private VideoPreference mVideoPreference;
private PreferenceViewHolder mPreferenceViewHolder;
@@ -83,8 +94,8 @@ public class VideoPreferenceTest {
(TextureView) mPreferenceViewHolder.findViewById(R.id.video_texture_view);
mVideoPreference.mAnimationAvailable = true;
mVideoPreference.mVideoReady = true;
mVideoPreference.onBindViewHolder(mPreferenceViewHolder);
mVideoPreference.onViewInvisible();
mVideoPreference.onBindViewHolder(mPreferenceViewHolder);
when(mMediaPlayer.isPlaying()).thenReturn(false);
final TextureView.SurfaceTextureListener listener = video.getSurfaceTextureListener();
@@ -101,4 +112,30 @@ public class VideoPreferenceTest {
verify(mMediaPlayer).release();
}
@Test
public void updateViewStates_paused_updatesViews() {
when(mMediaPlayer.isPlaying()).thenReturn(true);
mVideoPreference.updateViewStates(fakePreview, fakePlayButton);
verify(fakePlayButton).setVisibility(eq(View.VISIBLE));
verify(fakePreview).setVisibility(eq(View.VISIBLE));
verify(mMediaPlayer).pause();
}
@Test
public void updateViewStates_playing_updatesViews() {
when(mMediaPlayer.isPlaying()).thenReturn(false);
mVideoPreference.updateViewStates(fakePreview, fakePlayButton);
verify(fakePlayButton).setVisibility(eq(View.GONE));
verify(fakePreview).setVisibility(eq(View.GONE));
verify(mMediaPlayer).start();
}
@Test
public void updateViewStates_noMediaPlayer_skips() {
mVideoPreference.mMediaPlayer = null;
mVideoPreference.updateViewStates(fakePreview, fakePlayButton);
verify(fakePlayButton, never()).setVisibility(anyInt());
verify(fakePreview, never()).setVisibility(anyInt());
}
}