Fix battery animation not being played.

- VideoPreference now checks the view visible flag to see if it
should start playing the video when the surface texture is being
updated. Added a default controller for the VideoPreference to
update the view visible flag of the VideoPrefernece when the
setting page is paused/resumed accordingly.
- add the default controller to the adaptive battery video and the
adaptive brightness video.

Change-Id: I1aae2148c27c7157c97541346790542c74377e5a
Fixes: 111103815
Test: make RunSettingsRoboTests
This commit is contained in:
Doris Ling
2018-07-19 13:53:27 -07:00
parent e64020540c
commit 09f527d053
4 changed files with 146 additions and 2 deletions

View File

@@ -23,8 +23,10 @@
<com.android.settings.widget.VideoPreference <com.android.settings.widget.VideoPreference
android:key="auto_brightness_video" android:key="auto_brightness_video"
android:title="@string/summary_placeholder"
settings:animation="@raw/aab_brightness" settings:animation="@raw/aab_brightness"
settings:preview="@drawable/aab_brightness"/> settings:preview="@drawable/aab_brightness"
settings:controller="com.android.settings.widget.VideoPreferenceController"/>
<!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml --> <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
<com.android.settingslib.RestrictedSwitchPreference <com.android.settingslib.RestrictedSwitchPreference

View File

@@ -23,8 +23,10 @@
<com.android.settings.widget.VideoPreference <com.android.settings.widget.VideoPreference
android:key="auto_awesome_battery" android:key="auto_awesome_battery"
android:title="@string/summary_placeholder"
settings:animation="@raw/auto_awesome_battery" settings:animation="@raw/auto_awesome_battery"
settings:preview="@drawable/auto_awesome_battery"/> settings:preview="@drawable/auto_awesome_battery"
settings:controller="com.android.settings.widget.VideoPreferenceController"/>
<SwitchPreference <SwitchPreference
android:key="smart_battery" android:key="smart_battery"

View File

@@ -0,0 +1,64 @@
/*
* Copyright (C) 2018 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.widget;
import android.content.Context;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import androidx.preference.PreferenceScreen;
public class VideoPreferenceController extends BasePreferenceController implements
LifecycleObserver, OnResume, OnPause {
private VideoPreference mVideoPreference;
private boolean mVideoPaused;
public VideoPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@Override
public int getAvailabilityStatus() {
return AVAILABLE_UNSEARCHABLE;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mVideoPreference = (VideoPreference) screen.findPreference(getPreferenceKey());
}
@Override
public void onPause() {
if (mVideoPreference != null) {
mVideoPaused = mVideoPreference.isVideoPaused();
mVideoPreference.onViewInvisible();
}
}
@Override
public void onResume() {
if (mVideoPreference != null) {
mVideoPreference.onViewVisible(mVideoPaused);
}
}
}

View File

@@ -0,0 +1,76 @@
/*
* Copyright (C) 2018 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.widget;
import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import androidx.preference.PreferenceScreen;
@RunWith(RobolectricTestRunner.class)
public class VideoPreferenceControllerTest {
@Mock
private VideoPreference mPreference;
@Mock
private PreferenceScreen mScreen;
private VideoPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mController = new VideoPreferenceController(RuntimeEnvironment.application, "test_pref");
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
@Test
public void getAvailabilityStatus_isAlwaysAvailable() {
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
}
@Test
public void onPause_shouldCallOnViewInvisibleOnPrefernece() {
mController.displayPreference(mScreen);
mController.onPause();
verify(mPreference).onViewInvisible();
}
@Test
public void onResume_shouldCallOnViewVisibleOnPrefernece() {
mController.displayPreference(mScreen);
mController.onResume();
verify(mPreference).onViewVisible(anyBoolean());
}
}