summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2012-01-17 14:20:03 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-17 14:20:03 -0800
commit6acd5ec0e8a0b82ffef622567295fc6a0e8a1270 (patch)
tree5f2719f52fd8fce46772aa9493e54a2067a4b6bb
parent00004600a08fe54f28f4ad4abf18507268763be1 (diff)
parent86734cd3b3d86779a5af5888f0f7f5f1a14bfe89 (diff)
downloadpackages_apps_Browser-6acd5ec0e8a0b82ffef622567295fc6a0e8a1270.zip
packages_apps_Browser-6acd5ec0e8a0b82ffef622567295fc6a0e8a1270.tar.gz
packages_apps_Browser-6acd5ec0e8a0b82ffef622567295fc6a0e8a1270.tar.bz2
am 86734cd3: fix popup window assets
* commit '86734cd3b3d86779a5af5888f0f7f5f1a14bfe89': fix popup window assets
-rw-r--r--res/layout/browser_subwindow.xml30
1 files changed, 12 insertions, 18 deletions
diff --git a/res/layout/browser_subwindow.xml b/res/layout/browser_subwindow.xml
index a3868cd..fb6fa37 100644
--- a/res/layout/browser_subwindow.xml
+++ b/res/layout/browser_subwindow.xml
@@ -14,34 +14,28 @@
limitations under the License.
-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/subwindow_container"
+ android:orientation="vertical"
+ android:background="@android:drawable/dialog_frame"
android:layout_width="match_parent"
android:layout_height="match_parent" >
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- 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:background="@color/black"
android:layout_gravity="right"
android:gravity="right" >
<ImageButton android:id="@+id/subwindow_close"
+ style="@style/HoloButton"
android:focusable="true"
- android:padding="0dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@android:drawable/btn_default"
- android:src="@android:drawable/ic_menu_close_clear_cancel" />
+ android:src="@drawable/ic_close_window_holo_dark" />
</LinearLayout>
-</RelativeLayout>
+ <LinearLayout
+ android:id="@+id/inner_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" />
+</LinearLayout>