From bc552bd908babd43087dba4638ea974892264c30 Mon Sep 17 00:00:00 2001
From: Owen Lin <owenlin@google.com>
Date: Fri, 9 Sep 2011 13:33:44 +0800
Subject: Use different UIs for phone's portrait mode in manage offline page.

fix: 5100503

The original UI design is not suitable for phone's portait mode. I move the
UIs from GL view to android View to get better support.

Change-Id: Ice5f536129f66b51cdaf4db1be750be7bc072c7f
---
 res/drawable-hdpi/ic_manage_pin_small.png | Bin 0 -> 962 bytes
 res/drawable-mdpi/ic_manage_pin_small.png | Bin 0 -> 615 bytes
 res/layout-w480dp/manage_offline_bar.xml  |  57 +++++++++++++++++++++++++++
 res/layout/main.xml                       |  21 +++++++---
 res/layout/manage_offline_bar.xml         |  62 ++++++++++++++++++++++++++++++
 5 files changed, 135 insertions(+), 5 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_manage_pin_small.png
 create mode 100644 res/drawable-mdpi/ic_manage_pin_small.png
 create mode 100644 res/layout-w480dp/manage_offline_bar.xml
 create mode 100644 res/layout/manage_offline_bar.xml

(limited to 'res')

diff --git a/res/drawable-hdpi/ic_manage_pin_small.png b/res/drawable-hdpi/ic_manage_pin_small.png
new file mode 100644
index 000000000..d29bbd06e
Binary files /dev/null and b/res/drawable-hdpi/ic_manage_pin_small.png differ
diff --git a/res/drawable-mdpi/ic_manage_pin_small.png b/res/drawable-mdpi/ic_manage_pin_small.png
new file mode 100644
index 000000000..c1163d5f2
Binary files /dev/null and b/res/drawable-mdpi/ic_manage_pin_small.png differ
diff --git a/res/layout-w480dp/manage_offline_bar.xml b/res/layout-w480dp/manage_offline_bar.xml
new file mode 100644
index 000000000..d44ecf09f
--- /dev/null
+++ b/res/layout-w480dp/manage_offline_bar.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:background="@drawable/manage_bar">
+    <LinearLayout android:id="@+id/cache_bar"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+        <TextView android:layout_width="wrap_content"
+                android:paddingLeft="2dp"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical|left"
+                android:drawablePadding="3dp"
+                android:text="@string/make_available_offline"
+                android:drawableLeft="@drawable/ic_manage_pin"/>
+        <ProgressBar android:id="@+id/progress"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:max="100"
+                android:progress="30"
+                android:secondaryProgress="65"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:layout_weight="1"
+                android:layout_width="match_parent"
+                android:layout_height="10dp"/>
+        <TextView android:id="@+id/status"
+                android:paddingRight="2dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        <View android:layout_width="2dp"
+                android:layout_height="match_parent"
+                android:background="@android:drawable/divider_horizontal_dark" />
+        <Button android:id="@+id/done"
+                style="?android:attr/borderlessButtonStyle"
+                android:text="@string/done"
+                android:layout_weight="0"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentRight="true"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"/>
+    </LinearLayout>
+</FrameLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index d5188330e..b71ea502a 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
     <com.android.gallery3d.ui.GLRootView
-        android:id="@+id/gl_root_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-</LinearLayout>
+            android:id="@+id/gl_root_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"/>
+    <FrameLayout android:id="@+id/footer"
+            android:visibility="gone"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentRight="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+</RelativeLayout>
diff --git a/res/layout/manage_offline_bar.xml b/res/layout/manage_offline_bar.xml
new file mode 100644
index 000000000..b4bcec225
--- /dev/null
+++ b/res/layout/manage_offline_bar.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:background="@drawable/manage_bar">
+    <LinearLayout android:id="@+id/cache_bar"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+        <LinearLayout android:orientation="vertical"
+                android:paddingLeft="10dp"
+                android:paddingRight="5dp"
+                android:paddingBottom="5dp"
+                android:paddingTop="5dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1">
+            <TextView android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="bottom"
+                    android:drawablePadding="3dp"
+                    android:text="@string/make_available_offline"
+                    android:drawableRight="@drawable/ic_manage_pin_small"/>
+            <ProgressBar android:id="@+id/progress"
+                    style="?android:attr/progressBarStyleHorizontal"
+                    android:max="100"
+                    android:progress="30"
+                    android:secondaryProgress="65"
+                    android:layout_marginTop="2dp"
+                    android:layout_marginBottom="2dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="3dp"/>
+            <TextView android:id="@+id/status"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+        </LinearLayout>
+        <View android:layout_width="2dp"
+                android:layout_height="match_parent"
+                android:background="@android:drawable/divider_horizontal_dark" />
+        <Button android:id="@+id/done"
+                style="?android:attr/borderlessButtonStyle"
+                android:text="@string/done"
+                android:layout_weight="0"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentRight="true"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"/>
+    </LinearLayout>
+</FrameLayout>
-- 
cgit v1.2.3