Settings: Respect preference's visibility in VideoPreferenceController

* Since AbstractPreferenceController's displayPreference()
  sets the visibility based on isAvailable() we need to
  set mVideoPreference early and make getAvailabilityStatus()
  return UNSUPPORTED_ON_DEVICE if needed.

Test: manual, open battery manager
Change-Id: Ibf72971b49fa1162fb99f9fc61cbb54ba39a2dfa
This commit is contained in:
LuK1337
2019-10-09 16:08:12 +02:00
parent 19ffddb811
commit 9c3ab97182
3 changed files with 31 additions and 3 deletions

View File

@@ -80,6 +80,7 @@ public class VideoPreference extends Preference {
try {
// if these are already set that means they were set dynamically and don't need
// to be loaded from xml
mAnimationAvailable = false;
mAnimationId = mAnimationId == 0
? attributes.getResourceId(R.styleable.VideoPreference_animation, 0)
: mAnimationId;
@@ -91,6 +92,7 @@ public class VideoPreference extends Preference {
? attributes.getResourceId(R.styleable.VideoPreference_preview, 0)
: mPreviewResource;
if (mPreviewResource == 0 && mAnimationId == 0) {
setVisible(false);
return;
}
initMediaPlayer();
@@ -250,6 +252,10 @@ public class VideoPreference extends Preference {
}
}
public boolean isAnimationAvailable() {
return mAnimationAvailable;
}
public boolean isVideoPaused() {
return mVideoPaused;
}

View File

@@ -37,13 +37,14 @@ public class VideoPreferenceController extends BasePreferenceController implemen
@Override
public int getAvailabilityStatus() {
return AVAILABLE_UNSEARCHABLE;
return mVideoPreference.isAnimationAvailable() ?
AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mVideoPreference = screen.findPreference(getPreferenceKey());
super.displayPreference(screen);
}
@Override