[Libreoffice-commits] core.git: android/sdremote

[Christian Lohmaier]

 android/sdremote/res/layout-land/fragment_slides_pager.xml |   65 +++++++++++--
 1 file changed, 57 insertions(+), 8 deletions(-)

New commits:
commit 0d0b4a911c2ded7cc2cd64664a1994d0824482db
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon Dec 2 00:48:08 2013 +0100

    sdremote: show notes also in landscape orientation
    
    since why should portrait and landscape behave differently?
    
    Change-Id: I06ca350bc14ca0f9163d58927636d70a9630f3f9

diff --git a/android/sdremote/res/layout-land/fragment_slides_pager.xml b/android/sdremote/res/layout-land/fragment_slides_pager.xml
index ea70c82..22f6000 100644
--- a/android/sdremote/res/layout-land/fragment_slides_pager.xml
+++ b/android/sdremote/res/layout-land/fragment_slides_pager.xml
@@ -16,11 +16,60 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
-<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
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:gravity="center"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/pager_slides"
+        android:layout_weight="2"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"/>
+
+    <LinearLayout
+        android:id="@+id/layout_notes"
+        android:orientation="vertical"
+        android:paddingLeft="@dimen/padding_slides_pager"
+        android:paddingRight="@dimen/padding_slides_pager"
+        android:layout_weight="1"
+        android:layout_width="0dp"
+        android:layout_height="match_parent">
+
+        <TextView
+            style="@style/SectionHeader"
+            android:text="@string/header_notes"
+            android:paddingTop="@dimen/padding_header"/>
+
+        <ScrollView
+            android:id="@+id/scroll_notes"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <TextSwitcher
+                android:id="@+id/text_switcher_notes"
+                android:inAnimation="@android:anim/fade_in"
+                android:outAnimation="@android:anim/fade_out"
+                android:measureAllChildren="false"
+                android:paddingTop="@dimen/padding_slide_notes"
+                android:paddingLeft="@dimen/padding_slide_notes"
+                android:paddingRight="@dimen/padding_slide_notes"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+
+            </TextSwitcher>
+
+        </ScrollView>
+
+    </LinearLayout>
+
+</LinearLayout>