From e9d61192574ea7de22beed2644868bfba319ff91 Mon Sep 17 00:00:00 2001
From: Artur Dryomov <artur.dryomov@gmail.com>
Date: Tue, 10 Sep 2013 21:08:50 +0300
Subject: Remove notes from the landscape layout.

Ignoring tablets at moment.

Change-Id: Ie2ac0840cea994e942b2f7e1a7d4a2e73ebd12de
---
 android/sdremote/res/layout-land/fragment_empty_slide.xml      |  8 ++++++++
 android/sdremote/res/layout-land/fragment_slides_pager.xml     |  9 +++++++++
 .../impressremote/fragment/SlidesPagerFragment.java            | 10 ++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 android/sdremote/res/layout-land/fragment_empty_slide.xml
 create mode 100644 android/sdremote/res/layout-land/fragment_slides_pager.xml

(limited to 'android/sdremote')

diff --git a/android/sdremote/res/layout-land/fragment_empty_slide.xml b/android/sdremote/res/layout-land/fragment_empty_slide.xml
new file mode 100644
index 000000000000..37a733d2f47f
--- /dev/null
+++ b/android/sdremote/res/layout-land/fragment_empty_slide.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+           android:src="@color/background_slide_empty"
+           android:contentDescription="@string/description_empty_slide"
+           android:layout_gravity="center"
+           android:padding="@dimen/padding_empty_slide_layout"
+           android:layout_width="match_parent"
+           android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/android/sdremote/res/layout-land/fragment_slides_pager.xml b/android/sdremote/res/layout-land/fragment_slides_pager.xml
new file mode 100644
index 000000000000..c539b85271de
--- /dev/null
+++ b/android/sdremote/res/layout-land/fragment_slides_pager.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.view.ViewPager
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/pager_slides"
+    android:layout_gravity="center"
+    android:paddingTop="@dimen/padding_slides_pager"
+    android:paddingBottom="@dimen/padding_slides_pager"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"/>
\ No newline at end of file
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