From e9d61192574ea7de22beed2644868bfba319ff91 Mon Sep 17 00:00:00 2001 From: Artur Dryomov Date: Tue, 10 Sep 2013 21:08:50 +0300 Subject: Remove notes from the landscape layout. Ignoring tablets at moment. Change-Id: Ie2ac0840cea994e942b2f7e1a7d4a2e73ebd12de --- .../impressremote/fragment/SlidesPagerFragment.java | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'android/sdremote/src/org/libreoffice/impressremote/fragment') diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java index f8769f32ae38..f12b3d8ed048 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java +++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java @@ -119,6 +119,10 @@ public class SlidesPagerFragment extends SherlockFragment implements ServiceConn } private void setUpSlideNotes(int aSlideIndex) { + if (!isSlideNotesLayoutAvailable()) { + return; + } + if (areSlideNotesAvailable(aSlideIndex)) { showSlideNotes(aSlideIndex); } @@ -127,6 +131,12 @@ public class SlidesPagerFragment extends SherlockFragment implements ServiceConn } } + private boolean isSlideNotesLayoutAvailable() { + ViewGroup aSlideNotesLayout = (ViewGroup) getView().findViewById(R.id.layout_notes); + + return aSlideNotesLayout != null; + } + private boolean areSlideNotesAvailable(int aSlideIndex) { String aSlideNotes = mCommunicationService.getSlideShow().getSlideNotes(aSlideIndex); -- cgit