auto import from //branches/cupcake/...@125939
diff --git a/res/layout/gears_dialog.xml b/res/layout/gears_dialog.xml
index b1a43cd..0d834f3 100644
--- a/res/layout/gears_dialog.xml
+++ b/res/layout/gears_dialog.xml
@@ -94,32 +94,63 @@
android:background="@color/white"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:paddingTop="10dip">
+ android:paddingTop="2dip">
- <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"
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content">
- <Button
- android:id="@+id/button_allow"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="13dip"/>
+ <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"/>
- <Button
- android:id="@+id/button_deny"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="13dip"/>
+ <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>
diff --git a/res/layout/gears_dialog_filepicker.xml b/res/layout/gears_dialog_filepicker.xml
index 5f1c653..b1c1646 100644
--- a/res/layout/gears_dialog_filepicker.xml
+++ b/res/layout/gears_dialog_filepicker.xml
@@ -19,30 +19,92 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
- android:layout_width="wrap_content"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content">
<LinearLayout
android:orientation="vertical"
- android:layout_width="wrap_content"
+ 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">
+
+ <TextView
+ android:id="@+id/path_name"
+ android:layout_width="wrap_content"
+ 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"/>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/gray"
android:padding="1px">
<LinearLayout
android:orientation="vertical"
- android:layout_width="wrap_content"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/white">
- <GridView android:id="@+id/files_list"
- android:padding="4px"
+ <LinearLayout
+ android:orientation="horizontal"
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" />
+ 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>
diff --git a/res/layout/gears_dialog_filepicker_cell.xml b/res/layout/gears_dialog_filepicker_cell.xml
index 1db167f..0440e1f 100644
--- a/res/layout/gears_dialog_filepicker_cell.xml
+++ b/res/layout/gears_dialog_filepicker_cell.xml
@@ -22,7 +22,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
- android:padding="2px" >
+ android:padding="4px" >
<ImageView
android:id="@+id/icon"
@@ -32,8 +32,10 @@
<TextView
android:id="@+id/name"
- android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black"
+ android:textSize="13dip"
+ android:shadowColor="@color/white"
+ android:shadowRadius="2.0"
android:singleLine="true"
android:ellipsize="middle"
android:layout_width="wrap_content"
diff --git a/res/layout/gears_dialog_settings.xml b/res/layout/gears_dialog_settings.xml
index a9026db..07b08ab 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="4dip"
+ android:padding="2dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
style="@android:style/Widget.ListView.White" />
diff --git a/res/layout/gears_dialog_settings_row.xml b/res/layout/gears_dialog_settings_row.xml
index 8a2cadf..11d757a 100644
--- a/res/layout/gears_dialog_settings_row.xml
+++ b/res/layout/gears_dialog_settings_row.xml
@@ -50,7 +50,9 @@
<TableLayout
android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:stretchColumns="0"
+ android:shrinkColumns="0">
<TableRow
android:id="@+id/local_storage_choice"
@@ -63,7 +65,10 @@
android:gravity="center_vertical"
android:text="@string/local_storage"/>
- <RadioGroup android:orientation="horizontal">
+ <RadioGroup
+ android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent">
<RadioButton
android:id="@+id/local_storage_allowed"
android:layout_width="wrap_content"
@@ -91,10 +96,13 @@
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:textColor="@color/black"
- android:gravity="center_vertical"
+ android:layout_gravity="center_vertical"
android:text="@string/location"/>
- <RadioGroup android:orientation="horizontal">
+ <RadioGroup
+ android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent">
<RadioButton
android:id="@+id/location_data_allowed"
android:layout_width="wrap_content"