Renamed Activity class multi-window APIs
As requested by API council.
Bug: 26507736
Change-Id: I8911c0b969ae05b686bea1dc26feba12cd074e6a
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayActivity.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayActivity.java
index 27052b4..a0ea5fd 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayActivity.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayActivity.java
@@ -20,7 +20,7 @@
import java.util.List;
public class PlaybackOverlayActivity extends Activity {
- private List<PictureInPictureModeListener> mListeners = new ArrayList<>();
+ private List<PictureInPictureListener> mListeners = new ArrayList<>();
/** Called when the activity is first created. */
@Override
@@ -31,21 +31,21 @@
}
@Override
- public void onPictureInPictureModeChanged(boolean pictureInPictureMode) {
- for (PictureInPictureModeListener listener : mListeners) {
- listener.onPictureInPictureModeChanged(pictureInPictureMode);
+ public void onPictureInPictureChanged(boolean inPictureInPicture) {
+ for (PictureInPictureListener listener : mListeners) {
+ listener.onPictureInPictureChanged(inPictureInPicture);
}
}
- public void registerPictureInPictureModeListener(PictureInPictureModeListener listener) {
+ public void registerPictureInPictureListener(PictureInPictureListener listener) {
mListeners.add(listener);
}
- public void unregisterPictureInPictureModeListener(PictureInPictureModeListener listener) {
+ public void unregisterPictureInPictureListener(PictureInPictureListener listener) {
mListeners.remove(listener);
}
- public interface PictureInPictureModeListener {
- void onPictureInPictureModeChanged(boolean pictureInPictureMode);
+ public interface PictureInPictureListener {
+ void onPictureInPictureChanged(boolean inPictureInPicture);
}
}
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayFragment.java
index 58659f1..849189e 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayFragment.java
@@ -44,7 +44,7 @@
public class PlaybackOverlayFragment
extends android.support.v17.leanback.app.PlaybackOverlayFragment
- implements PlaybackOverlayActivity.PictureInPictureModeListener {
+ implements PlaybackOverlayActivity.PictureInPictureListener {
private static final String TAG = "leanback.PlaybackControlsFragment";
/**
@@ -127,7 +127,7 @@
@Override
public void onActionClicked(Action action) {
if (action.getId() == R.id.lb_control_picture_in_picture) {
- getActivity().enterPictureInPictureMode();
+ getActivity().enterPictureInPicture();
return;
}
super.onActionClicked(action);
@@ -171,19 +171,19 @@
super.onStart();
mGlue.setFadingEnabled(true);
mGlue.enableProgressUpdating(mGlue.hasValidMedia() && mGlue.isMediaPlaying());
- ((PlaybackOverlayActivity) getActivity()).registerPictureInPictureModeListener(this);
+ ((PlaybackOverlayActivity) getActivity()).registerPictureInPictureListener(this);
}
@Override
public void onStop() {
mGlue.enableProgressUpdating(false);
- ((PlaybackOverlayActivity) getActivity()).unregisterPictureInPictureModeListener(this);
+ ((PlaybackOverlayActivity) getActivity()).unregisterPictureInPictureListener(this);
super.onStop();
}
@Override
- public void onPictureInPictureModeChanged(boolean pictureInPictureMode) {
- if (pictureInPictureMode) {
+ public void onPictureInPictureChanged(boolean inPictureInPicture) {
+ if (inPictureInPicture) {
// 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 56f4cad..75e3c1b 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java
@@ -22,7 +22,7 @@
import java.util.List;
public class PlaybackOverlaySupportActivity extends FragmentActivity {
- private List<PictureInPictureModeListener> mListeners = new ArrayList<>();
+ private List<PictureInPictureListener> mListeners = new ArrayList<>();
/** Called when the activity is first created. */
@Override
@@ -33,21 +33,21 @@
}
@Override
- public void onPictureInPictureModeChanged(boolean pictureInPictureMode) {
- for (PictureInPictureModeListener listener : mListeners) {
- listener.onPictureInPictureModeChanged(pictureInPictureMode);
+ public void onPictureInPictureChanged(boolean inPictureInPicture) {
+ for (PictureInPictureListener listener : mListeners) {
+ listener.onPictureInPictureChanged(inPictureInPicture);
}
}
- public void registerPictureInPictureModeListener(PictureInPictureModeListener listener) {
+ public void registerPictureInPictureListener(PictureInPictureListener listener) {
mListeners.add(listener);
}
- public void unregisterPictureInPictureModeListener(PictureInPictureModeListener listener) {
+ public void unregisterPictureInPictureListener(PictureInPictureListener listener) {
mListeners.remove(listener);
}
- public interface PictureInPictureModeListener {
- void onPictureInPictureModeChanged(boolean pictureInPictureMode);
+ public interface PictureInPictureListener {
+ void onPictureInPictureChanged(boolean inPictureInPicture);
}
}
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportFragment.java
index 2c0306d..2480f3b 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportFragment.java
@@ -46,7 +46,7 @@
public class PlaybackOverlaySupportFragment
extends android.support.v17.leanback.app.PlaybackOverlaySupportFragment
- implements PlaybackOverlaySupportActivity.PictureInPictureModeListener {
+ implements PlaybackOverlaySupportActivity.PictureInPictureListener {
private static final String TAG = "leanback.PlaybackControlsFragment";
/**
@@ -129,7 +129,7 @@
@Override
public void onActionClicked(Action action) {
if (action.getId() == R.id.lb_control_picture_in_picture) {
- getActivity().enterPictureInPictureMode();
+ getActivity().enterPictureInPicture();
return;
}
super.onActionClicked(action);
@@ -173,20 +173,20 @@
super.onStart();
mGlue.setFadingEnabled(true);
mGlue.enableProgressUpdating(mGlue.hasValidMedia() && mGlue.isMediaPlaying());
- ((PlaybackOverlaySupportActivity) getActivity()).registerPictureInPictureModeListener(this);
+ ((PlaybackOverlaySupportActivity) getActivity()).registerPictureInPictureListener(this);
}
@Override
public void onStop() {
mGlue.enableProgressUpdating(false);
- ((PlaybackOverlaySupportActivity) getActivity()).unregisterPictureInPictureModeListener(
+ ((PlaybackOverlaySupportActivity) getActivity()).unregisterPictureInPictureListener(
this);
super.onStop();
}
@Override
- public void onPictureInPictureModeChanged(boolean pictureInPictureMode) {
- if (pictureInPictureMode) {
+ public void onPictureInPictureChanged(boolean inPictureInPicture) {
+ if (inPictureInPicture) {
// Hide the controls in picture-in-picture mode.
setFadingEnabled(true);
fadeOut();
