auto import from //branches/cupcake/...@131421
diff --git a/res/drawable/dialog_divider_horizontal_light.9.png b/res/drawable/dialog_divider_horizontal_light.9.png
new file mode 100755
index 0000000..b69619b
--- /dev/null
+++ b/res/drawable/dialog_divider_horizontal_light.9.png
Binary files differ
diff --git a/res/drawable/ic_dialog_menu_generic.png b/res/drawable/ic_dialog_menu_generic.png
new file mode 100755
index 0000000..de07bda
--- /dev/null
+++ b/res/drawable/ic_dialog_menu_generic.png
Binary files differ
diff --git a/res/layout-land/gears_dialog.xml b/res/layout-land/gears_dialog.xml
deleted file mode 100644
index 5536fed..0000000
--- a/res/layout-land/gears_dialog.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?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="2dip">
-
- <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>
-
- </LinearLayout>
-
- </RelativeLayout>
-
-</LinearLayout>
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>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 7ac84e6..20fe7df 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -16,17 +16,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name">"Nettleser"</string>
- <!-- no translation found for tab_bookmarks (2305793036003473653) -->
- <skip />
- <!-- no translation found for tab_most_visited (1077402532455000703) -->
- <skip />
- <!-- no translation found for tab_history (1979267558744613746) -->
- <skip />
- <!-- no translation found for added_to_bookmarks (1020224130695956728) -->
- <skip />
- <!-- no translation found for removed_from_bookmarks (6063705902028438800) -->
- <skip />
- <string name="sign_in_to">"Logg inn på <xliff:g id="HOSTNAME">%s1</xliff:g> \\\"<xliff:g id="REALM">%s2</xliff:g>\\\""</string>
+ <string name="tab_bookmarks">"Bokmerker"</string>
+ <string name="tab_most_visited">"Mest besøkt"</string>
+ <string name="tab_history">"Historie"</string>
+ <string name="added_to_bookmarks">"Lagt til bokmerker"</string>
+ <string name="removed_from_bookmarks">"Fjernet fra bokmerker"</string>
+ <string name="sign_in_to">"Logg inn på <xliff:g id="HOSTNAME">%s1</xliff:g> \\\\\\\"<xliff:g id="REALM">%s2</xliff:g>\\\\\\\""</string>
<string name="username">"Brukernavn"</string>
<string name="password">"Passord"</string>
<string name="action">"Logg inn"</string>
@@ -81,13 +76,12 @@
<string name="delete_bookmark">"Slett"</string>
<string name="bookmark_page">"Legg til bokmerke for sist sette side"</string>
<string name="current_page">"Gjeldende side:"</string>
- <string name="delete_bookmark_warning">"Bokmerket \\\"<xliff:g id="BOOKMARK">%s</xliff:g>\\\" vil bli slettet."</string>
+ <string name="delete_bookmark_warning">"Bokmerket \\\\\\\"<xliff:g id="BOOKMARK">%s</xliff:g>\\\\\\\" vil bli slettet."</string>
<string name="open_in_new_window">"Åpne i nytt vindu"</string>
<string name="new_window">"Nytt vindu"</string>
<string name="goto_dot">"Gå til URL"</string>
<string name="find_dot">"Finn på siden"</string>
- <!-- no translation found for select_dot (6299170761900561967) -->
- <skip />
+ <string name="select_dot">"Velg tekst"</string>
<string name="view_tabs">"Vindusoversikt"</string>
<string name="view_tabs_condensed">"Vinduer"</string>
<string name="tab_picker_title">"Gjeldende vinduer"</string>
@@ -206,7 +200,7 @@
<string name="browserFrameNetworkErrorLabel">"Tilkoblingsproblem"</string>
<string name="browserFrameFileErrorLabel">"Problem med fil"</string>
<string name="browserFrameFormResubmitLabel">"Bekreft"</string>
- <string name="browserFrameFormResubmitMessage">"Siden du prøver å se, inneholder data som allerede er blitt sendt inn (\\\"POSTDATA\\\"). Hvis du sender dataene på nytt, kan det skjemaet på siden gjorde bli gjort på nytt."</string>
+ <string name="browserFrameFormResubmitMessage">"Siden du prøver å se, inneholder data som allerede er blitt sendt inn (\\\\\\\"POSTDATA\\\\\\\"). Hvis du sender dataene på nytt, kan det skjemaet på siden gjorde bli gjort på nytt."</string>
<string name="loadSuspendedTitle">"Ingen nettverkstilkobling"</string>
<string name="loadSuspended">"Siden vil fortsette å laste etter at tilkoblingen er blitt gjenopprettet."</string>
<string name="clear_history">"Slett logg"</string>
@@ -241,7 +235,7 @@
<string name="download_no_sdcard_dlg_title">"Mangler minnekort"</string>
<string name="download_no_sdcard_dlg_msg">"Du trenger et minnekort for å laste ned <xliff:g id="FILENAME">%s</xliff:g>."</string>
<string name="download_sdcard_busy_dlg_title">"Minnekort utilgjengelig"</string>
- <string name="download_sdcard_busy_dlg_msg">"Minnekortet er opptatt. For å tillatte nedlastinger, gå til Hjem > Innstillinger > Minnekort og telefonlagring, og fjern haken ved \\\"Bruk for USB-lagring\\\"-boksen."</string>
+ <string name="download_sdcard_busy_dlg_msg">"Minnekortet er opptatt. For å tillatte nedlastinger, gå til Hjem > Innstillinger > Minnekort og telefonlagring, og fjern haken ved \\\\\\\"Bruk for USB-lagring\\\\\\\"-boksen."</string>
<string name="download_no_application">"Fant ingen applikasjon som kunne åpne denne filen."</string>
<string name="retry">"Prøv igjen"</string>
<string name="no_downloads">"Nedlastingsloggen er tom."</string>
@@ -257,12 +251,11 @@
<string name="download_length_required">"Kan ikke laste ned. Klarte ikke bestemme størrelsen på filen."</string>
<string name="download_precondition_failed">"Nedlastingen ble avbrutt. Den kan ikke fortsettes."</string>
<string name="activity_instrumentation_test_runner">"Browser Test Runner"</string>
- <!-- no translation found for search_google (1231765426260855357) -->
- <skip />
- <string name="permlab_readHistoryBookmarks">"read Browser\\\'s history and bookmarks"</string>
- <string name="permdesc_readHistoryBookmarks">"Allows the application to read all the URLs that the Browser has visited, and all of the Browser\\\'s bookmarks."</string>
- <string name="permlab_writeHistoryBookmarks">"write Browser\\\'s history and bookmarks"</string>
- <string name="permdesc_writeHistoryBookmarks">"Allows an application to modify the Browser\\\'s history or bookmarks stored on your phone. Malicious applications can use this to erase or modify your Browser\\\'s data."</string>
+ <string name="search_google">"Søk på Google"</string>
+ <string name="permlab_readHistoryBookmarks">"read Browser\\\\\\\'s history and bookmarks"</string>
+ <string name="permdesc_readHistoryBookmarks">"Allows the application to read all the URLs that the Browser has visited, and all of the Browser\\\\\\\'s bookmarks."</string>
+ <string name="permlab_writeHistoryBookmarks">"write Browser\\\\\\\'s history and bookmarks"</string>
+ <string name="permdesc_writeHistoryBookmarks">"Allows an application to modify the Browser\\\\\\\'s history or bookmarks stored on your phone. Malicious applications can use this to erase or modify your Browser\\\\\\\'s data."</string>
<string name="query_data_message">"Nettsiden under ønsker å lagre informasjon på datamaskinen ved hjelp av Gears."</string>
<string name="location_message">"Nettsiden under ønsker å finne ut hvor du er ved hjelp av Gears."</string>
<string name="shortcut_message">"Denne nettsiden ønsker å lage en snarvei på datamaskinen. Ønsker du å tillate dette?"</string>
@@ -290,6 +283,5 @@
<string name="denied">"Nektet"</string>
<string name="unrecognized_dialog_message">"Ukjent meldingstype"</string>
<string name="default_button">"OK"</string>
- <!-- no translation found for zoom_overview_button_text (4146579940085488881) -->
- <skip />
+ <string name="zoom_overview_button_text">"Oversikt"</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6a24b08..912ed44 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -641,20 +641,43 @@
can use this to erase or modify your Browser\'s data.</string>
<!-- Gears Dialogs -->
- <string name="query_data_message">The Web site below wants to store information on your computer using Gears.</string>
- <string name="location_message">The Web site below wants to access information about your location using Gears.</string>
- <string name="shortcut_message">This Web site wants to create a shortcut on your computer. Do you want to allow this?</string>
+ <string name="query_data_prompt">Allow storage</string>
+ <string name="query_data_message">This web site would like to store information on your phone.</string>
+ <string name="location_prompt">Access your location</string>
+ <string name="location_message">This web site would like to have access to your location</string>
+ <string name="shortcut_prompt">Create a shortcut</string>
+ <string name="shortcut_message">This web site would like to create a shortcut to this page on your home screen.</string>
<string name="settings_message">The table below shows the permissions you have granted to each site that has attempted to use Gears.</string>
- <string name="filepicker_message">Gears File Picker</string>
+ <string name="filepicker_message">File Picker</string>
+ <string name="image_message">Choosen Image</string>
<string name="settings_title">Gears settings</string>
<string name="privacy_policy">Read the site\'s privacy policy to see how your location will be used.</string>
+ <string name="settings_storage_title">Allow Local Storage</string>
+ <string name="settings_storage_subtitle_on">This site can save information to your phone</string>
+ <string name="settings_storage_subtitle_off">This site cannot save information to your phone</string>
- <string name="permission_button_alwaysdeny">Never allow this site</string>
- <string name="permission_button_allow">Allow</string>
- <string name="permission_button_deny">Deny</string>
+ <string name="settings_location_title">Allow Location Detection</string>
+ <string name="settings_location_subtitle_on">This site can read your current location</string>
+ <string name="settings_location_subtitle_off">This site cannot read your current location</string>
- <string name="shortcut_button_alwaysdeny">Never allow this shortcut</string>
+ <string name="settings_remove_site">Remove this site from Gears</string>
+ <string name="settings_empty">No permissions set</string>
+
+ <string name="settings_confirmation_remove_title">Remove this site</string>
+ <string name="settings_confirmation_remove">All permissions will be canceled, and any data stored on your phone by the site will be deleted</string>
+
+ <string name="storage_notification">This site will store information on this phone.\n Change this setting in:\n Settings->Gears Settings</string>
+ <string name="storage_notification_alwaysdeny">This site will never store information on this phone.\n Change this setting in:\n Settings->Gears Settings</string>
+ <string name="location_notification">This site will now access your location.\n Change this setting in:\n Settings->Gears Settings</string>
+ <string name="location_notification_alwaysdeny">This site will never access your location.\n Change this setting in:\n Settings->Gears Settings</string>
+ <string name="shortcut_notification">Shortcut created</string>
+
+ <string name="permission_button_alwaysdeny">Never Allow</string>
+ <string name="permission_button_allow">OK</string>
+ <string name="permission_button_deny">Cancel</string>
+
+ <string name="shortcut_button_alwaysdeny">Never Allow</string>
<string name="shortcut_button_allow">OK</string>
<string name="shortcut_button_deny">Cancel</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1a5ee1f..f20220f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -32,7 +32,7 @@
<item name="android:textAppearance">?android:attr/textAppearanceLargeInverse</item>
<item name="android:completionThreshold">2</item>
<item name="android:dropDownSelector">@android:drawable/list_selector_background</item>
- <item name="android:popupBackground">@android:drawable/editbox_dropdown_dark_frame</item>
+ <item name="android:popupBackground">@android:drawable/spinner_dropdown_background</item>
</style>
<style name="gears_button">