diff options
author | Romain Guy <romainguy@android.com> | 2010-01-08 15:06:43 -0800 |
---|---|---|
committer | Romain Guy <romainguy@android.com> | 2010-01-08 15:11:41 -0800 |
commit | 15b8ec6b226f4d57307716e1f495e10a91f8cbf4 (patch) | |
tree | fca32553554723742e4ccdf7dd7ae0cc0c8432e1 /res | |
parent | 2290d2174a096d537f8cf899243ecaa9cb88ad5b (diff) | |
download | packages_apps_browser-15b8ec6b226f4d57307716e1f495e10a91f8cbf4.zip packages_apps_browser-15b8ec6b226f4d57307716e1f495e10a91f8cbf4.tar.gz packages_apps_browser-15b8ec6b226f4d57307716e1f495e10a91f8cbf4.tar.bz2 |
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
Diffstat (limited to 'res')
34 files changed, 124 insertions, 124 deletions
diff --git a/res/layout-land/http_authentication.xml b/res/layout-land/http_authentication.xml index b2f012d..c008ceb 100644 --- a/res/layout-land/http_authentication.xml +++ b/res/layout-land/http_authentication.xml @@ -15,13 +15,13 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" android:orientation="vertical"> <TableLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dip" android:gravity="center_horizontal" > diff --git a/res/layout-land/page_info.xml b/res/layout-land/page_info.xml index 63d18ca..f4397a5 100644 --- a/res/layout-land/page_info.xml +++ b/res/layout-land/page_info.xml @@ -16,12 +16,12 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > @@ -40,7 +40,7 @@ <!-- Address: --> <TableLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:shrinkColumns="1" android:orientation="vertical"> diff --git a/res/layout-land/ssl_certificate.xml b/res/layout-land/ssl_certificate.xml index d6036c1..44c5904 100644 --- a/res/layout-land/ssl_certificate.xml +++ b/res/layout-land/ssl_certificate.xml @@ -16,11 +16,11 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > @@ -28,7 +28,7 @@ <LinearLayout android:id="@+id/placeholder" android:layout_height="wrap_content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_marginTop="12dip" android:orientation="vertical" /> @@ -36,7 +36,7 @@ <ImageView android:id="@+id/title_separator" android:src="@android:drawable/divider_horizontal_dark" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="fitXY" android:layout_weight="1" @@ -46,7 +46,7 @@ android:layout_marginBottom="12dip" /> <TableLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:shrinkColumns="1" android:orientation="vertical"> diff --git a/res/layout/active_tabs.xml b/res/layout/active_tabs.xml index d25f154..8b5fe9e 100644 --- a/res/layout/active_tabs.xml +++ b/res/layout/active_tabs.xml @@ -15,20 +15,20 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="fill_parent" - android:layout_width="fill_parent" + android:layout_height="match_parent" + android:layout_width="match_parent" android:orientation="vertical" android:background="@color/black" > <RelativeLayout style="?android:attr/windowTitleBackgroundStyle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/windowTitleSize" > <TextView android:id="@android:id/title" style="?android:attr/windowTitleStyle" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="@null" android:fadingEdge="horizontal" android:gravity="center_vertical" @@ -36,7 +36,7 @@ /> </RelativeLayout> <ListView android:id="@+id/list" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:cacheColorHint="@color/black" diff --git a/res/layout/add_new_bookmark.xml b/res/layout/add_new_bookmark.xml index 1880e20..d11a68a 100644 --- a/res/layout/add_new_bookmark.xml +++ b/res/layout/add_new_bookmark.xml @@ -15,7 +15,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:orientation="horizontal" @@ -35,7 +35,7 @@ android:scaleType="fitCenter" /> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > diff --git a/res/layout/bookmark_thumbnail.xml b/res/layout/bookmark_thumbnail.xml index 8dc5564..1f017d0 100644 --- a/res/layout/bookmark_thumbnail.xml +++ b/res/layout/bookmark_thumbnail.xml @@ -15,8 +15,8 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" android:padding="0dip" > @@ -33,8 +33,8 @@ <!-- This holds the star for addbookmark --> <LinearLayout android:id="@+id/holder" - android:layout_height="fill_parent" - android:layout_width="fill_parent" + android:layout_height="match_parent" + android:layout_width="match_parent" android:orientation="horizontal" android:background="#99000000" android:gravity="center" @@ -57,7 +57,7 @@ </LinearLayout> <TextView android:id="@+id/label" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" android:textAppearance="?android:attr/textAppearanceSmall" diff --git a/res/layout/browser_add_bookmark.xml b/res/layout/browser_add_bookmark.xml index 9fb2b46..e8a08a4 100644 --- a/res/layout/browser_add_bookmark.xml +++ b/res/layout/browser_add_bookmark.xml @@ -15,13 +15,13 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <ImageView android:id="@+id/titleDivider" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:scaleType="fitXY" android:gravity="fill_horizontal" @@ -30,7 +30,7 @@ android:layout_marginRight="10dip"/> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" @@ -78,7 +78,7 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="#c6c3c6" android:minHeight="54dip" diff --git a/res/layout/browser_bookmarks_page.xml b/res/layout/browser_bookmarks_page.xml index 3fb0308..a25dbdb 100644 --- a/res/layout/browser_bookmarks_page.xml +++ b/res/layout/browser_bookmarks_page.xml @@ -16,11 +16,11 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" > <ListView android:id="@+id/list" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" /> diff --git a/res/layout/browser_download_item.xml b/res/layout/browser_download_item.xml index c26aab9..cb8a690 100644 --- a/res/layout/browser_download_item.xml +++ b/res/layout/browser_download_item.xml @@ -20,7 +20,7 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <ImageView android:id="@+id/download_icon" @@ -70,7 +70,7 @@ <ProgressBar android:id="@+id/download_progress" style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/download_icon" android:layout_alignParentLeft="true" diff --git a/res/layout/browser_downloads_page.xml b/res/layout/browser_downloads_page.xml index 1d4d4e6..aa6a609 100644 --- a/res/layout/browser_downloads_page.xml +++ b/res/layout/browser_downloads_page.xml @@ -21,11 +21,11 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android"> <ListView android:id="@+id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent"/> + android:layout_width="match_parent" + android:layout_height="match_parent"/> <ViewStub android:id="@+id/empty" android:layout="@layout/no_downloads" - android:layout_width="fill_parent" - android:layout_height="fill_parent"/> + android:layout_width="match_parent" + android:layout_height="match_parent"/> </merge> diff --git a/res/layout/browser_find.xml b/res/layout/browser_find.xml index 7a77152..e2f0cf6 100644 --- a/res/layout/browser_find.xml +++ b/res/layout/browser_find.xml @@ -16,7 +16,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/findControls" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="5dip" android:paddingLeft="4dip" @@ -45,7 +45,7 @@ android:layout_marginRight="6dip" > <EditText android:id="@+id/edit" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:scrollHorizontally="true" android:inputType="text" diff --git a/res/layout/browser_subwindow.xml b/res/layout/browser_subwindow.xml index 0eb9e72..76d72d5 100644 --- a/res/layout/browser_subwindow.xml +++ b/res/layout/browser_subwindow.xml @@ -16,27 +16,27 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/subwindow_container" - android:layout_width="fill_parent" - android:layout_height="fill_parent" > + android:layout_width="match_parent" + android:layout_height="match_parent" > <FrameLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:padding="10dip" > <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" android:background="@android:drawable/dialog_frame" > <WebView android:id="@+id/webview" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:fadeScrollbars="true" android:scrollbarStyle="outsideOverlay" android:layout_weight="1" /> </LinearLayout> </FrameLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:layout_gravity="right" diff --git a/res/layout/custom_screen.xml b/res/layout/custom_screen.xml index 8bc03fb..90dc324 100644 --- a/res/layout/custom_screen.xml +++ b/res/layout/custom_screen.xml @@ -18,21 +18,21 @@ <FrameLayout android:id="@+id/fullscreen_custom_content" android:visibility="gone" android:background="@color/black" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" /> <LinearLayout android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:id="@+id/error_console" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <FrameLayout android:id="@+id/main_content" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" /> </LinearLayout> </FrameLayout> diff --git a/res/layout/empty_history.xml b/res/layout/empty_history.xml index 8fd3c01..4484a16 100644 --- a/res/layout/empty_history.xml +++ b/res/layout/empty_history.xml @@ -16,8 +16,8 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/empty_view" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:text="@string/empty_history" android:background="@color/black" android:textColor="@color/white" diff --git a/res/layout/error_console.xml b/res/layout/error_console.xml index 0fffcde..e239622 100644 --- a/res/layout/error_console.xml +++ b/res/layout/error_console.xml @@ -17,14 +17,14 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/error_console_view_group_id" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" android:background="#000000"> <TextView android:id="@+id/error_console_header_id" android:text="@string/error_console_header_text_minimized" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="2dip" android:paddingBottom="2dip" @@ -35,7 +35,7 @@ <view class="com.android.browser.ErrorConsoleView$ErrorConsoleListView" android:id="@+id/error_console_list_id" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="200dip" android:visibility="gone" android:layout_weight="1" @@ -44,7 +44,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/error_console_eval_view_group_id" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone"> diff --git a/res/layout/geolocation_permissions_prompt.xml b/res/layout/geolocation_permissions_prompt.xml index 357da00..cdb25d2 100755 --- a/res/layout/geolocation_permissions_prompt.xml +++ b/res/layout/geolocation_permissions_prompt.xml @@ -18,13 +18,13 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:fitsSystemWindows="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <!-- Use an inner element as we can't show a hidden outermost element --> <LinearLayout android:id="@+id/inner" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/black" android:paddingTop="1px" @@ -33,21 +33,21 @@ <!-- White line --> <View android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1px" android:background="@color/white" /> <!-- Container for content --> <LinearLayout android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="@color/geolocation_permissions_prompt_background" android:padding="6dip"> <!-- 'google.com wants to know your location' --> <TextView android:id="@+id/message" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="14dip" android:textColor="@color/black" /> @@ -55,7 +55,7 @@ <!-- Checkbox --> <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <CheckBox android:id="@+id/remember" android:layout_width="wrap_content" @@ -71,7 +71,7 @@ <!-- Buttons --> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <Button android:id="@+id/share_button" android:text="@string/geolocation_permissions_prompt_share" diff --git a/res/layout/history_header.xml b/res/layout/history_header.xml index a390c37..e03b009 100644 --- a/res/layout/history_header.xml +++ b/res/layout/history_header.xml @@ -15,7 +15,7 @@ --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceMedium" diff --git a/res/layout/history_item.xml b/res/layout/history_item.xml index 50903a4..4522a75 100644 --- a/res/layout/history_item.xml +++ b/res/layout/history_item.xml @@ -15,7 +15,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:orientation="horizontal" diff --git a/res/layout/http_authentication.xml b/res/layout/http_authentication.xml index 01cd3af..cc785c9 100644 --- a/res/layout/http_authentication.xml +++ b/res/layout/http_authentication.xml @@ -15,7 +15,7 @@ --> <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" android:orientation="vertical"> diff --git a/res/layout/no_downloads.xml b/res/layout/no_downloads.xml index 1c1e1cd..6918eab 100644 --- a/res/layout/no_downloads.xml +++ b/res/layout/no_downloads.xml @@ -15,8 +15,8 @@ --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:text="@string/no_downloads" android:background="@color/black" android:textColor="@color/white" diff --git a/res/layout/page_info.xml b/res/layout/page_info.xml index ee45082..275fcf4 100644 --- a/res/layout/page_info.xml +++ b/res/layout/page_info.xml @@ -16,12 +16,12 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > @@ -40,7 +40,7 @@ <!-- Address: --> <TableLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> diff --git a/res/layout/permission_dialog.xml b/res/layout/permission_dialog.xml index ff24eaf..a9c31a3 100644 --- a/res/layout/permission_dialog.xml +++ b/res/layout/permission_dialog.xml @@ -19,13 +19,13 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:drawingCacheQuality="auto" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="0dip"> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:padding="10dip"> @@ -51,12 +51,12 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> <ImageView android:id="@+id/titleDivider" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:scaleType="fitXY" android:gravity="fill_horizontal" @@ -67,14 +67,14 @@ </LinearLayout> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingBottom="10dip" android:layout_weight="1"> <LinearLayout android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:paddingTop="10dip" android:paddingLeft="10dip" android:paddingRight="10dip" @@ -82,7 +82,7 @@ <TextView android:id="@+id/origin" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone" android:textStyle="bold" @@ -92,7 +92,7 @@ <TextView android:id="@+id/dialog_message" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingLeft="4dip" android:paddingTop="10dip" @@ -105,7 +105,7 @@ </ScrollView> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:background="@color/gray" android:layout_height="wrap_content" android:paddingTop="4dip" diff --git a/res/layout/ssl_certificate.xml b/res/layout/ssl_certificate.xml index 9f9bbf1..a137d66 100644 --- a/res/layout/ssl_certificate.xml +++ b/res/layout/ssl_certificate.xml @@ -16,11 +16,11 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > @@ -28,7 +28,7 @@ <LinearLayout android:id="@+id/placeholder" android:layout_height="wrap_content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_marginTop="12dip" android:orientation="vertical" /> @@ -36,7 +36,7 @@ <ImageView android:id="@+id/title_separator" android:src="@android:drawable/divider_horizontal_dark" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="fitXY" android:layout_weight="1" @@ -46,7 +46,7 @@ android:layout_marginBottom="12dip" /> <TableLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> diff --git a/res/layout/ssl_success.xml b/res/layout/ssl_success.xml index dad654a..e819f23 100644 --- a/res/layout/ssl_success.xml +++ b/res/layout/ssl_success.xml @@ -15,7 +15,7 @@ --> <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > diff --git a/res/layout/ssl_warning.xml b/res/layout/ssl_warning.xml index 8bc406a..285c189 100644 --- a/res/layout/ssl_warning.xml +++ b/res/layout/ssl_warning.xml @@ -15,7 +15,7 @@ --> <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:shrinkColumns="1" android:orientation="horizontal" > diff --git a/res/layout/ssl_warnings.xml b/res/layout/ssl_warnings.xml index 5a02d97..7e43256 100644 --- a/res/layout/ssl_warnings.xml +++ b/res/layout/ssl_warnings.xml @@ -16,12 +16,12 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> @@ -29,7 +29,7 @@ <TextView android:id="@+id/warnings_header" android:layout_height="wrap_content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:textSize="18sp" android:textColor="@color/ssl_text_label" android:gravity="left" @@ -42,7 +42,7 @@ <LinearLayout android:id="@+id/placeholder" android:layout_height="wrap_content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_marginTop="12dip" android:orientation="vertical" /> diff --git a/res/layout/tab.xml b/res/layout/tab.xml index e6ec970..abef51d 100755 --- a/res/layout/tab.xml +++ b/res/layout/tab.xml @@ -22,19 +22,19 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:fitsSystemWindows="true" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <!-- Wrapper layout for the WebView, which must be in a FrameLayout. --> <FrameLayout android:id="@+id/webview_wrapper" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" /> <!-- Geolocation permissions prompt --> <com.android.browser.GeolocationPermissionsPrompt android:id="@+id/geolocation_permissions_prompt" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> diff --git a/res/layout/tab_view.xml b/res/layout/tab_view.xml index a5302f4..885f4cf 100644 --- a/res/layout/tab_view.xml +++ b/res/layout/tab_view.xml @@ -17,7 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:orientation="horizontal" android:gravity="center_vertical" > @@ -37,7 +37,7 @@ android:orientation="vertical" > <TextView android:id="@+id/title" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" android:maxLines="1" @@ -45,7 +45,7 @@ android:ellipsize="end" /> <TextView android:id="@+id/url" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceSmall" android:maxLines="1" @@ -56,14 +56,14 @@ <View android:id="@+id/divider" android:background="#ff313431" android:layout_width="1dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_marginLeft="8dip" android:layout_marginTop="5dip" android:layout_marginBottom="5dip" /> <view class="com.android.browser.ActiveTabsPage$CloseHolder" android:id="@+id/close" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:paddingLeft="18dip" android:paddingRight="18dip" android:background="@drawable/close_background" diff --git a/res/layout/tab_view_add_tab.xml b/res/layout/tab_view_add_tab.xml index 0752a84..f69865e 100644 --- a/res/layout/tab_view_add_tab.xml +++ b/res/layout/tab_view_add_tab.xml @@ -17,7 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:orientation="horizontal" android:gravity="center_vertical" > @@ -28,7 +28,7 @@ android:layout_marginRight="8dip" android:src="@drawable/ic_list_new_window"/> <TextView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" android:maxLines="1" diff --git a/res/layout/tabitem.xml b/res/layout/tabitem.xml index 9c82972..6fbc0a3 100644 --- a/res/layout/tabitem.xml +++ b/res/layout/tabitem.xml @@ -15,18 +15,18 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:orientation="vertical" android:padding="4dip" android:background="@color/white"> <com.android.browser.FakeWebView android:id="@+id/icon" android:background="@color/black" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> + android:layout_width="match_parent" + android:layout_height="match_parent" /> <TextView android:id="@+id/label" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" android:textAppearance="?android:attr/textAppearanceMedium" diff --git a/res/layout/tabs.xml b/res/layout/tabs.xml index 759e0c7..c212547 100644 --- a/res/layout/tabs.xml +++ b/res/layout/tabs.xml @@ -15,21 +15,21 @@ --> <TabHost xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/tabhost" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <TabWidget android:id="@android:id/tabs" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <FrameLayout android:id="@android:id/tabcontent" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" /> diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml index 780c00a..d619d6b 100644 --- a/res/layout/title_bar.xml +++ b/res/layout/title_bar.xml @@ -16,7 +16,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:paddingLeft="8dip" @@ -27,14 +27,14 @@ <ProgressBar android:id="@+id/progress_horizontal" style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="5dip" android:layout_marginLeft="1dip" android:max="100" /> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > @@ -75,7 +75,7 @@ <ImageView android:id="@+id/rt_btn" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_marginLeft="6dip" android:scaleType="center" android:layout_marginBottom="4dip" diff --git a/res/layout/title_bar_bg.xml b/res/layout/title_bar_bg.xml index 3e19c5c..1dbc5e5 100644 --- a/res/layout/title_bar_bg.xml +++ b/res/layout/title_bar_bg.xml @@ -23,7 +23,7 @@ <view class="com.android.browser.BrowserActivity$Shadow" android:id="@+id/shadow" android:layout_height="5dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:background="@*android:drawable/title_bar_shadow" /> </LinearLayout> diff --git a/res/layout/website_settings_row.xml b/res/layout/website_settings_row.xml index d916978..6308035 100644 --- a/res/layout/website_settings_row.xml +++ b/res/layout/website_settings_row.xml @@ -16,7 +16,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:drawingCacheQuality="auto" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" android:padding="0dip"> |