summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2013-12-02 00:48:08 +0100
committerMichael Meeks <michael.meeks@collabora.com>2014-01-02 14:08:35 +0000
commit0d0b4a911c2ded7cc2cd64664a1994d0824482db (patch)
treee234c4f9220806d87855109452f5a97782f415f0 /android
parent4be366de5833c284f21393e99fb7b11199f4b0ff (diff)
sdremote: show notes also in landscape orientation
since why should portrait and landscape behave differently? Change-Id: I06ca350bc14ca0f9163d58927636d70a9630f3f9
Diffstat (limited to 'android')
-rw-r--r--android/sdremote/res/layout-land/fragment_slides_pager.xml65
1 files changed, 57 insertions, 8 deletions
diff --git a/android/sdremote/res/layout-land/fragment_slides_pager.xml b/android/sdremote/res/layout-land/fragment_slides_pager.xml
index ea70c828f963..22f60007d009 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>