diff options
| author | John Reck <jreck@google.com> | 2011-06-30 11:55:55 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-06-30 11:55:55 -0700 |
| commit | 7c6e1c928ea078034e7eacf32ef5c209138001d9 (patch) | |
| tree | 6caee0d8a464d351645f5239daf694e0882322ee /res/layout/custom_screen.xml | |
| parent | 4399b13ca463824bbab1ba422f4004cff100b483 (diff) | |
| download | packages_apps_Browser-7c6e1c928ea078034e7eacf32ef5c209138001d9.tar.gz packages_apps_Browser-7c6e1c928ea078034e7eacf32ef5c209138001d9.tar.bz2 packages_apps_Browser-7c6e1c928ea078034e7eacf32ef5c209138001d9.zip | |
Update geolocation prompt
Bug: 4975201
Cleanup and Holo'd
Change-Id: Ia4c31f411fa6fd2f3fd05ce92f4f4b8592cc3520
Diffstat (limited to 'res/layout/custom_screen.xml')
| -rw-r--r-- | res/layout/custom_screen.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/res/layout/custom_screen.xml b/res/layout/custom_screen.xml index 21055013a..7a22530c3 100644 --- a/res/layout/custom_screen.xml +++ b/res/layout/custom_screen.xml @@ -14,7 +14,8 @@ limitations under the License. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"> +<merge + xmlns:android="http://schemas.android.com/apk/res/android"> <FrameLayout android:id="@+id/fullscreen_custom_content" android:visibility="gone" android:background="@color/black" @@ -36,5 +37,5 @@ android:layout_height="match_parent" /> </LinearLayout> -</FrameLayout> +</merge> |