diff options
| author | Bart Sears <bsears@google.com> | 2011-12-12 20:09:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-12 20:09:40 -0800 |
| commit | bdb45b62dded2c7260f51729f869de0e5b6410d1 (patch) | |
| tree | a10ff1978f2459de1eb2ddad5213016b5d6fde67 /res/layout | |
| parent | c0ee127ded59313cdefd738a2785a9298dc93028 (diff) | |
| parent | fc0fbd1fbf655f712cd7af912fe241ff708fe24c (diff) | |
| download | packages_apps_browser-bdb45b62dded2c7260f51729f869de0e5b6410d1.zip packages_apps_browser-bdb45b62dded2c7260f51729f869de0e5b6410d1.tar.gz packages_apps_browser-bdb45b62dded2c7260f51729f869de0e5b6410d1.tar.bz2 | |
am fc0fbd1f: am d213f5c9: Merge "Revert "Fix assets and layout for popup window"" into ics-mr1
* commit 'fc0fbd1fbf655f712cd7af912fe241ff708fe24c':
Revert "Fix assets and layout for popup window"
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/browser_subwindow.xml | 27 |
1 files changed, 16 insertions, 11 deletions
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> |