Code drop from //branches/cupcake/...@124589

2 files changed, 177 insertions, 40 deletions

diff --git a/res/layout-land/gears_dialog.xml b/res/layout-land/gears_dialog.xml
new file mode 100644
index 00000000..f5cf9696
--- /dev/null
+++ b/res/layout-land/gears_dialog.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright 2008, 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.
+ */
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:drawingCacheQuality="auto"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:orientation="vertical"
+  android:padding="10dip"
+  android:background="@color/white">
+
+  <LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingBottom="10dip">
+
+    <LinearLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:orientation="vertical">
+
+      <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <ImageView
+          android:id="@+id/icon"
+          android:paddingRight="10dip"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_centerHorizontal="true" />
+
+        <TextView
+          android:id="@+id/dialog_title"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_centerVertical="true"
+          android:paddingRight="10dip"
+          android:gravity="center_vertical"
+          android:visibility="gone"
+          android:textSize="16dip"
+          android:textStyle="bold"
+          android:textColor="@color/black"/>
+
+        <TextView
+          android:id="@+id/dialog_subtitle"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:paddingTop="10dip"
+          android:paddingRight="10dip"
+          android:gravity="center_vertical"
+          android:visibility="gone"
+          android:textSize="13dip"
+          android:textColor="@color/black"/>
+
+        <TextView
+          android:id="@+id/dialog_message"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:visibility="gone"
+          android:gravity="center_vertical"
+          android:textSize="13dip"
+          android:textColor="@color/black"/>
+
+      </LinearLayout>
+
+    </LinearLayout>
+
+  </LinearLayout>
+
+  <LinearLayout
+    android:id="@+id/panel_content"
+    android:layout_width="fill_parent"
+    android:layout_height="0dip"
+    android:layout_weight="1"/>
+
+  <RelativeLayout
+    android:background="@color/white"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="10dip">
+
+    <Button
+      android:id="@+id/button_alwaysdeny"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentLeft="true"
+      style="@style/gears_button"
+      android:textSize="13dip"/>
+
+    <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_alignParentRight="true"
+      android:layout_height="wrap_content">
+
+      <Button
+        android:id="@+id/button_allow"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="13dip"/>
+
+      <Button
+        android:id="@+id/button_deny"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="13dip"/>
+
+    </LinearLayout>
+
+  </RelativeLayout>
+
+</LinearLayout>
diff --git a/res/layout-land/page_info.xml b/res/layout-land/page_info.xml
index f08dd7de..63d18cac 100644
--- a/res/layout-land/page_info.xml
+++ b/res/layout-land/page_info.xml
@@ -14,53 +14,60 @@
      limitations under the License.
 -->
 
-<LinearLayout
+<ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical" >
-    
-    <!-- Title: -->
-    <TextView
-        android:id="@+id/title"
-        android:textStyle="bold"
-        android:textSize="14sp"
-        android:textColor="@color/white"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
-        android:layout_marginTop="12dip"
-        android:layout_marginBottom="12dip" />
 
-    <!-- Address: -->
-    <TableLayout
+    <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:shrinkColumns="1"
-        android:orientation="vertical">
+        android:orientation="vertical" >
+    
+        <!-- Title: -->
+        <TextView
+            android:id="@+id/title"
+            android:textStyle="bold"
+            android:textSize="14sp"
+            android:textColor="@color/white"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:layout_marginTop="12dip"
+            android:layout_marginBottom="12dip" />
 
-        <TableRow>
-            <TextView 
-                android:id="@+id/address_header"
-                android:text="@string/page_info_address"
-                android:textSize="14sp"
-                android:textColor="@color/white"
-                android:gravity="left"
-                android:layout_marginLeft="20dip"
-                android:layout_marginRight="20dip" />
-            
-            <TextView
-                android:id="@+id/address"
-                android:textSize="14sp"
-                android:textColor="@color/white"
-                android:gravity="left"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="20dip"
-                android:layout_marginBottom="12dip" />
-        </TableRow>
+        <!-- Address: -->
+        <TableLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:shrinkColumns="1"
+            android:orientation="vertical">
 
-    </TableLayout>
-    
-</LinearLayout>
+            <TableRow>
+                <TextView 
+                    android:id="@+id/address_header"
+                    android:text="@string/page_info_address"
+                    android:textSize="14sp"
+                    android:textColor="@color/white"
+                    android:gravity="left"
+                    android:layout_marginLeft="20dip"
+                    android:layout_marginRight="20dip" />
+                
+                <TextView
+                    android:id="@+id/address"
+                    android:textSize="14sp"
+                    android:textColor="@color/white"
+                    android:gravity="left"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="20dip"
+                    android:layout_marginBottom="12dip" />
+            </TableRow>
+
+        </TableLayout>
+        
+    </LinearLayout>
+
+</ScrollView>