LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor usages of Picture In Picture and Multi Window (4/4)

Browse Source 
Bug: 27365860
Change-Id: I488fbc9fc8035fa06e6a68c117a58cc35749cc7c
This commit is contained in:
Andrii Kulian
2016-03-29 17:34:18 -07:00
parent 2eef746496
commit 701c15f00d
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/MultiWindow/src/com/example/android/multiwindow/CaptionOverlayActivity.java
View File

@@ -40,7 +40,7 @@ public class CaptionOverlayActivity extends Activity
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
// Overlay the caption on the content. // Overlay the caption on the content.
overlayWithDecorCaption(true); setOverlayWithDecorCaptionEnabled(true);
setContentView(R.layout.caption_overlay_layout); setContentView(R.layout.caption_overlay_layout);
getWindow().setRestrictedCaptionAreaListener(this); getWindow().setRestrictedCaptionAreaListener(this);
getWindow().setResizingCaptionDrawable(new ColorDrawable(Color.BLACK)); getWindow().setResizingCaptionDrawable(new ColorDrawable(Color.BLACK));

6
samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayActivity.java
View File

@@ -31,9 +31,9 @@ public class PlaybackOverlayActivity extends Activity {
} }
@Override @Override
public void onPictureInPictureChanged(boolean inPictureInPicture) { public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
for (PictureInPictureListener listener : mListeners) { for (PictureInPictureListener listener : mListeners) {
listener.onPictureInPictureChanged(inPictureInPicture); listener.onPictureInPictureModeChanged(isInPictureInPictureMode);
} }
} }
@@ -46,6 +46,6 @@ public class PlaybackOverlayActivity extends Activity {
} }
public interface PictureInPictureListener { public interface PictureInPictureListener {
void onPictureInPictureChanged(boolean inPictureInPicture); void onPictureInPictureModeChanged(boolean isInPictureInPictureMode);
} }
} }

6
samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayFragment.java
View File

@@ -127,7 +127,7 @@ public class PlaybackOverlayFragment
@Override @Override
public void onActionClicked(Action action) { public void onActionClicked(Action action) {
if (action.getId() == R.id.lb_control_picture_in_picture) { if (action.getId() == R.id.lb_control_picture_in_picture) {
getActivity().enterPictureInPicture(); getActivity().enterPictureInPictureMode();
return; return;
} }
super.onActionClicked(action); super.onActionClicked(action);
@@ -182,8 +182,8 @@ public class PlaybackOverlayFragment
} }
@Override @Override
public void onPictureInPictureChanged(boolean inPictureInPicture) { public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
if (inPictureInPicture) { if (isInPictureInPictureMode) {
// Hide the controls in picture-in-picture mode. // Hide the controls in picture-in-picture mode.
setFadingEnabled(true); setFadingEnabled(true);
fadeOut(); fadeOut();

6
samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java
View File

@@ -33,9 +33,9 @@ public class PlaybackOverlaySupportActivity extends FragmentActivity {
} }
@Override @Override
public void onPictureInPictureChanged(boolean inPictureInPicture) { public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
for (PictureInPictureListener listener : mListeners) { for (PictureInPictureListener listener : mListeners) {
listener.onPictureInPictureChanged(inPictureInPicture); listener.onPictureInPictureModeChanged(isInPictureInPictureMode);
} }
} }
@@ -48,6 +48,6 @@ public class PlaybackOverlaySupportActivity extends FragmentActivity {
} }
public interface PictureInPictureListener { public interface PictureInPictureListener {
void onPictureInPictureChanged(boolean inPictureInPicture); void onPictureInPictureModeChanged(boolean isInPictureInPicture);
} }
} }

6
samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportFragment.java
View File

@@ -129,7 +129,7 @@ public class PlaybackOverlaySupportFragment
@Override @Override
public void onActionClicked(Action action) { public void onActionClicked(Action action) {
if (action.getId() == R.id.lb_control_picture_in_picture) { if (action.getId() == R.id.lb_control_picture_in_picture) {
getActivity().enterPictureInPicture(); getActivity().enterPictureInPictureMode();
return; return;
} }
super.onActionClicked(action); super.onActionClicked(action);
@@ -184,8 +184,8 @@ public class PlaybackOverlaySupportFragment
} }
@Override @Override
public void onPictureInPictureChanged(boolean inPictureInPicture) { public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
if (inPictureInPicture) { if (isInPictureInPictureMode) {
// Hide the controls in picture-in-picture mode. // Hide the controls in picture-in-picture mode.
setFadingEnabled(true); setFadingEnabled(true);
fadeOut(); fadeOut();