From 8881c1cf76182a780516d61539944dac8aca65ac Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Tue, 21 Feb 2012 18:17:05 +0100
Subject: android app: slide buttons on instead of fading

---
 android/res/anim/fade_in.xml   |  5 -----
 android/res/anim/fade_out.xml  |  5 -----
 android/res/layout/buttons.xml | 27 +++++++++++++++++----------
 3 files changed, 17 insertions(+), 20 deletions(-)
 delete mode 100644 android/res/anim/fade_in.xml
 delete mode 100644 android/res/anim/fade_out.xml

(limited to 'android/res')

diff --git a/android/res/anim/fade_in.xml b/android/res/anim/fade_in.xml
deleted file mode 100644
index b2af62ca..00000000
--- a/android/res/anim/fade_in.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromAlpha="0.0"
-    android:toAlpha="1.0"
-    android:duration="200" />
diff --git a/android/res/anim/fade_out.xml b/android/res/anim/fade_out.xml
deleted file mode 100644
index 7d742df3..00000000
--- a/android/res/anim/fade_out.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromAlpha="1.0"
-    android:toAlpha="0.0"
-    android:duration="200" />
diff --git a/android/res/layout/buttons.xml b/android/res/layout/buttons.xml
index b4d44284..b35f7daa 100644
--- a/android/res/layout/buttons.xml
+++ b/android/res/layout/buttons.xml
@@ -3,21 +3,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <SeekBar
-        android:id="@+id/pageSlider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_margin="0dp"
-        android:background="@drawable/slider" />
-
     <ViewSwitcher
         android:id="@+id/switcher"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:layout_below="@+id/topBar"
         android:layout_centerHorizontal="true" >
 
         <RelativeLayout
@@ -111,6 +101,22 @@
         </RelativeLayout>
     </ViewSwitcher>
 
+    <RelativeLayout
+        android:id="@+id/lowerButtons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true" >
+        
+    <SeekBar
+        android:id="@+id/pageSlider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_margin="0dp"
+        android:background="@drawable/slider" />
+
     <TextView
         android:id="@+id/pageNumber"
         android:layout_width="wrap_content"
@@ -120,5 +126,6 @@
         android:layout_marginBottom="10dp"
         android:background="@drawable/page_num"
         android:textAppearance="?android:attr/textAppearanceMedium" />
+    </RelativeLayout>
 
 </RelativeLayout>
-- 
cgit v1.2.3