Merge "Prevent gaining audio focus when opening magnification screen." into oc-dev am: 93799e8758
am: d26d3e77a3
Change-Id: Ie7e2a1b947f3ba42209a77f824d7b4754fc0ce1b
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index c6dc7a7..37a32d5 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -20,6 +20,7 @@
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Point;
+import android.media.AudioManager;
import android.media.MediaPlayer;
import android.media.MediaPlayer.OnPreparedListener;
import android.net.Uri;
@@ -76,6 +77,9 @@
}
});
+ // Make sure the VideoView does not request audio focus.
+ videoView.setAudioFocusRequest(AudioManager.AUDIOFOCUS_NONE);
+
// Resolve and set the video content
Bundle args = getArguments();
if ((args != null) && args.containsKey(
@@ -85,6 +89,7 @@
getPrefContext().getPackageName(),
args.getInt(AccessibilitySettings.EXTRA_VIDEO_RAW_RESOURCE_ID))));
}
+
// Make sure video controls (e.g. for pausing) are not displayed.
videoView.setMediaController(null);