From 701c15f00dc8dbc71a05733f04eb190c27fb500f Mon Sep 17 00:00:00 2001 From: Andrii Kulian Date: Tue, 29 Mar 2016 17:34:18 -0700 Subject: [PATCH] Refactor usages of Picture In Picture and Multi Window (4/4) Bug: 27365860 Change-Id: I488fbc9fc8035fa06e6a68c117a58cc35749cc7c --- .../example/android/multiwindow/CaptionOverlayActivity.java | 2 +- .../example/android/leanback/PlaybackOverlayActivity.java | 6 +++--- .../example/android/leanback/PlaybackOverlayFragment.java | 6 +++--- .../android/leanback/PlaybackOverlaySupportActivity.java | 6 +++--- .../android/leanback/PlaybackOverlaySupportFragment.java | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/samples/MultiWindow/src/com/example/android/multiwindow/CaptionOverlayActivity.java b/samples/MultiWindow/src/com/example/android/multiwindow/CaptionOverlayActivity.java index ddb4b60e4..40ba539a6 100644 --- a/samples/MultiWindow/src/com/example/android/multiwindow/CaptionOverlayActivity.java +++ b/samples/MultiWindow/src/com/example/android/multiwindow/CaptionOverlayActivity.java @@ -40,7 +40,7 @@ public class CaptionOverlayActivity extends Activity public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); // Overlay the caption on the content. - overlayWithDecorCaption(true); + setOverlayWithDecorCaptionEnabled(true); setContentView(R.layout.caption_overlay_layout); getWindow().setRestrictedCaptionAreaListener(this); getWindow().setResizingCaptionDrawable(new ColorDrawable(Color.BLACK)); diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayActivity.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayActivity.java index a0ea5fd23..764b1696e 100644 --- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayActivity.java +++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayActivity.java @@ -31,9 +31,9 @@ public class PlaybackOverlayActivity extends Activity { } @Override - public void onPictureInPictureChanged(boolean inPictureInPicture) { + public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) { for (PictureInPictureListener listener : mListeners) { - listener.onPictureInPictureChanged(inPictureInPicture); + listener.onPictureInPictureModeChanged(isInPictureInPictureMode); } } @@ -46,6 +46,6 @@ public class PlaybackOverlayActivity extends Activity { } public interface PictureInPictureListener { - void onPictureInPictureChanged(boolean inPictureInPicture); + void onPictureInPictureModeChanged(boolean isInPictureInPictureMode); } } diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayFragment.java index 849189eb5..c918774ad 100644 --- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayFragment.java +++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayFragment.java @@ -127,7 +127,7 @@ public class PlaybackOverlayFragment @Override public void onActionClicked(Action action) { if (action.getId() == R.id.lb_control_picture_in_picture) { - getActivity().enterPictureInPicture(); + getActivity().enterPictureInPictureMode(); return; } super.onActionClicked(action); @@ -182,8 +182,8 @@ public class PlaybackOverlayFragment } @Override - public void onPictureInPictureChanged(boolean inPictureInPicture) { - if (inPictureInPicture) { + public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) { + if (isInPictureInPictureMode) { // Hide the controls in picture-in-picture mode. setFadingEnabled(true); fadeOut(); diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java index 75e3c1b6c..f965b3794 100644 --- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java +++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java @@ -33,9 +33,9 @@ public class PlaybackOverlaySupportActivity extends FragmentActivity { } @Override - public void onPictureInPictureChanged(boolean inPictureInPicture) { + public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) { for (PictureInPictureListener listener : mListeners) { - listener.onPictureInPictureChanged(inPictureInPicture); + listener.onPictureInPictureModeChanged(isInPictureInPictureMode); } } @@ -48,6 +48,6 @@ public class PlaybackOverlaySupportActivity extends FragmentActivity { } public interface PictureInPictureListener { - void onPictureInPictureChanged(boolean inPictureInPicture); + void onPictureInPictureModeChanged(boolean isInPictureInPicture); } } diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportFragment.java index cbe61ae6b..e8ea8f5f5 100644 --- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportFragment.java +++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportFragment.java @@ -129,7 +129,7 @@ public class PlaybackOverlaySupportFragment @Override public void onActionClicked(Action action) { if (action.getId() == R.id.lb_control_picture_in_picture) { - getActivity().enterPictureInPicture(); + getActivity().enterPictureInPictureMode(); return; } super.onActionClicked(action); @@ -184,8 +184,8 @@ public class PlaybackOverlaySupportFragment } @Override - public void onPictureInPictureChanged(boolean inPictureInPicture) { - if (inPictureInPicture) { + public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) { + if (isInPictureInPictureMode) { // Hide the controls in picture-in-picture mode. setFadingEnabled(true); fadeOut();