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

Merge "Prevent Magnification video from being paused by the user and automatically pause the video on onPause and resume in onResume. b/26984643 b/26705583" into nyc-dev

Browse Source
This commit is contained in:
Anna Galusza
2016-02-18 23:45:00 +00:00
committed by Android (Google) Code Review
parent 672b51ba3b 082d977653
commit 47f3115fbc
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,7 @@ public class ToggleScreenMagnificationPreferenceFragment
view.setDividerAllowedBelow(false); view.setDividerAllowedBelow(false);
final RelativeLayout background = final RelativeLayout background =
(RelativeLayout) view.findViewById(R.id.video_background); (RelativeLayout) view.findViewById(R.id.video_background);
final VideoView videoView = (VideoView) view.findViewById(R.id.video); VideoView videoView = (VideoView) view.findViewById(R.id.video);
// Hacky adjustment for using VideoView in recycle view and positioning // Hacky adjustment for using VideoView in recycle view and positioning
// it on the background image // it on the background image
@@ -98,7 +98,8 @@ public class ToggleScreenMagnificationPreferenceFragment
ContentResolver.SCHEME_ANDROID_RESOURCE, ContentResolver.SCHEME_ANDROID_RESOURCE,
getPrefContext().getPackageName(), getPrefContext().getPackageName(),
R.raw.accessibility_screen_magnification))); R.raw.accessibility_screen_magnification)));
videoView.setMediaController(new MediaController(getPrefContext())); // Make sure video controls (e.g. for pausing) are not displayed.
videoView.setMediaController(null);
videoView.start(); videoView.start();
} }
} }
@@ -149,6 +150,11 @@ public class ToggleScreenMagnificationPreferenceFragment
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 0) { Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 0) {
setMagnificationEnabled(1); setMagnificationEnabled(1);
} }
VideoView videoView = (VideoView) getView().findViewById(R.id.video);
if (videoView != null) {
videoView.start();
}
} }
@Override @Override