|
|
@ -719,8 +719,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
|
|
|
|
int count = fm.getBackStackEntryCount();
|
|
|
|
int count = fm.getBackStackEntryCount();
|
|
|
|
if (count > 1 && "thread".equals(fm.getBackStackEntryAt(count - 1).getName())) {
|
|
|
|
if (count > 1 && "thread".equals(fm.getBackStackEntryAt(count - 1).getName())) {
|
|
|
|
Fragment fragment = fm.findFragmentByTag("thread");
|
|
|
|
Fragment fragment = fm.findFragmentByTag("thread");
|
|
|
|
if (fragment != null &&
|
|
|
|
if (fragment != null) {
|
|
|
|
fragment.getId() == (content_pane == null ? R.id.content_pane : R.id.content_frame)) {
|
|
|
|
if (fragment.getId() == (content_pane == null ? R.id.content_pane : R.id.content_frame)) {
|
|
|
|
Log.i("Moving pane=" + (content_pane != null) + " fragment=" + fragment);
|
|
|
|
Log.i("Moving pane=" + (content_pane != null) + " fragment=" + fragment);
|
|
|
|
fm.popBackStack("thread", FragmentManager.POP_BACK_STACK_INCLUSIVE);
|
|
|
|
fm.popBackStack("thread", FragmentManager.POP_BACK_STACK_INCLUSIVE);
|
|
|
|
Fragment newFragment = Helper.recreateFragment(fragment, fm);
|
|
|
|
Fragment newFragment = Helper.recreateFragment(fragment, fm);
|
|
|
@ -728,6 +728,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
|
|
|
|
ft.replace(content_pane == null ? R.id.content_frame : R.id.content_pane, newFragment, "thread")
|
|
|
|
ft.replace(content_pane == null ? R.id.content_frame : R.id.content_pane, newFragment, "thread")
|
|
|
|
.addToBackStack("thread");
|
|
|
|
.addToBackStack("thread");
|
|
|
|
ft.commit();
|
|
|
|
ft.commit();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (content_pane != null) {
|
|
|
|
if (content_pane != null) {
|
|
|
|
content_separator.setVisibility(View.VISIBLE);
|
|
|
|
content_separator.setVisibility(View.VISIBLE);
|
|
|
|
content_pane.setVisibility(View.VISIBLE);
|
|
|
|
content_pane.setVisibility(View.VISIBLE);
|
|
|
|