PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent gaining audio focus when opening magnification screen." into oc-dev

Browse Source 
am: 93799e8758

Change-Id: I53c70dcd4986588819f1d7a36337392c4c74748c
This commit is contained in:
Noah Wang
2017-04-13 04:07:11 +00:00
committed by android-build-merger
parent 6fa685e4da 93799e8758
commit d26d3e77a3
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
View File

@@ -20,6 +20,7 @@ import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Point; import android.graphics.Point;
import android.media.AudioManager;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.media.MediaPlayer.OnPreparedListener; import android.media.MediaPlayer.OnPreparedListener;
import android.net.Uri; import android.net.Uri;
@@ -76,6 +77,9 @@ public class ToggleScreenMagnificationPreferenceFragment extends
} }
}); });
// Make sure the VideoView does not request audio focus.
videoView.setAudioFocusRequest(AudioManager.AUDIOFOCUS_NONE);
// Resolve and set the video content // Resolve and set the video content
Bundle args = getArguments(); Bundle args = getArguments();
if ((args != null) && args.containsKey( if ((args != null) && args.containsKey(
@@ -85,6 +89,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
getPrefContext().getPackageName(), getPrefContext().getPackageName(),
args.getInt(AccessibilitySettings.EXTRA_VIDEO_RAW_RESOURCE_ID)))); args.getInt(AccessibilitySettings.EXTRA_VIDEO_RAW_RESOURCE_ID))));
} }
// Make sure video controls (e.g. for pausing) are not displayed. // Make sure video controls (e.g. for pausing) are not displayed.
videoView.setMediaController(null); videoView.setMediaController(null);