Merge "GuidedStepFragment: Fix addAsRoot restoring bug" into mnc-ub-dev
This commit is contained in:
@@ -68,7 +68,9 @@ public class GuidedStepActivity extends Activity {
|
|||||||
Log.v(TAG, "onCreate");
|
Log.v(TAG, "onCreate");
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.guided_step_activity);
|
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
|
@Override
|
||||||
|
|||||||
@@ -70,7 +70,9 @@ public class GuidedStepSupportActivity extends FragmentActivity {
|
|||||||
Log.v(TAG, "onCreate");
|
Log.v(TAG, "onCreate");
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.guided_step_activity);
|
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
|
@Override
|
||||||
|
|||||||
@@ -29,7 +29,9 @@ public class DialogExampleActivity extends Activity {
|
|||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
getWindow().setBackgroundDrawable(new ColorDrawable(Color.parseColor("#21272A")));
|
getWindow().setBackgroundDrawable(new ColorDrawable(Color.parseColor("#21272A")));
|
||||||
|
|
||||||
GuidedStepFragment fragment = new DialogExampleFragment();
|
if (savedInstanceState == null) {
|
||||||
GuidedStepFragment.addAsRoot(this, fragment, android.R.id.content);
|
GuidedStepFragment fragment = new DialogExampleFragment();
|
||||||
|
GuidedStepFragment.addAsRoot(this, fragment, android.R.id.content);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user