Merge "GuidedStepFragment: Fix addAsRoot restoring bug" into mnc-ub-dev

Author: dakegu2

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

@@ -68,7 +68,9 @@ protected void onCreate(Bundle savedInstanceState) {
         Log.v(TAG, "onCreate");
         super.onCreate(savedInstanceState);
         setContentView(R.layout.guided_step_activity);
-        GuidedStepFragment.addAsRoot(this, new FirstStepFragment(), R.id.lb_guidedstep_host);
+        if (savedInstanceState == null) {
+            GuidedStepFragment.addAsRoot(this, new FirstStepFragment(), R.id.lb_guidedstep_host);
+        }
     }
 
     @Override

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

@@ -70,7 +70,9 @@ protected void onCreate(Bundle savedInstanceState) {
         Log.v(TAG, "onCreate");
         super.onCreate(savedInstanceState);
         setContentView(R.layout.guided_step_activity);
-        GuidedStepSupportFragment.addAsRoot(this, new FirstStepFragment(), R.id.lb_guidedstep_host);
+        if (savedInstanceState == null) {
+            GuidedStepSupportFragment.addAsRoot(this, new FirstStepFragment(), R.id.lb_guidedstep_host);
+        }
     }
 
     @Override

samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/dialog/DialogExampleActivity.java

@@ -29,7 +29,9 @@ public class DialogExampleActivity extends Activity {
         super.onCreate(savedInstanceState);
         getWindow().setBackgroundDrawable(new ColorDrawable(Color.parseColor("#21272A")));
 
-        GuidedStepFragment fragment = new DialogExampleFragment();
-        GuidedStepFragment.addAsRoot(this, fragment, android.R.id.content);
+        if (savedInstanceState == null) {
+            GuidedStepFragment fragment = new DialogExampleFragment();
+            GuidedStepFragment.addAsRoot(this, fragment, android.R.id.content);
+        }
     }
 }