mirror of https://github.com/M66B/FairEmail.git
Scroll up on navigating from summary notification / widget
This commit is contained in:
parent
a45bee2e7c
commit
e64178d530
|
@ -347,15 +347,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if (getSupportFragmentManager().getFragments().size() == 0 &&
|
if (getSupportFragmentManager().getFragments().size() == 0 && !getIntent().hasExtra(Intent.EXTRA_PROCESS_TEXT))
|
||||||
!getIntent().hasExtra(Intent.EXTRA_PROCESS_TEXT)) {
|
init();
|
||||||
FragmentBase fragment = (unified ? new FragmentMessages() : new FragmentFolders());
|
|
||||||
fragment.setArguments(new Bundle());
|
|
||||||
|
|
||||||
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
|
|
||||||
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("unified");
|
|
||||||
fragmentTransaction.commit();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (savedInstanceState != null)
|
if (savedInstanceState != null)
|
||||||
drawerToggle.setDrawerIndicatorEnabled(savedInstanceState.getBoolean("toggle"));
|
drawerToggle.setDrawerIndicatorEnabled(savedInstanceState.getBoolean("toggle"));
|
||||||
|
@ -373,6 +366,18 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
|
||||||
updateShortcuts();
|
updateShortcuts();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void init() {
|
||||||
|
FragmentBase fragment = (unified ? new FragmentMessages() : new FragmentFolders());
|
||||||
|
fragment.setArguments(new Bundle());
|
||||||
|
|
||||||
|
FragmentManager fm = getSupportFragmentManager();
|
||||||
|
FragmentTransaction fragmentTransaction = fm.beginTransaction();
|
||||||
|
for (Fragment existing : fm.getFragments())
|
||||||
|
fragmentTransaction.remove(existing);
|
||||||
|
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("unified");
|
||||||
|
fragmentTransaction.commit();
|
||||||
|
}
|
||||||
|
|
||||||
private Runnable checkIntent = new Runnable() {
|
private Runnable checkIntent = new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
|
@ -388,7 +393,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
|
||||||
setIntent(intent);
|
setIntent(intent);
|
||||||
|
|
||||||
if ("unified".equals(action))
|
if ("unified".equals(action))
|
||||||
getSupportFragmentManager().popBackStack("unified", 0);
|
init();
|
||||||
|
|
||||||
else if ("error".equals(action))
|
else if ("error".equals(action))
|
||||||
onDebugInfo();
|
onDebugInfo();
|
||||||
|
|
Loading…
Reference in New Issue