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

Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 am: 2c3ee203bf am: f2755520a1

Browse Source 
Change-Id: Ia42aae3bf00ba46dfac23c2172d4d5abbee3ef7d
This commit is contained in:
Automerger Merge Worker
2020-03-13 04:14:44 +00:00
parent 12cebe28c4 f2755520a1
commit 5616591d2b
3 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,6 @@ import android.view.LayoutInflater;
import android.view.TextureView;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceViewHolder;
@@ -61,8 +60,6 @@ public class VideoPreferenceTest {
private ImageView fakePreview;
@Mock
private ImageView fakePlayButton;
@Mock
private LinearLayout mAnimationView;
private Context mContext;
private VideoPreference mVideoPreference;
@@ -77,7 +74,6 @@ public class VideoPreferenceTest {
new MediaAnimationController(mContext, R.raw.accessibility_screen_magnification));
mVideoPreference = new VideoPreference(mContext, null /* attrs */);
mVideoPreference.mAnimationController = mAnimationController;
mVideoPreference.mAnimationView = mAnimationView;
when(mAnimationController.getVideoWidth()).thenReturn(VIDEO_WIDTH);
when(mAnimationController.getVideoHeight()).thenReturn(VIDEO_HEIGHT);
@@ -162,13 +158,6 @@ public class VideoPreferenceTest {
assertThat(vp2.mAnimationController instanceof VectorAnimationController).isTrue();
}
@Test
public void setBackgroundColor_shouldBeCalled() {
mVideoPreference.setBackgroundColor(1111);
assertThat(mVideoPreference.mBackgroundResId).isEqualTo(1111);
}
public static class TestFragment extends PreferenceFragmentCompat {
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {