commit 2f881d6f8628ec40c0b8b2e91a6c669f80d3cc7f
author Dake Gu <dake@google.com> Tue Apr 12 02:12:48 2016 +0000
committer Dake Gu <dake@google.com> Tue Apr 12 02:12:48 2016 +0000
tree bda1b8e2211da5cbcd81bed210a218e14c162c01
parent aecb834e3a3f8cc004d9c4dbb328b6959ecea89e

Revert "Fix NPE in notifyViewCreated()"

This reverts commit 9f9d04fff58b9dd16af85bd49f1c0da95c2d0b80.

Change-Id: I831ca719aeede83f9be3268b3e57141cabed5e1e

samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java

diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java
index 737d2f0..afd4038 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java
@@ -327,10 +327,13 @@
         }
 
         @Override
+        public void onStart() {
+            super.onStart();
+            mMainFragmentAdapter.getFragmentHost().notifyViewCreated(mMainFragmentAdapter);
+        }
+
+        @Override
         public void onViewCreated(View view, Bundle savedInstanceState) {
-            if (mMainFragmentAdapter.getFragmentHost() != null) {
-                mMainFragmentAdapter.getFragmentHost().notifyViewCreated(mMainFragmentAdapter);
-            }
             setEntranceTransitionState(mEntranceTransitionState);
         }
 

samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseSupportFragment.java

diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseSupportFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseSupportFragment.java
index 1291a7f..02da218 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseSupportFragment.java
@@ -330,9 +330,6 @@
 
         @Override
         public void onViewCreated(View view, Bundle savedInstanceState) {
-            if (mMainFragmentAdapter.getFragmentHost() != null) {
-                mMainFragmentAdapter.getFragmentHost().notifyViewCreated(mMainFragmentAdapter);
-            }
             setEntranceTransitionState(mEntranceTransitionState);
         }
 

samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java

diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java
index e1b01e1..f965b37 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java
@@ -48,6 +48,6 @@
     }
 
     public interface PictureInPictureListener {
-        void onPictureInPictureModeChanged(boolean isInPictureInPictureMode);
+        void onPictureInPictureModeChanged(boolean isInPictureInPicture);
     }
 }