From e43a151549b7f87cb1c1c1165b9777697fd9c1d7 Mon Sep 17 00:00:00 2001 From: Artur Dryomov Date: Sun, 21 Jul 2013 20:43:41 +0300 Subject: Improve the SlideShowActivity. * Enable up navigation. * Show the current slide index properly. * Show thumbnail if slide was not loaded yet. Change-Id: I234dc1e583c8549b6a1c069d7e2294726d5e29d1 --- .../org/libreoffice/impressremote/fragment/SlidesGridFragment.java | 2 -- .../org/libreoffice/impressremote/fragment/SlidesPagerFragment.java | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'android/sdremote/src/org/libreoffice/impressremote/fragment') diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java index 6c0fe8795979..ebc9a24d02ef 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java +++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java @@ -61,8 +61,6 @@ public class SlidesGridFragment extends SherlockFragment implements ServiceConne mCommunicationService = aServiceBinder.getService(); - mCommunicationService.getTransmitter().startPresentation(); - setUpSlidesGrid(); } diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java index c3ebb2c9e6ab..cb9872f6c20b 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java +++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java @@ -61,8 +61,6 @@ public class SlidesPagerFragment extends SherlockFragment implements ServiceConn mCommunicationService = aServiceBinder.getService(); - mCommunicationService.getTransmitter().startPresentation(); - setUpSlidesPager(); } @@ -72,6 +70,8 @@ public class SlidesPagerFragment extends SherlockFragment implements ServiceConn getSlidesPager().setAdapter(aSlidesPagerAdapter); + getSlidesPager().setCurrentItem(mCommunicationService.getSlideShow().getCurrentSlideIndex()); + getSlidesPager().setPageMargin(getSlidesMarginInPx()); getSlidesPager().setOnPageChangeListener(this); -- cgit