Update API demos to match new tab interaction.

Follow changes to FragmentTabManager to continue to work
correctly with it.  Fix the code in the base API demo (which
can't use FragmentTabManager) to work correctly.

Bug #7232088: ListView saved state being lost in some cases

Change-Id: Ib7ba1ab20ff00f2cc95c9f6024ab94783237c9be

3 files changed, 3 insertions, 46 deletions

diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentNestingTabsSupport.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentNestingTabsSupport.java
index d4005cc8c..dfdbc21c2 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentNestingTabsSupport.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentNestingTabsSupport.java
@@ -23,7 +23,7 @@ import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentTabHost;
 
 public class FragmentNestingTabsSupport extends FragmentActivity {
-    FragmentTabHost mTabHost;
+    private FragmentTabHost mTabHost;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -41,16 +41,6 @@ public class FragmentNestingTabsSupport extends FragmentActivity {
                 FragmentStackFragmentSupport.class, null);
         mTabHost.addTab(mTabHost.newTabSpec("tabs").setIndicator("Tabs"),
                 FragmentTabsFragmentSupport.class, null);
-
-        if (savedInstanceState != null) {
-            mTabHost.setCurrentTabByTag(savedInstanceState.getString("tab"));
-        }
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString("tab", mTabHost.getCurrentTabTag());
     }
 }
 //END_INCLUDE(complete)
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentTabs.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentTabs.java
index 9c9e5f414..7a7e2fcaf 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentTabs.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentTabs.java
@@ -27,7 +27,7 @@ import android.support.v4.app.FragmentTabHost;
  * TabHost through fragments, using FragmentTabHost.
  */
 public class FragmentTabs extends FragmentActivity {
-    FragmentTabHost mTabHost;
+    private FragmentTabHost mTabHost;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -45,16 +45,6 @@ public class FragmentTabs extends FragmentActivity {
                 LoaderCustomSupport.AppListFragment.class, null);
         mTabHost.addTab(mTabHost.newTabSpec("throttle").setIndicator("Throttle"),
                 LoaderThrottleSupport.ThrottledLoaderListFragment.class, null);
-
-        if (savedInstanceState != null) {
-            mTabHost.setCurrentTabByTag(savedInstanceState.getString("tab"));
-        }
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString("tab", mTabHost.getCurrentTabTag());
     }
 }
 //END_INCLUDE(complete)
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentTabsFragmentSupport.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentTabsFragmentSupport.java
index d11975f38..68f06effd 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentTabsFragmentSupport.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentTabsFragmentSupport.java
@@ -26,8 +26,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 public class FragmentTabsFragmentSupport extends Fragment {
-    FragmentTabHost mTabHost;
-    String mCurrentTabTag;
+    private FragmentTabHost mTabHost;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -44,35 +43,13 @@ public class FragmentTabsFragmentSupport extends Fragment {
         mTabHost.addTab(mTabHost.newTabSpec("throttle").setIndicator("Throttle"),
                 LoaderThrottleSupport.ThrottledLoaderListFragment.class, null);
 
-        if (savedInstanceState != null) {
-            mTabHost.setCurrentTabByTag(savedInstanceState.getString("tab"));
-        }
         return mTabHost;
     }
 
     @Override
-    public void onViewStateRestored(Bundle savedInstanceState) {
-        super.onViewStateRestored(savedInstanceState);
-        if (savedInstanceState != null) {
-            mCurrentTabTag = savedInstanceState.getString("tab");
-        }
-        mTabHost.setCurrentTabByTag(mCurrentTabTag);
-    }
-
-    @Override
     public void onDestroyView() {
         super.onDestroyView();
-        // Need to remember the selected tab so that we can restore it if
-        // we later re-create the views.
-        mCurrentTabTag = mTabHost.getCurrentTabTag();
         mTabHost = null;
     }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString("tab", mTabHost != null
-                ? mTabHost.getCurrentTabTag() : mCurrentTabTag);
-    }
 }
 //END_INCLUDE(complete)