auto import from //branches/cupcake/...@131421
diff --git a/res/layout/gears_dialog.xml b/res/layout/gears_dialog.xml
index 0d834f3..57d4f0b 100644
--- a/res/layout/gears_dialog.xml
+++ b/res/layout/gears_dialog.xml
@@ -22,14 +22,13 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="10dip"
- android:background="@color/white">
+ android:padding="0dip">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingBottom="10dip">
+ android:padding="10dip">
<LinearLayout
android:layout_width="fill_parent"
@@ -46,7 +45,7 @@
android:paddingRight="10dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerHorizontal="true" />
+ android:layout_centerHorizontal="true"/>
<TextView
android:id="@+id/dialog_title"
@@ -57,7 +56,7 @@
android:visibility="gone"
android:textSize="16dip"
android:textStyle="bold"
- android:textColor="@color/black"/>
+ android:textColor="@color/white"/>
<TextView
android:id="@+id/dialog_message"
@@ -65,95 +64,112 @@
android:layout_height="wrap_content"
android:visibility="gone"
android:gravity="center_vertical"
- android:textSize="13dip"
- android:textColor="@color/black"/>
+ android:textSize="20dip"
+ android:textColor="@color/white"/>
</LinearLayout>
- <TextView
- android:id="@+id/dialog_subtitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="10dip"
- android:gravity="center_vertical"
- android:visibility="gone"
- android:textSize="13dip"
- android:textColor="@color/black"/>
-
</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="2dip">
+ android:orientation="vertical">
- <LinearLayout
+ <ImageView android:id="@+id/titleDivider"
+ android:layout_width="fill_parent"
+ android:layout_height="1dip"
+ android:scaleType="fitXY"
+ android:gravity="fill_horizontal"
+ android:src="@drawable/dialog_divider_horizontal_light"
+ android:layout_marginLeft="10dip"
+ android:layout_marginRight="10dip"/>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/panel_content"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:padding="0dip"
+ android:layout_weight="1" />
+
+ <RelativeLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="10dip"
+ android:paddingRight="10dip"
+ android:paddingTop="0dip">
+
+ <LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
- <TextView
- android:id="@+id/selection"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:textSize="13dip"
- android:gravity="right"
- android:textColor="@color/black"/>
-
- <RelativeLayout
- android:background="@color/white"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:paddingTop="2dip">
-
- <LinearLayout
- android:orientation="horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@color/white">
-
- <Button
- android:id="@+id/button_alwaysdeny"
- android:layout_width="wrap_content"
- android:layout_height="48px"
- android:layout_alignParentLeft="true"
- style="@style/gears_button"
- android:textSize="13dip"/>
-
- </LinearLayout>
-
- <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="48px"
- android:textSize="13dip"/>
-
- <Button
- android:id="@+id/button_deny"
- android:layout_width="wrap_content"
- android:layout_height="48px"
- android:textSize="13dip"/>
-
- </LinearLayout>
-
- </RelativeLayout>
+ <TextView
+ android:id="@+id/selection"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:textSize="13dip"
+ android:gravity="right"
+ android:visibility="gone"
+ android:textColor="@color/white"/>
</LinearLayout>
</RelativeLayout>
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:background="@color/gray"
+ android:layout_height="wrap_content"
+ android:paddingTop="4dip"
+ android:paddingLeft="0dip"
+ android:paddingRight="0dip">
+
+ <LinearLayout android:id="@+id/leftSpacer"
+ android:layout_weight="0.25"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:visibility="gone"/>
+
+ <Button
+ android:id="@+id/button_allow"
+ android:layout_width="96px"
+ android:layout_height="48px"
+ android:layout_gravity="left"
+ android:layout_weight="1"
+ android:maxLines="2"
+ android:textSize="13dip"/>
+
+ <Button
+ android:id="@+id/button_alwaysdeny"
+ android:layout_width="96px"
+ android:layout_height="48px"
+ android:layout_gravity="left"
+ android:layout_weight="1"
+ android:maxLines="2"
+ android:textSize="13dip"/>
+
+ <Button
+ android:id="@+id/button_deny"
+ android:layout_width="96px"
+ android:layout_height="48px"
+ android:layout_gravity="right"
+ android:layout_weight="1"
+ android:maxLines="2"
+ android:textSize="13dip"/>
+
+ <LinearLayout android:id="@+id/rightSpacer"
+ android:layout_width="0dip"
+ android:layout_weight="0.25"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:visibility="gone" />
+
+ </LinearLayout>
+
</LinearLayout>
diff --git a/res/layout/gears_dialog_filepicker.xml b/res/layout/gears_dialog_filepicker.xml
index b1c1646..68268f1 100644
--- a/res/layout/gears_dialog_filepicker.xml
+++ b/res/layout/gears_dialog_filepicker.xml
@@ -23,22 +23,9 @@
android:layout_height="wrap_content">
<LinearLayout
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:background="@color/white" >
-
- <GridView android:id="@+id/paths_list"
- android:padding="4dip"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content" />
- </LinearLayout>
-
- <LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:background="@color/white">
+ android:layout_height="wrap_content">
<TextView
android:id="@+id/path_name"
@@ -46,67 +33,28 @@
android:layout_height="wrap_content"
android:textSize="13dip"
android:textColor="@color/dark_gray"/>
-
+
<TextView
android:id="@+id/current_path"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="13dip"
- android:textColor="@color/black"/>
+ android:textColor="@color/white"/>
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:background="@color/gray"
- android:padding="1px">
+ android:layout_height="wrap_content">
- <LinearLayout
- android:orientation="vertical"
+ <GridView android:id="@+id/files_list"
+ android:padding="4px"
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:background="@color/white">
-
- <LinearLayout
- android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:background="@color/white">
-
- <ImageView
- android:id="@+id/image"
- android:padding="10dip"
- android:layout_centerHorizontal="true"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:adjustViewBounds="true"
- android:visibility="gone"
- android:gravity="center"
- android:src="@drawable/gears"/>
-
- <LinearLayout
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:background="@color/white">
-
- <GridView android:id="@+id/files_list"
- android:padding="4px"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:horizontalSpacing="2px"
- android:verticalSpacing="2px"
- android:numColumns="3"
- style="@android:style/Widget.ListView.White" />
-
- </LinearLayout>
-
- </LinearLayout>
-
- </LinearLayout>
+ android:layout_height="fill_parent"
+ android:horizontalSpacing="2px"
+ android:verticalSpacing="2px"
+ android:numColumns="3" />
</LinearLayout>
diff --git a/res/layout/gears_dialog_filepicker_cell.xml b/res/layout/gears_dialog_filepicker_cell.xml
index 0440e1f..369fc6a 100644
--- a/res/layout/gears_dialog_filepicker_cell.xml
+++ b/res/layout/gears_dialog_filepicker_cell.xml
@@ -32,9 +32,9 @@
<TextView
android:id="@+id/name"
- android:textColor="@color/black"
+ android:textColor="@color/white"
android:textSize="13dip"
- android:shadowColor="@color/white"
+ android:shadowColor="@color/black"
android:shadowRadius="2.0"
android:singleLine="true"
android:ellipsize="middle"
diff --git a/res/layout/gears_dialog_permission.xml b/res/layout/gears_dialog_permission.xml
index 3852f83..01914e2 100644
--- a/res/layout/gears_dialog_permission.xml
+++ b/res/layout/gears_dialog_permission.xml
@@ -17,22 +17,23 @@
*/
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:paddingBottom="10dip">
<LinearLayout
+ android:orientation="vertical"
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:id="@+id/content_border"
- android:padding="1px">
+ android:paddingTop="10dip"
+ android:paddingLeft="10dip"
+ android:paddingRight="10dip"
+ android:layout_height="wrap_content">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:id="@+id/content_background"
- android:padding="4dip">
+ android:orientation="horizontal">
<ImageView
android:id="@+id/origin_icon"
@@ -57,8 +58,8 @@
android:visibility="gone"
android:textStyle="bold"
android:gravity="left"
- android:textSize="13dip"
- android:textColor="@color/black"/>
+ android:textSize="16dip"
+ android:textColor="@color/white"/>
<TextView
android:id="@+id/origin_subtitle"
@@ -67,7 +68,7 @@
android:visibility="gone"
android:gravity="left"
android:textSize="13dip"
- android:textColor="@color/black"/>
+ android:textColor="@color/white"/>
<TextView
android:id="@+id/origin_message"
@@ -77,24 +78,34 @@
android:paddingTop="10dip"
android:gravity="left"
android:textSize="13dip"
- android:textColor="@color/black"/>
+ android:textColor="@color/white"/>
</LinearLayout>
</LinearLayout>
+ <TextView
+ android:id="@+id/privacy_policy_label"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="10dip"
+ android:gravity="center_horizontal"
+ android:textSize="13dip"
+ android:textStyle="italic"
+ android:textColor="@color/white"
+ android:visibility="gone"
+ android:text="@string/privacy_policy" />
+
+ <TextView
+ android:id="@+id/permission_dialog_message"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="4dip"
+ android:paddingTop="10dip"
+ android:gravity="left"
+ android:textSize="16dip"
+ android:textColor="@color/white"/>
+
</LinearLayout>
- <TextView
- android:id="@+id/privacy_policy_label"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:paddingTop="10dip"
- android:gravity="center_horizontal"
- android:textSize="13dip"
- android:textStyle="italic"
- android:textColor="@color/black"
- android:visibility="gone"
- android:text="@string/privacy_policy" />
-
-</LinearLayout>
+</ScrollView>
diff --git a/res/layout/gears_dialog_settings.xml b/res/layout/gears_dialog_settings.xml
index 07b08ab..a9026db 100644
--- a/res/layout/gears_dialog_settings.xml
+++ b/res/layout/gears_dialog_settings.xml
@@ -36,7 +36,7 @@
android:background="@color/white">
<ListView android:id="@+id/sites_list"
- android:padding="2dip"
+ android:padding="4dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
style="@android:style/Widget.ListView.White" />
diff --git a/res/layout/gears_dialog_shortcut.xml b/res/layout/gears_dialog_shortcut.xml
new file mode 100644
index 0000000..28f93d0
--- /dev/null
+++ b/res/layout/gears_dialog_shortcut.xml
@@ -0,0 +1,103 @@
+<?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.
+ */
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="10dip">
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:paddingLeft="10dip"
+ android:paddingRight="10dip"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:padding="4dip"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/origin_subtitle"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:textStyle="bold"
+ android:gravity="left"
+ android:textSize="16dip"
+ android:textColor="@color/white"/>
+
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/privacy_policy_label"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="10dip"
+ android:gravity="center_horizontal"
+ android:textSize="13dip"
+ android:textStyle="italic"
+ android:textColor="@color/white"
+ android:visibility="gone"
+ android:text="@string/privacy_policy" />
+
+ <TextView
+ android:id="@+id/permission_dialog_message"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="10dip"
+ android:gravity="left"
+ android:textSize="16dip"
+ android:textColor="@color/white"/>
+
+ <LinearLayout
+ android:id="@+id/shortcut_panel"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:gravity="center"
+ android:orientation="vertical">
+
+ <ImageView
+ android:id="@+id/origin_icon"
+ android:paddingTop="10dip"
+ android:layout_centerHorizontal="true"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:adjustViewBounds="true"
+ android:src="@drawable/gears"/>
+
+ <TextView
+ android:id="@+id/shortcut_name"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="10dip"
+ android:gravity="center"
+ android:textSize="13dip"
+ android:textColor="@color/white"/>
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+</ScrollView>
+
diff --git a/res/layout/gears_settings.xml b/res/layout/gears_settings.xml
new file mode 100644
index 0000000..e3a4cbe
--- /dev/null
+++ b/res/layout/gears_settings.xml
@@ -0,0 +1,48 @@
+<?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="0dip">
+
+ <ListView android:id="@+id/sites_list"
+ android:padding="4dip"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" />
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <ImageView android:id="@+id/titleDivider"
+ android:layout_width="fill_parent"
+ android:layout_height="1dip"
+ android:scaleType="fitXY"
+ android:gravity="fill_horizontal"
+ android:src="@drawable/dialog_divider_horizontal_light"
+ android:layout_marginLeft="10dip"
+ android:layout_marginRight="10dip"/>
+
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/gears_settings_row.xml b/res/layout/gears_settings_row.xml
new file mode 100644
index 0000000..6a1e851
--- /dev/null
+++ b/res/layout/gears_settings_row.xml
@@ -0,0 +1,99 @@
+<?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.
+ */
+-->
+
+<com.android.internal.view.menu.ListMenuItemView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="?android:attr/listPreferredItemHeight">
+
+ <RelativeLayout
+ android:layout_width="0dip"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_marginLeft="6dip"
+ android:layout_marginRight="6dip"
+ android:duplicateParentState="true">
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentLeft="true"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:singleLine="true"
+ android:duplicateParentState="true"
+ android:ellipsize="start"
+ android:fadingEdge="none"/>
+
+ <TextView
+ android:id="@+id/subtitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/title"
+ android:layout_alignParentLeft="true"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:singleLine="false"
+ android:duplicateParentState="true"/>
+
+ <TextView
+ android:id="@+id/info"
+ android:visibility="gone"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/subtitle"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:singleLine="true"
+ android:layout_centerHorizontal="true"
+ android:duplicateParentState="true"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal"/>
+
+ </RelativeLayout>
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:paddingLeft="10dip"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:src="@drawable/ic_dialog_menu_generic" />
+
+ <CheckBox
+ android:id="@+id/checkbox"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:drawablePadding="10dip"
+ android:focusable="false"
+ android:clickable="false"
+ android:duplicateParentState="true"
+ android:visibility="gone"
+ android:textSize="16dip"/>
+
+ </LinearLayout>
+
+</com.android.internal.view.menu.ListMenuItemView>