mirror of
https://github.com/MatomoCamp/matomocamp-companion-android.git
synced 2024-09-19 16:13:46 +02:00
Merge branch 'master' into material
This commit is contained in:
commit
3a66da1ce1
1 changed files with 19 additions and 2 deletions
|
@ -68,11 +68,28 @@ public class TrackScheduleActivity extends ActionBarActivity implements TrackSch
|
||||||
} else {
|
} else {
|
||||||
trackScheduleListFragment = (TrackScheduleListFragment) fm.findFragmentById(R.id.schedule);
|
trackScheduleListFragment = (TrackScheduleListFragment) fm.findFragmentById(R.id.schedule);
|
||||||
|
|
||||||
// Remove the room image DialogFragment when switching from dual pane to single pane mode
|
// Cleanup after switching from dual pane to single pane mode
|
||||||
if (!isTabletLandscape) {
|
if (!isTabletLandscape) {
|
||||||
|
FragmentTransaction ft = null;
|
||||||
|
|
||||||
|
Fragment eventDetailsFragment = fm.findFragmentById(R.id.event);
|
||||||
|
if (eventDetailsFragment != null) {
|
||||||
|
if (ft == null) {
|
||||||
|
ft = fm.beginTransaction();
|
||||||
|
}
|
||||||
|
ft.remove(eventDetailsFragment);
|
||||||
|
}
|
||||||
|
|
||||||
Fragment roomImageDialogFragment = fm.findFragmentByTag(RoomImageDialogFragment.TAG);
|
Fragment roomImageDialogFragment = fm.findFragmentByTag(RoomImageDialogFragment.TAG);
|
||||||
if (roomImageDialogFragment != null) {
|
if (roomImageDialogFragment != null) {
|
||||||
fm.beginTransaction().remove(roomImageDialogFragment).commit();
|
if (ft == null) {
|
||||||
|
ft = fm.beginTransaction();
|
||||||
|
}
|
||||||
|
ft.remove(roomImageDialogFragment);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ft != null) {
|
||||||
|
ft.commit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue