merge in ics-mr1-release history after reset to ics-mr1
diff --git a/res/layout/browser_subwindow.xml b/res/layout/browser_subwindow.xml
index a731f8d..a3868cd 100644
--- a/res/layout/browser_subwindow.xml
+++ b/res/layout/browser_subwindow.xml
@@ -14,29 +14,34 @@
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/subwindow_container"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@android:drawable/dialog_frame" >
- <LinearLayout
- android:id="@+id/inner_container"
+ android:layout_height="match_parent" >
+ <FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical" >
- </LinearLayout>
+ android:padding="10dip" >
+ <LinearLayout
+ android:id="@+id/inner_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:background="@android:drawable/dialog_frame" >
+ </LinearLayout>
+ </FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="right"
- android:background="@color/black"
android:gravity="right" >
<ImageButton android:id="@+id/subwindow_close"
android:focusable="true"
+ android:padding="0dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- style="@style/HoloButton"
- android:src="@drawable/ic_close_window_holo_dark" />
+ android:background="@android:drawable/btn_default"
+ android:src="@android:drawable/ic_menu_close_clear_cancel" />
</LinearLayout>
-</FrameLayout>
+</RelativeLayout>