Fix gesture preview image visibility not set correctly.
- update for the preview image is done only in onStart()/Stop(). Move the handling to onPause()/onResume() instead so that visibility updates will also be done when switching between pages. - remove the obsolete GesturePreference class. Change-Id: I743a9d41f17aab3303201e11e5bba708ca5810ae Fix: 63783217 Test: make RunSettingsRoboTests
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user