Merge "Settings: Respect preference's visibility in VideoPreferenceController" am: 0e40f46fe2

am: 447674e100

Change-Id: I9680dc02dc96fc324b019c027d08271fb27b4506

src/com/android/settings/widget/VideoPreference.java

@@ -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;
     }

src/com/android/settings/widget/VideoPreferenceController.java

@@ -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