Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47f3115f authored by Anna Galusza's avatar Anna Galusza Committed by Android (Google) Code Review
Browse files

Merge "Prevent Magnification video from being paused by the user and... 

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
parents 672b51ba 082d9776

src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java

+8 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public class ToggleScreenMagnificationPreferenceFragment 
            view.setDividerAllowedBelow(false);

            final RelativeLayout 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

            // it on the background image
@@ -98,7 +98,8 @@ public class ToggleScreenMagnificationPreferenceFragment 
                    ContentResolver.SCHEME_ANDROID_RESOURCE,

                    getPrefContext().getPackageName(),

                    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();

        }

    }
@@ -149,6 +150,11 @@ public class ToggleScreenMagnificationPreferenceFragment 
                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 0) {

            setMagnificationEnabled(1);

        }



        VideoView videoView = (VideoView) getView().findViewById(R.id.video);

        if (videoView != null) {

            videoView.start();

        }

    }



    @Override