diff options
| author | Romain Guy <romainguy@android.com> | 2010-01-08 15:06:28 -0800 |
|---|---|---|
| committer | Romain Guy <romainguy@android.com> | 2010-01-08 15:11:38 -0800 |
| commit | 980a938c1c9a6a5791a8240e5a1e6638ab28dc77 (patch) | |
| tree | 75a3a1347b5423cc98859d3976076cea3dc22564 /core/res | |
| parent | 0a0289420227fee51406cf4cc508f09d8ecdd2f4 (diff) | |
| download | frameworks_base-980a938c1c9a6a5791a8240e5a1e6638ab28dc77.zip frameworks_base-980a938c1c9a6a5791a8240e5a1e6638ab28dc77.tar.gz frameworks_base-980a938c1c9a6a5791a8240e5a1e6638ab28dc77.tar.bz2 | |
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
Diffstat (limited to 'core/res')
93 files changed, 364 insertions, 356 deletions
diff --git a/core/res/res/layout-ja/contact_header_name.xml b/core/res/res/layout-ja/contact_header_name.xml index 7c0f63e..39d5593 100644 --- a/core/res/res/layout-ja/contact_header_name.xml +++ b/core/res/res/layout-ja/contact_header_name.xml @@ -20,11 +20,11 @@ android:orientation="vertical" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="fill_parent"> + android:layout_height="match_parent"> <TextView android:id="@+id/name" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:singleLine="true" android:ellipsize="end" android:textAppearance="?android:attr/textAppearanceMedium" diff --git a/core/res/res/layout-land/icon_menu_layout.xml b/core/res/res/layout-land/icon_menu_layout.xml index d1b25d9..58f7bfb 100644 --- a/core/res/res/layout-land/icon_menu_layout.xml +++ b/core/res/res/layout-land/icon_menu_layout.xml @@ -16,7 +16,7 @@ <com.android.internal.view.menu.IconMenuView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+android:id/icon_menu" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:rowHeight="65dip" android:maxItems="6" diff --git a/core/res/res/layout-port/icon_menu_layout.xml b/core/res/res/layout-port/icon_menu_layout.xml index 08edfcc..c84f7d2 100644 --- a/core/res/res/layout-port/icon_menu_layout.xml +++ b/core/res/res/layout-port/icon_menu_layout.xml @@ -16,7 +16,7 @@ <com.android.internal.view.menu.IconMenuView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+android:id/icon_menu" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:rowHeight="65dip" android:maxItems="6" diff --git a/core/res/res/layout/activity_list.xml b/core/res/res/layout/activity_list.xml index 2967f0f..f489ab7 100644 --- a/core/res/res/layout/activity_list.xml +++ b/core/res/res/layout/activity_list.xml @@ -15,20 +15,20 @@ --> <FrameLayout 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" > <ListView android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" /> <TextView android:id="@android:id/empty" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:gravity="center" android:text="@string/activity_list_empty" android:visibility="gone" diff --git a/core/res/res/layout/activity_list_item.xml b/core/res/res/layout/activity_list_item.xml index 7a2a0e2..25d95fd 100644 --- a/core/res/res/layout/activity_list_item.xml +++ b/core/res/res/layout/activity_list_item.xml @@ -18,7 +18,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:paddingTop="1dip" android:paddingBottom="1dip" diff --git a/core/res/res/layout/activity_list_item_2.xml b/core/res/res/layout/activity_list_item_2.xml index 78eca02..e937d7b 100644 --- a/core/res/res/layout/activity_list_item_2.xml +++ b/core/res/res/layout/activity_list_item_2.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/textAppearanceLarge" diff --git a/core/res/res/layout/alert_dialog.xml b/core/res/res/layout/alert_dialog.xml index 40e3f42..409dcd3 100644 --- a/core/res/res/layout/alert_dialog.xml +++ b/core/res/res/layout/alert_dialog.xml @@ -20,7 +20,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/parentPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:paddingTop="9dip" @@ -30,12 +30,12 @@ > <LinearLayout android:id="@+id/topPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="54dip" android:orientation="vertical"> <LinearLayout android:id="@+id/title_template" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" @@ -54,11 +54,11 @@ style="?android:attr/textAppearanceLarge" android:singleLine="true" android:ellipsize="end" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> <ImageView android:id="@+id/titleDivider" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:visibility="gone" android:scaleType="fitXY" @@ -68,12 +68,12 @@ </LinearLayout> <LinearLayout android:id="@+id/contentPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical"> <ScrollView android:id="@+id/scrollView" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="2dip" android:paddingBottom="12dip" @@ -81,30 +81,30 @@ android:paddingRight="10dip"> <TextView android:id="@+id/message" style="?android:attr/textAppearanceMedium" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="5dip" /> </ScrollView> </LinearLayout> <FrameLayout android:id="@+id/customPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1"> <FrameLayout android:id="@+android:id/custom" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="5dip" android:paddingBottom="5dip" /> </FrameLayout> <LinearLayout android:id="@+id/buttonPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="54dip" android:orientation="vertical" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingTop="4dip" diff --git a/core/res/res/layout/alert_dialog_progress.xml b/core/res/res/layout/alert_dialog_progress.xml index d2bb691..c519692 100644 --- a/core/res/res/layout/alert_dialog_progress.xml +++ b/core/res/res/layout/alert_dialog_progress.xml @@ -15,10 +15,10 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" android:layout_height="fill_parent"> + android:layout_width="wrap_content" android:layout_height="match_parent"> <ProgressBar android:id="@+id/progress" style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dip" android:layout_marginBottom="1dip" diff --git a/core/res/res/layout/always_use_checkbox.xml b/core/res/res/layout/always_use_checkbox.xml index 1f8d256..baa4bee 100644 --- a/core/res/res/layout/always_use_checkbox.xml +++ b/core/res/res/layout/always_use_checkbox.xml @@ -18,7 +18,7 @@ to make their selection the preferred activity. --> <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:paddingLeft="14dip" android:paddingRight="15dip" diff --git a/core/res/res/layout/app_permission_item.xml b/core/res/res/layout/app_permission_item.xml index 8db4dd7..1bd267f 100644 --- a/core/res/res/layout/app_permission_item.xml +++ b/core/res/res/layout/app_permission_item.xml @@ -21,7 +21,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 diff --git a/core/res/res/layout/app_perms_summary.xml b/core/res/res/layout/app_perms_summary.xml index 009eb8f..7160743 100755 --- a/core/res/res/layout/app_perms_summary.xml +++ b/core/res/res/layout/app_perms_summary.xml @@ -18,8 +18,8 @@ <LinearLayout 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"> <TextView @@ -36,7 +36,7 @@ <LinearLayout android:id="@+id/dangerous_perms_list" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:paddingLeft="16dip" android:paddingRight="12dip" android:layout_height="wrap_content" /> @@ -45,20 +45,20 @@ <LinearLayout android:id="@+id/show_more" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone" android:layout_marginTop="12dip" android:layout_marginBottom="16dip"> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:background="?android:attr/listDivider" /> <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dip" android:layout_marginBottom="12dip" @@ -77,13 +77,13 @@ android:layout_alignTop="@id/show_more_icon" android:layout_gravity="center_vertical" android:paddingLeft="6dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:background="?android:attr/listDivider" /> @@ -95,7 +95,7 @@ android:orientation="vertical" android:paddingLeft="16dip" android:paddingRight="12dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> diff --git a/core/res/res/layout/auto_complete_list.xml b/core/res/res/layout/auto_complete_list.xml index addda11..8ad5dbb 100644 --- a/core/res/res/layout/auto_complete_list.xml +++ b/core/res/res/layout/auto_complete_list.xml @@ -17,7 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:drawable/edit_text" android:divider="@android:drawable/divider_horizontal_textfield" @@ -25,14 +25,14 @@ <LinearLayout android:id="@+id/container" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingRight="0dip" /> <AutoCompleteTextView android:id="@+id/edit" android:completionThreshold="1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" android:layout_gravity="center_vertical" diff --git a/core/res/res/layout/battery_low.xml b/core/res/res/layout/battery_low.xml index 116eae7..3b62fb0 100644 --- a/core/res/res/layout/battery_low.xml +++ b/core/res/res/layout/battery_low.xml @@ -25,7 +25,7 @@ > <TextView android:id="@+id/subtitle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18dp" android:paddingLeft="19dp" @@ -35,7 +35,7 @@ /> <TextView android:id="@+id/level_percent" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18dp" android:textColor="#ffffffff" diff --git a/core/res/res/layout/battery_status.xml b/core/res/res/layout/battery_status.xml index 8b9828c..7cfec05 100644 --- a/core/res/res/layout/battery_status.xml +++ b/core/res/res/layout/battery_status.xml @@ -32,13 +32,13 @@ <LinearLayout android:id="@+id/meter" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" > <ImageView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="15dip" /> <ImageView @@ -55,8 +55,8 @@ </LinearLayout> <TextView android:id="@+id/level_percent" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:textStyle="bold" android:textSize="48dp" android:textColor="#ffffffff" diff --git a/core/res/res/layout/character_picker.xml b/core/res/res/layout/character_picker.xml index 70867d0..2508f72 100644 --- a/core/res/res/layout/character_picker.xml +++ b/core/res/res/layout/character_picker.xml @@ -17,7 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:layout_width="304dp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:background="@drawable/keyboard_popup_panel_trans_background"> <GridView diff --git a/core/res/res/layout/contact_header.xml b/core/res/res/layout/contact_header.xml index d551a26..128adc5 100644 --- a/core/res/res/layout/contact_header.xml +++ b/core/res/res/layout/contact_header.xml @@ -16,8 +16,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/banner" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="horizontal" android:background="@drawable/title_bar_medium" android:paddingRight="5dip"> @@ -37,7 +37,7 @@ android:layout_gravity="center_vertical" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> @@ -56,7 +56,7 @@ </LinearLayout> <TextView android:id="@+id/status" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceSmall" android:singleLine="true" @@ -65,7 +65,7 @@ /> <TextView android:id="@+id/status_date" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:textAppearance="?android:attr/textAppearanceSmall" diff --git a/core/res/res/layout/contact_header_name.xml b/core/res/res/layout/contact_header_name.xml index 4a53252..24db2f2 100644 --- a/core/res/res/layout/contact_header_name.xml +++ b/core/res/res/layout/contact_header_name.xml @@ -17,7 +17,7 @@ <!-- In the default locale, the "Name" field is a single TextView --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/name" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold" diff --git a/core/res/res/layout/dialog_custom_title.xml b/core/res/res/layout/dialog_custom_title.xml index 68578f5..e52fba6 100644 --- a/core/res/res/layout/dialog_custom_title.xml +++ b/core/res/res/layout/dialog_custom_title.xml @@ -22,19 +22,19 @@ This is an custom layout for a dialog. android:orientation="vertical" android:fitsSystemWindows="true"> <FrameLayout android:id="@android:id/title_container" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="24dip" android:layout_weight="0" style="?android:attr/windowTitleBackgroundStyle"> </FrameLayout> <FrameLayout - android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:foreground="?android:attr/windowContentOverlay"> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:paddingTop="6dip" android:paddingBottom="10dip" android:paddingLeft="10dip" diff --git a/core/res/res/layout/dialog_title.xml b/core/res/res/layout/dialog_title.xml index 8cfc716..949f86e 100644 --- a/core/res/res/layout/dialog_title.xml +++ b/core/res/res/layout/dialog_title.xml @@ -25,7 +25,7 @@ enabled. android:orientation="vertical" android:fitsSystemWindows="true"> <TextView android:id="@android:id/title" style="?android:attr/windowTitleStyle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="53dip" android:paddingTop="9dip" @@ -33,13 +33,13 @@ enabled. android:paddingLeft="10dip" android:paddingRight="10dip" /> <FrameLayout - android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:foreground="?android:attr/windowContentOverlay"> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> + android:layout_width="match_parent" + android:layout_height="match_parent" /> </FrameLayout> </LinearLayout> diff --git a/core/res/res/layout/dialog_title_icons.xml b/core/res/res/layout/dialog_title_icons.xml index 7c3f274..0ca6706 100644 --- a/core/res/res/layout/dialog_title_icons.xml +++ b/core/res/res/layout/dialog_title_icons.xml @@ -24,7 +24,7 @@ enabled. android:fitsSystemWindows="true"> <LinearLayout android:id="@+id/title_container" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" @@ -57,13 +57,13 @@ enabled. </LinearLayout> <FrameLayout - android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:foreground="?android:attr/windowContentOverlay"> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> + android:layout_width="match_parent" + android:layout_height="match_parent" /> </FrameLayout> </LinearLayout> diff --git a/core/res/res/layout/expandable_list_content.xml b/core/res/res/layout/expandable_list_content.xml index 05d74a6..4ed905c 100644 --- a/core/res/res/layout/expandable_list_content.xml +++ b/core/res/res/layout/expandable_list_content.xml @@ -19,6 +19,6 @@ --> <ExpandableListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:drawSelectorOnTop="false" /> diff --git a/core/res/res/layout/global_actions_item.xml b/core/res/res/layout/global_actions_item.xml index 63bb0f4..68fe960 100644 --- a/core/res/res/layout/global_actions_item.xml +++ b/core/res/res/layout/global_actions_item.xml @@ -15,7 +15,7 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:paddingLeft="11dip" @@ -25,7 +25,7 @@ <ImageView android:id="@+id/icon" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_alignParentTop="true" android:layout_alignParentBottom="true" android:layout_marginRight="9dip" @@ -33,7 +33,7 @@ <TextView android:id="@+id/status" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="26dip" android:layout_toRightOf="@id/icon" @@ -45,7 +45,7 @@ <TextView android:id="@+id/message" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_toRightOf="@id/icon" diff --git a/core/res/res/layout/google_web_content_helper_layout.xml b/core/res/res/layout/google_web_content_helper_layout.xml index 546c458..f16ffc9 100644 --- a/core/res/res/layout/google_web_content_helper_layout.xml +++ b/core/res/res/layout/google_web_content_helper_layout.xml @@ -43,8 +43,8 @@ <WebView android:id="@+id/web" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:visibility="invisible" /> diff --git a/core/res/res/layout/grant_credentials_permission.xml b/core/res/res/layout/grant_credentials_permission.xml index 84b6623..4133ea9 100644 --- a/core/res/res/layout/grant_credentials_permission.xml +++ b/core/res/res/layout/grant_credentials_permission.xml @@ -20,13 +20,13 @@ <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"> <!-- The header --> <TextView android:id="@+id/header_text" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/white" @@ -43,7 +43,7 @@ <!-- The list of packages that correspond to the requesting UID and the account/authtokenType that is being requested --> <ScrollView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:fillViewport="true" android:layout_weight="1" @@ -51,8 +51,8 @@ android:foreground="@drawable/title_bar_shadow"> <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:paddingTop="14dip" android:orientation="vertical"> @@ -70,13 +70,13 @@ android:orientation="vertical" android:paddingLeft="16dip" android:paddingRight="12dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <RelativeLayout android:paddingLeft="16dip" android:paddingRight="12dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <ImageView @@ -137,7 +137,7 @@ <!-- The buttons to allow or deny --> <LinearLayout android:id="@+id/buttons" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="52dip" android:background="@drawable/bottom_bar" android:paddingTop="4dip" diff --git a/core/res/res/layout/icon_menu_item_layout.xml b/core/res/res/layout/icon_menu_item_layout.xml index c6d9496..a73dccc 100644 --- a/core/res/res/layout/icon_menu_item_layout.xml +++ b/core/res/res/layout/icon_menu_item_layout.xml @@ -16,8 +16,8 @@ <com.android.internal.view.menu.IconMenuItemView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/title" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:paddingBottom="1dip" android:paddingLeft="3dip" android:paddingRight="3dip" diff --git a/core/res/res/layout/input_method.xml b/core/res/res/layout/input_method.xml index 1a701e9..f80d628 100644 --- a/core/res/res/layout/input_method.xml +++ b/core/res/res/layout/input_method.xml @@ -20,27 +20,27 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/parentPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <LinearLayout android:id="@+id/fullscreenArea" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <FrameLayout android:id="@android:id/extractArea" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="1" android:visibility="gone"> </FrameLayout> <FrameLayout android:id="@android:id/candidatesArea" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="invisible"> </FrameLayout> @@ -48,7 +48,7 @@ </LinearLayout> <FrameLayout android:id="@android:id/inputArea" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone"> </FrameLayout> diff --git a/core/res/res/layout/input_method_extract_view.xml b/core/res/res/layout/input_method_extract_view.xml index 1244c1d..689ba7b 100644 --- a/core/res/res/layout/input_method_extract_view.xml +++ b/core/res/res/layout/input_method_extract_view.xml @@ -25,7 +25,7 @@ <android.inputmethodservice.ExtractEditText android:id="@+id/inputExtractEditText" android:layout_width="0px" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:scrollbars="vertical" android:gravity="top" @@ -38,7 +38,7 @@ <FrameLayout android:id="@+id/inputExtractAccessories" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:paddingLeft="10dip" android:paddingRight="10dip" android:background="@android:drawable/keyboard_accessory_bg_landscape" diff --git a/core/res/res/layout/js_prompt.xml b/core/res/res/layout/js_prompt.xml index 86974ba..d80fbc8 100644 --- a/core/res/res/layout/js_prompt.xml +++ b/core/res/res/layout/js_prompt.xml @@ -16,18 +16,18 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" > <TextView android:id="@+id/message" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <EditText android:id="@+id/value" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textStyle="bold" android:inputType="text" diff --git a/core/res/res/layout/keyboard_popup_keyboard.xml b/core/res/res/layout/keyboard_popup_keyboard.xml index 1092cc0..5eb2732 100644 --- a/core/res/res/layout/keyboard_popup_keyboard.xml +++ b/core/res/res/layout/keyboard_popup_keyboard.xml @@ -19,7 +19,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="horizontal" android:background="@android:drawable/keyboard_popup_panel_background" @@ -29,7 +29,7 @@ android:id="@android:id/keyboardView" android:background="@android:color/transparent" android:layout_alignParentBottom="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:keyPreviewLayout="@layout/keyboard_key_preview" android:popupLayout="@layout/keyboard_popup_keyboard" diff --git a/core/res/res/layout/keyguard_screen_glogin_unlock.xml b/core/res/res/layout/keyguard_screen_glogin_unlock.xml index 6e00d11..8a46546 100644 --- a/core/res/res/layout/keyguard_screen_glogin_unlock.xml +++ b/core/res/res/layout/keyguard_screen_glogin_unlock.xml @@ -17,24 +17,24 @@ */ --> <LinearLayout 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:background="@android:color/background_dark" > <ScrollView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="1" android:layout_above="@+id/emergencyCall"> <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" > <TextView android:id="@+id/topHeader" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64dip" android:layout_alignParentTop="true" android:layout_marginLeft="4dip" @@ -47,14 +47,14 @@ <!-- spacer below header --> <View android:id="@+id/spacerTop" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_below="@id/topHeader" android:background="@drawable/divider_horizontal_dark"/> <TextView android:id="@+id/instructions" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/spacerTop" android:layout_marginTop="8dip" @@ -65,7 +65,7 @@ <EditText android:id="@+id/login" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/instructions" android:layout_marginTop="8dip" @@ -77,7 +77,7 @@ <EditText android:id="@+id/password" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/login" android:layout_marginTop="15dip" @@ -106,7 +106,7 @@ <!-- spacer above emergency call --> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginBottom="4dip" diff --git a/core/res/res/layout/keyguard_screen_lock.xml b/core/res/res/layout/keyguard_screen_lock.xml index b5fbace..6e4fa7d 100644 --- a/core/res/res/layout/keyguard_screen_lock.xml +++ b/core/res/res/layout/keyguard_screen_lock.xml @@ -24,13 +24,13 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:gravity="bottom" - 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_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginBottom="15dip" @@ -43,25 +43,25 @@ <!-- when sim is present --> <TextView android:id="@+id/headerSimOk1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:textSize="34sp"/> <TextView android:id="@+id/headerSimOk2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:textSize="34sp"/> <!-- when sim is missing / locked --> <TextView android:id="@+id/headerSimBad1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:text="@android:string/lockscreen_missing_sim_message" android:textAppearance="?android:attr/textAppearanceLarge"/> <TextView android:id="@+id/headerSimBad2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="7dip" android:layout_marginBottom="7dip" @@ -71,27 +71,27 @@ <!-- spacer after carrier info / sim messages --> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="8dip" android:background="@android:drawable/divider_horizontal_dark"/> <!-- time and date --> <TextView android:id="@+id/time" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:textSize="34sp"/> <TextView android:id="@+id/date" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:textSize="18sp"/> <!-- spacer after time and date --> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginBottom="8dip" android:background="@android:drawable/divider_horizontal_dark" @@ -100,7 +100,7 @@ <!-- battery info --> <LinearLayout android:id="@+id/batteryInfo" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" > @@ -124,7 +124,7 @@ <!-- spacer after battery info --> <View android:id="@+id/batteryInfoSpacer" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="8dip" android:layout_marginBottom="8dip" @@ -135,7 +135,7 @@ <LinearLayout android:id="@+id/nextAlarmInfo" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" > @@ -159,7 +159,7 @@ <!-- spacer after alarm info --> <View android:id="@+id/nextAlarmSpacer" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="8dip" android:layout_marginBottom="8dip" @@ -169,7 +169,7 @@ (shown when SIM card is present) --> <LinearLayout android:id="@+id/screenLockedInfo" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" > @@ -195,7 +195,7 @@ <!-- message about how to unlock (shown when SIM card is present) --> <TextView android:id="@+id/lockInstructions" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="5dip" android:gravity="center" diff --git a/core/res/res/layout/keyguard_screen_rotary_unlock.xml b/core/res/res/layout/keyguard_screen_rotary_unlock.xml index 59b69cd..8a7553c 100644 --- a/core/res/res/layout/keyguard_screen_rotary_unlock.xml +++ b/core/res/res/layout/keyguard_screen_rotary_unlock.xml @@ -22,14 +22,14 @@ depending on the state of the device. It is the same for landscape and portrait.--> <FrameLayout 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:id="@+id/root" > <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="#70000000" > @@ -67,7 +67,7 @@ <View android:id="@+id/divider" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="10dip" android:layout_below="@id/date" @@ -114,7 +114,7 @@ robust for different screen sizes. On hvga, the widget should be flush with the bottom.--> <com.android.internal.widget.RotarySelector android:id="@+id/rotary" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerHorizontal="true" android:layout_alignParentTop="true" diff --git a/core/res/res/layout/keyguard_screen_rotary_unlock_land.xml b/core/res/res/layout/keyguard_screen_rotary_unlock_land.xml index c503455..898aea6 100644 --- a/core/res/res/layout/keyguard_screen_rotary_unlock_land.xml +++ b/core/res/res/layout/keyguard_screen_rotary_unlock_land.xml @@ -22,14 +22,14 @@ depending on the state of the device.--> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:rotaryunlock="http://schemas.android.com/apk/res/com.android.rotaryunlock" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:id="@+id/root" > <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="#70000000" > @@ -37,7 +37,7 @@ <RelativeLayout android:orientation="vertical" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1.0" android:gravity="center_horizontal" > @@ -76,7 +76,7 @@ <View android:id="@+id/divider" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="10dip" android:layout_below="@id/date" @@ -136,7 +136,7 @@ <com.android.internal.widget.RotarySelector android:id="@+id/rotary" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:orientation="vertical" /> diff --git a/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml b/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml index 4c583d8..2fa7aaa 100644 --- a/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml +++ b/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml @@ -18,8 +18,8 @@ --> <RelativeLayout 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" android:background="@android:color/background_dark" > @@ -27,7 +27,7 @@ <LinearLayout android:id="@+id/pinDisplayGroup" android:orientation="horizontal" android:layout_centerInParent="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:addStatesFromChildren="true" android:gravity="center_vertical" @@ -41,7 +41,7 @@ <EditText android:id="@+id/pinDisplay" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:maxLines="1" android:background="@null" android:textSize="32sp" @@ -51,7 +51,7 @@ <ImageButton android:id="@+id/backspace" android:src="@android:drawable/ic_input_delete" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_marginTop="2dip" android:layout_marginRight="2dip" android:layout_marginBottom="2dip" @@ -73,7 +73,7 @@ <LinearLayout android:orientation="horizontal" android:layout_alignParentBottom="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dip" android:layout_marginLeft="8dip" diff --git a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml index 2a23ada..dad994f 100644 --- a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml +++ b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml @@ -17,20 +17,20 @@ */ --> <LinearLayout 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:background="@android:color/background_dark" android:gravity="center_horizontal"> <LinearLayout android:id="@+id/topDisplayGroup" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> <!-- header text ('Enter Pin Code') --> <TextView android:id="@+id/headerText" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:lines="2" @@ -38,7 +38,7 @@ <!-- password entry --> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:layout_marginRight="6dip" @@ -70,14 +70,14 @@ <!-- Keypad section --> <LinearLayout android:id="@+id/keyPad" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/topDisplayGroup" android:layout_marginTop="10dip" android:orientation="vertical"> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64dip" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -85,7 +85,7 @@ <Button android:id="@+id/one" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -95,7 +95,7 @@ <Button android:id="@+id/two" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -105,7 +105,7 @@ <Button android:id="@+id/three" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -115,7 +115,7 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64dip" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -123,7 +123,7 @@ <Button android:id="@+id/four" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -133,7 +133,7 @@ <Button android:id="@+id/five" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -143,7 +143,7 @@ <Button android:id="@+id/six" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -153,7 +153,7 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64dip" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -161,7 +161,7 @@ <Button android:id="@+id/seven" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -171,7 +171,7 @@ <Button android:id="@+id/eight" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -181,7 +181,7 @@ <Button android:id="@+id/nine" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -191,7 +191,7 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64dip" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -199,7 +199,7 @@ <Button android:id="@+id/ok" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -210,7 +210,7 @@ <Button android:id="@+id/zero" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -220,7 +220,7 @@ <Button android:id="@+id/cancel" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -236,7 +236,7 @@ <!-- spacer below keypad --> <View android:id="@+id/spacerBottom" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="6dip" android:layout_above="@id/emergencyCall" @@ -245,7 +245,7 @@ <!-- The emergency button should take the rest of the space and be centered vertically --> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:gravity="center" diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml index 7e365fc..f9566d8 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock.xml @@ -23,8 +23,8 @@ and portrait.--> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tabunlock="http://schemas.android.com/apk/res/com.android.tabunlock" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="#70000000" android:gravity="center_horizontal" android:id="@+id/root"> @@ -81,7 +81,7 @@ <TextView android:id="@+id/am_pm" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="bottom" android:singleLine="true" android:ellipsize="none" @@ -141,7 +141,7 @@ <com.android.internal.widget.SlidingTab android:id="@+id/tab_selector" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_marginBottom="80dip" diff --git a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml index 33afe93..9965554 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml @@ -22,8 +22,8 @@ depending on the state of the device.--> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tabunlock="http://schemas.android.com/apk/res/com.android.tabunlock" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="horizontal" android:background="#70000000" android:id="@+id/root"> @@ -31,7 +31,7 @@ <!-- left side --> <RelativeLayout android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1.0" android:layout_marginLeft="24dip" android:gravity="left"> @@ -82,7 +82,7 @@ <TextView android:id="@+id/am_pm" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="bottom" android:singleLine="true" android:ellipsize="none" @@ -144,7 +144,7 @@ android:id="@+id/tab_selector" android:orientation="vertical" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_marginRight="80dip" /> diff --git a/core/res/res/layout/keyguard_screen_unlock_landscape.xml b/core/res/res/layout/keyguard_screen_unlock_landscape.xml index f8f326a..58f36ed 100644 --- a/core/res/res/layout/keyguard_screen_unlock_landscape.xml +++ b/core/res/res/layout/keyguard_screen_unlock_landscape.xml @@ -24,8 +24,8 @@ <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="#70000000" > @@ -33,7 +33,7 @@ <LinearLayout android:orientation="vertical" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1.0" android:layout_marginLeft="24dip" android:gravity="left" @@ -81,7 +81,7 @@ <TextView android:id="@+id/am_pm" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="bottom" android:singleLine="true" android:ellipsize="none" @@ -136,20 +136,20 @@ <!-- fill space between header and button below --> <View android:layout_weight="1.0" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" /> <!-- footer --> <FrameLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dip" > <!-- option 1: a single emergency call button --> <RelativeLayout android:id="@+id/footerNormal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="left" > @@ -166,18 +166,18 @@ <!-- option 2: an emergency call button, and a 'forgot pattern?' button --> <LinearLayout android:id="@+id/footerForgotPattern" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="left" > <Button android:id="@+id/forgotPattern" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/Widget.Button.Transparent" android:visibility="invisible" /> <Button android:id="@+id/emergencyCallTogether" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/lockscreen_emergency_call" style="@style/Widget.Button.Transparent" diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml index d7c4aae..ac6cf19 100644 --- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml +++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml @@ -23,14 +23,14 @@ <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient 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" android:gravity="center_horizontal" android:background="#70000000" > <RelativeLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" > <TextView @@ -70,7 +70,7 @@ <TextView android:id="@+id/am_pm" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="bottom" android:singleLine="true" android:ellipsize="none" @@ -98,7 +98,7 @@ <View android:id="@+id/divider" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="8dip" android:layout_marginBottom="8dip" @@ -109,7 +109,7 @@ status. --> <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="0dip" android:layout_marginLeft="12dip" @@ -145,7 +145,7 @@ <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:layout_marginTop="2dip" @@ -153,14 +153,14 @@ <!-- footer --> <FrameLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" > <!-- option 1: a single emergency call button --> <RelativeLayout android:id="@+id/footerNormal" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" > <Button android:id="@+id/emergencyCallAlone" android:layout_width="wrap_content" @@ -177,13 +177,13 @@ <!-- option 2: an emergency call button, and a 'forgot pattern?' button --> <LinearLayout android:id="@+id/footerForgotPattern" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:gravity="center" > <Button android:id="@+id/emergencyCallTogether" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1.0" android:layout_marginTop="4dip" android:layout_marginBottom="4dip" @@ -196,7 +196,7 @@ /> <Button android:id="@+id/forgotPattern" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1.0" android:layout_marginTop="4dip" android:layout_marginBottom="4dip" diff --git a/core/res/res/layout/list_content.xml b/core/res/res/layout/list_content.xml index a7f3e2d..6f9f1e0 100644 --- a/core/res/res/layout/list_content.xml +++ b/core/res/res/layout/list_content.xml @@ -18,7 +18,7 @@ */ --> <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:drawSelectorOnTop="false" /> diff --git a/core/res/res/layout/list_gestures_overlay.xml b/core/res/res/layout/list_gestures_overlay.xml index 54d72c8..5ebf092 100644 --- a/core/res/res/layout/list_gestures_overlay.xml +++ b/core/res/res/layout/list_gestures_overlay.xml @@ -15,5 +15,5 @@ --> <android.gesture.GestureOverlayView 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" /> diff --git a/core/res/res/layout/list_menu_item_layout.xml b/core/res/res/layout/list_menu_item_layout.xml index df4958f..39c8872 100644 --- a/core/res/res/layout/list_menu_item_layout.xml +++ b/core/res/res/layout/list_menu_item_layout.xml @@ -15,7 +15,7 @@ --> <com.android.internal.view.menu.ListMenuItemView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight"> <!-- Icon will be inserted here. --> @@ -32,7 +32,7 @@ <TextView android:id="@+id/title" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_alignParentLeft="true" diff --git a/core/res/res/layout/media_controller.xml b/core/res/res/layout/media_controller.xml index 32db60a..f4a701e 100644 --- a/core/res/res/layout/media_controller.xml +++ b/core/res/res/layout/media_controller.xml @@ -15,17 +15,17 @@ --> <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:background="#CC666666" android:orientation="vertical"> - <ImageView android:layout_width="fill_parent" + <ImageView android:layout_width="match_parent" android:layout_height="1px" android:background="@android:drawable/divider_horizontal_dark" /> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:paddingTop="4dip" @@ -40,7 +40,7 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> diff --git a/core/res/res/layout/number_picker.xml b/core/res/res/layout/number_picker.xml index 6380d25..44dca33 100644 --- a/core/res/res/layout/number_picker.xml +++ b/core/res/res/layout/number_picker.xml @@ -20,12 +20,12 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android"> <com.android.common.widget.NumberPickerButton android:id="@+id/increment" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/timepicker_up_btn" /> <EditText android:id="@+id/timepicker_input" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:singleLine="true" @@ -35,7 +35,7 @@ android:background="@drawable/timepicker_input" /> <com.android.common.widget.NumberPickerButton android:id="@+id/decrement" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/timepicker_down_btn" /> diff --git a/core/res/res/layout/permissions_account_and_authtokentype.xml b/core/res/res/layout/permissions_account_and_authtokentype.xml index 4494a2c..8335726 100644 --- a/core/res/res/layout/permissions_account_and_authtokentype.xml +++ b/core/res/res/layout/permissions_account_and_authtokentype.xml @@ -21,7 +21,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 diff --git a/core/res/res/layout/permissions_package_list_item.xml b/core/res/res/layout/permissions_package_list_item.xml index 1bffe51..3c9570e 100644 --- a/core/res/res/layout/permissions_package_list_item.xml +++ b/core/res/res/layout/permissions_package_list_item.xml @@ -21,7 +21,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 diff --git a/core/res/res/layout/power_dialog.xml b/core/res/res/layout/power_dialog.xml index 7c59ab4..60298d2 100644 --- a/core/res/res/layout/power_dialog.xml +++ b/core/res/res/layout/power_dialog.xml @@ -18,30 +18,30 @@ --> <FrameLayout 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"> <Button android:id="@+id/keyguard" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <Button android:id="@+id/off" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/power_off" /> <Button android:id="@+id/silent" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <Button android:id="@+id/radio_power" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> diff --git a/core/res/res/layout/preference.xml b/core/res/res/layout/preference.xml index 00745b4..e1fa230 100644 --- a/core/res/res/layout/preference.xml +++ b/core/res/res/layout/preference.xml @@ -18,7 +18,7 @@ Preference is able to place a specific widget for its particular type in the "widget_frame" layout. --> <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:gravity="center_vertical" @@ -54,7 +54,7 @@ <!-- Preference should place its actual preference widget here. --> <LinearLayout android:id="@+android:id/widget_frame" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="center_vertical" android:orientation="vertical" /> diff --git a/core/res/res/layout/preference_child.xml b/core/res/res/layout/preference_child.xml index 5f8ddd4..8975ed6 100644 --- a/core/res/res/layout/preference_child.xml +++ b/core/res/res/layout/preference_child.xml @@ -16,7 +16,7 @@ <!-- Layout for a visually child-like Preference in a PreferenceActivity. --> <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:gravity="center_vertical" @@ -53,7 +53,7 @@ <!-- Preference should place its actual preference widget here. --> <LinearLayout android:id="@+android:id/widget_frame" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="center_vertical" android:orientation="vertical" /> diff --git a/core/res/res/layout/preference_dialog_edittext.xml b/core/res/res/layout/preference_dialog_edittext.xml index 7d1faac..5cc1ea2 100644 --- a/core/res/res/layout/preference_dialog_edittext.xml +++ b/core/res/res/layout/preference_dialog_edittext.xml @@ -24,7 +24,7 @@ <TextView android:id="@+android:id/message" style="?android:attr/textAppearanceSmall" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?android:attr/textColorSecondary" /> diff --git a/core/res/res/layout/preference_information.xml b/core/res/res/layout/preference_information.xml index 8f05a8e..a5cf31a 100644 --- a/core/res/res/layout/preference_information.xml +++ b/core/res/res/layout/preference_information.xml @@ -18,7 +18,7 @@ Preference is able to place a specific widget for its particular type in the "widget_frame" layout. --> <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:gravity="center_vertical" @@ -54,7 +54,7 @@ <!-- Preference should place its actual preference widget here. --> <LinearLayout android:id="@+android:id/widget_frame" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="center_vertical" android:orientation="vertical" /> diff --git a/core/res/res/layout/preference_list_content.xml b/core/res/res/layout/preference_list_content.xml index 31113e1..8f86981 100644 --- a/core/res/res/layout/preference_list_content.xml +++ b/core/res/res/layout/preference_list_content.xml @@ -18,8 +18,8 @@ */ --> <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:drawSelectorOnTop="false" android:scrollbarAlwaysDrawVerticalTrack="true" /> diff --git a/core/res/res/layout/progress_dialog.xml b/core/res/res/layout/progress_dialog.xml index 8f66451..298173a 100644 --- a/core/res/res/layout/progress_dialog.xml +++ b/core/res/res/layout/progress_dialog.xml @@ -19,13 +19,13 @@ --> <FrameLayout 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:id="@+id/body" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:baselineAligned="false" android:paddingLeft="8dip" android:paddingTop="10dip" @@ -40,7 +40,7 @@ android:layout_marginRight="12dip" /> <TextView android:id="@+id/message" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_vertical" /> </LinearLayout> diff --git a/core/res/res/layout/recent_apps_dialog.xml b/core/res/res/layout/recent_apps_dialog.xml index c4ee95d..4e416e1 100644 --- a/core/res/res/layout/recent_apps_dialog.xml +++ b/core/res/res/layout/recent_apps_dialog.xml @@ -19,7 +19,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:padding="3dip" android:orientation="vertical"> diff --git a/core/res/res/layout/resolve_list_item.xml b/core/res/res/layout/resolve_list_item.xml index 4c5c456..6ed43de 100644 --- a/core/res/res/layout/resolve_list_item.xml +++ b/core/res/res/layout/resolve_list_item.xml @@ -22,7 +22,7 @@ android:orientation="horizontal" android:minHeight="?android:attr/listPreferredItemHeight" android:layout_height="wrap_content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:paddingLeft="10dip" android:paddingRight="15dip"> diff --git a/core/res/res/layout/screen.xml b/core/res/res/layout/screen.xml index ded97e2..dfa9731 100644 --- a/core/res/res/layout/screen.xml +++ b/core/res/res/layout/screen.xml @@ -22,13 +22,13 @@ This is the basic layout for a screen, with all of its features enabled. <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:fitsSystemWindows="true" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" > <!-- Title bar --> <RelativeLayout android:id="@android:id/title_container" style="?android:attr/windowTitleBackgroundStyle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/windowTitleSize" > <ImageView android:id="@android:id/left_icon" @@ -66,7 +66,7 @@ This is the basic layout for a screen, with all of its features enabled. </LinearLayout> <ProgressBar android:id="@+id/progress_horizontal" style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="2dip" android:layout_toLeftOf="@android:id/right_container" @@ -77,8 +77,8 @@ This is the basic layout for a screen, with all of its features enabled. /> <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:scrollHorizontally="true" @@ -90,7 +90,7 @@ This is the basic layout for a screen, with all of its features enabled. <!-- Content --> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:foregroundGravity="fill_horizontal|top" diff --git a/core/res/res/layout/screen_custom_title.xml b/core/res/res/layout/screen_custom_title.xml index 12ed1d0..34c9de0 100644 --- a/core/res/res/layout/screen_custom_title.xml +++ b/core/res/res/layout/screen_custom_title.xml @@ -22,12 +22,12 @@ This is an custom layout for a screen. android:orientation="vertical" android:fitsSystemWindows="true"> <FrameLayout android:id="@android:id/title_container" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/windowTitleSize" style="?android:attr/windowTitleBackgroundStyle"> </FrameLayout> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:foregroundGravity="fill_horizontal|top" diff --git a/core/res/res/layout/screen_progress.xml b/core/res/res/layout/screen_progress.xml index 477cadb..6e694c1 100644 --- a/core/res/res/layout/screen_progress.xml +++ b/core/res/res/layout/screen_progress.xml @@ -23,12 +23,12 @@ This is the basic layout for a screen, with all of its features enabled. <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:fitsSystemWindows="true" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" > <RelativeLayout android:id="@android:id/title_container" style="?android:attr/windowTitleBackgroundStyle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/windowTitleSize" > <ProgressBar android:id="@+android:id/progress_circular" @@ -43,7 +43,7 @@ This is the basic layout for a screen, with all of its features enabled. /> <ProgressBar android:id="@+android:id/progress_horizontal" style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="2dip" android:layout_alignParentLeft="true" @@ -54,8 +54,8 @@ This is the basic layout for a screen, with all of its features enabled. /> <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:layout_alignParentLeft="true" android:layout_toLeftOf="@android:id/progress_circular" android:background="@null" @@ -65,7 +65,7 @@ This is the basic layout for a screen, with all of its features enabled. /> </RelativeLayout> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:foregroundGravity="fill_horizontal|top" diff --git a/core/res/res/layout/screen_title.xml b/core/res/res/layout/screen_title.xml index 5fcd2dd..39ea131 100644 --- a/core/res/res/layout/screen_title.xml +++ b/core/res/res/layout/screen_title.xml @@ -23,7 +23,7 @@ enabled. android:orientation="vertical" android:fitsSystemWindows="true"> <FrameLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/windowTitleSize" style="?android:attr/windowTitleBackgroundStyle"> <TextView android:id="@android:id/title" @@ -31,11 +31,11 @@ enabled. android:background="@null" android:fadingEdge="horizontal" android:gravity="center_vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> + android:layout_width="match_parent" + android:layout_height="match_parent" /> </FrameLayout> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:foregroundGravity="fill_horizontal|top" diff --git a/core/res/res/layout/screen_title_icons.xml b/core/res/res/layout/screen_title_icons.xml index 5415909..62a0228 100644 --- a/core/res/res/layout/screen_title_icons.xml +++ b/core/res/res/layout/screen_title_icons.xml @@ -21,11 +21,11 @@ This is the basic layout for a screen, with all of its features enabled. <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:fitsSystemWindows="true" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <RelativeLayout android:id="@android:id/title_container" style="?android:attr/windowTitleBackgroundStyle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/windowTitleSize"> <!-- The title background has 9px left padding. --> <ImageView android:id="@android:id/left_icon" @@ -51,7 +51,7 @@ This is the basic layout for a screen, with all of its features enabled. the left of the title text left edge. --> <ProgressBar android:id="@+id/progress_horizontal" style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="-3dip" android:layout_toLeftOf="@android:id/progress_circular" @@ -60,8 +60,8 @@ This is the basic layout for a screen, with all of its features enabled. android:visibility="gone" android:max="10000" /> <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="horizontal" android:layout_toLeftOf="@id/progress_circular" android:layout_toRightOf="@android:id/left_icon" @@ -69,7 +69,7 @@ This is the basic layout for a screen, with all of its features enabled. <TextView android:id="@android:id/title" style="?android:attr/windowTitleStyle" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:background="@null" android:fadingEdge="horizontal" @@ -89,7 +89,7 @@ This is the basic layout for a screen, with all of its features enabled. </LinearLayout> </RelativeLayout> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:foregroundGravity="fill_horizontal|top" diff --git a/core/res/res/layout/search_bar.xml b/core/res/res/layout/search_bar.xml index 964af9b..cf246ba 100644 --- a/core/res/res/layout/search_bar.xml +++ b/core/res/res/layout/search_bar.xml @@ -21,7 +21,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" class="android.app.SearchDialog$SearchBar" android:id="@+id/search_bar" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:focusable="true" @@ -30,7 +30,7 @@ <!-- Outer layout defines the entire search bar at the top of the screen --> <LinearLayout android:id="@+id/search_plate" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:paddingLeft="12dip" @@ -52,7 +52,7 @@ <!-- Inner layout contains the app icon, button(s) and EditText --> <LinearLayout android:id="@+id/search_edit_frame" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> @@ -76,8 +76,8 @@ android:singleLine="true" android:ellipsize="end" android:inputType="text|textAutoComplete" - android:dropDownWidth="fill_parent" - android:dropDownHeight="fill_parent" + android:dropDownWidth="match_parent" + android:dropDownHeight="match_parent" android:dropDownAnchor="@id/search_plate" android:dropDownVerticalOffset="-9dip" android:popupBackground="@android:drawable/search_dropdown_background" @@ -88,13 +88,13 @@ android:id="@+id/search_go_btn" android:background="@drawable/btn_search_dialog" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" /> <ImageButton android:id="@+id/search_voice_btn" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_marginLeft="8dip" android:background="@drawable/btn_search_dialog_voice" android:src="@android:drawable/ic_btn_speak_now" diff --git a/core/res/res/layout/search_dropdown_item_1line.xml b/core/res/res/layout/search_dropdown_item_1line.xml index bf3dd48..eed8b7d 100644 --- a/core/res/res/layout/search_dropdown_item_1line.xml +++ b/core/res/res/layout/search_dropdown_item_1line.xml @@ -22,5 +22,5 @@ style="?android:attr/dropDownItemStyle" android:textAppearance="?android:attr/textAppearanceSearchResultTitle" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/searchResultListItemHeight" />
\ No newline at end of file diff --git a/core/res/res/layout/search_dropdown_item_icons_2line.xml b/core/res/res/layout/search_dropdown_item_icons_2line.xml index 2710b3b..d71b4f7 100644 --- a/core/res/res/layout/search_dropdown_item_icons_2line.xml +++ b/core/res/res/layout/search_dropdown_item_icons_2line.xml @@ -21,7 +21,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:paddingLeft="4dip" android:paddingRight="2dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/searchResultListItemHeight" > <!-- Icons come first in the layout, since their placement doesn't depend on @@ -50,7 +50,7 @@ style="?android:attr/dropDownItemStyle" android:textAppearance="?android:attr/textAppearanceSearchResultSubtitle" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="29dip" android:paddingBottom="4dip" android:gravity="top" @@ -66,7 +66,7 @@ style="?android:attr/dropDownItemStyle" android:textAppearance="?android:attr/textAppearanceSearchResultTitle" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_toRightOf="@android:id/icon1" diff --git a/core/res/res/layout/seekbar_dialog.xml b/core/res/res/layout/seekbar_dialog.xml index f61f435..84352a5 100644 --- a/core/res/res/layout/seekbar_dialog.xml +++ b/core/res/res/layout/seekbar_dialog.xml @@ -15,8 +15,8 @@ --> <LinearLayout 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:gravity="center_horizontal"> @@ -26,7 +26,7 @@ android:paddingTop="20dip" /> <SeekBar android:id="@+id/seekbar" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="20dip" /> diff --git a/core/res/res/layout/select_dialog.xml b/core/res/res/layout/select_dialog.xml index 249b527..c665f7a 100644 --- a/core/res/res/layout/select_dialog.xml +++ b/core/res/res/layout/select_dialog.xml @@ -26,8 +26,8 @@ <view class="com.android.internal.app.AlertController$RecycleListView" xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+android:id/select_dialog_listview" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:layout_marginTop="5px" android:cacheColorHint="@null" android:divider="@android:drawable/divider_horizontal_bright" diff --git a/core/res/res/layout/select_dialog_item.xml b/core/res/res/layout/select_dialog_item.xml index 60a74a4..30fe02e 100644 --- a/core/res/res/layout/select_dialog_item.xml +++ b/core/res/res/layout/select_dialog_item.xml @@ -25,7 +25,7 @@ --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" diff --git a/core/res/res/layout/select_dialog_multichoice.xml b/core/res/res/layout/select_dialog_multichoice.xml index 55fc39b..5785d3b 100644 --- a/core/res/res/layout/select_dialog_multichoice.xml +++ b/core/res/res/layout/select_dialog_multichoice.xml @@ -16,7 +16,7 @@ <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" diff --git a/core/res/res/layout/select_dialog_singlechoice.xml b/core/res/res/layout/select_dialog_singlechoice.xml index 220af64..3560fee 100644 --- a/core/res/res/layout/select_dialog_singlechoice.xml +++ b/core/res/res/layout/select_dialog_singlechoice.xml @@ -16,7 +16,7 @@ <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" diff --git a/core/res/res/layout/simple_dropdown_hint.xml b/core/res/res/layout/simple_dropdown_hint.xml index 44be46d..df9d720 100644 --- a/core/res/res/layout/simple_dropdown_hint.xml +++ b/core/res/res/layout/simple_dropdown_hint.xml @@ -25,5 +25,5 @@ android:layout_marginTop="3dip" android:layout_marginRight="3dip" android:layout_marginBottom="3dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/core/res/res/layout/simple_dropdown_item_1line.xml b/core/res/res/layout/simple_dropdown_item_1line.xml index 5745d15..18e7b88 100644 --- a/core/res/res/layout/simple_dropdown_item_1line.xml +++ b/core/res/res/layout/simple_dropdown_item_1line.xml @@ -22,6 +22,6 @@ style="?android:attr/dropDownItemStyle" android:textAppearance="?android:attr/textAppearanceLargeInverse" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:ellipsize="marquee" /> diff --git a/core/res/res/layout/simple_dropdown_item_2line.xml b/core/res/res/layout/simple_dropdown_item_2line.xml index a04c849..903adb0 100644 --- a/core/res/res/layout/simple_dropdown_item_2line.xml +++ b/core/res/res/layout/simple_dropdown_item_2line.xml @@ -19,7 +19,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:orientation="horizontal" android:gravity="center_vertical" @@ -39,7 +39,7 @@ style="?android:attr/dropDownItemStyle" android:textAppearance="?android:attr/textAppearanceLargeInverse" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <TextView @@ -48,7 +48,7 @@ android:textAppearance="?android:attr/textAppearanceSmallInverse" android:textColor="#323232" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@android:id/text1" android:layout_alignLeft="@android:id/text1" /> diff --git a/core/res/res/layout/simple_expandable_list_item_1.xml b/core/res/res/layout/simple_expandable_list_item_1.xml index 052b353..dc3e58e 100644 --- a/core/res/res/layout/simple_expandable_list_item_1.xml +++ b/core/res/res/layout/simple_expandable_list_item_1.xml @@ -16,7 +16,7 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:paddingLeft="?android:attr/expandableListPreferredItemPaddingLeft" android:textAppearance="?android:attr/textAppearanceLarge" diff --git a/core/res/res/layout/simple_expandable_list_item_2.xml b/core/res/res/layout/simple_expandable_list_item_2.xml index 741f1db..b48b444 100644 --- a/core/res/res/layout/simple_expandable_list_item_2.xml +++ b/core/res/res/layout/simple_expandable_list_item_2.xml @@ -15,7 +15,7 @@ --> <TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:paddingTop="2dip" android:paddingBottom="2dip" @@ -24,14 +24,14 @@ > <TextView android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="6dip" android:textAppearance="?android:attr/textAppearanceLarge" /> <TextView android:id="@android:id/text2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@android:id/text1" android:layout_alignLeft="@android:id/text1" diff --git a/core/res/res/layout/simple_list_item_1.xml b/core/res/res/layout/simple_list_item_1.xml index fe617ac..c9c77a5 100644 --- a/core/res/res/layout/simple_list_item_1.xml +++ b/core/res/res/layout/simple_list_item_1.xml @@ -16,7 +16,7 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center_vertical" diff --git a/core/res/res/layout/simple_list_item_2.xml b/core/res/res/layout/simple_list_item_2.xml index b5e2385..5eab54e 100644 --- a/core/res/res/layout/simple_list_item_2.xml +++ b/core/res/res/layout/simple_list_item_2.xml @@ -17,14 +17,14 @@ <TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android" android:paddingTop="2dip" android:paddingBottom="2dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:mode="twoLine" > <TextView android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="6dip" android:layout_marginTop="6dip" @@ -32,7 +32,7 @@ /> <TextView android:id="@android:id/text2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@android:id/text1" android:layout_alignLeft="@android:id/text1" diff --git a/core/res/res/layout/simple_list_item_checked.xml b/core/res/res/layout/simple_list_item_checked.xml index 95612f6..5f99044 100644 --- a/core/res/res/layout/simple_list_item_checked.xml +++ b/core/res/res/layout/simple_list_item_checked.xml @@ -16,7 +16,7 @@ <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center_vertical" diff --git a/core/res/res/layout/simple_list_item_multiple_choice.xml b/core/res/res/layout/simple_list_item_multiple_choice.xml index 102e5fc..05c66f3 100644 --- a/core/res/res/layout/simple_list_item_multiple_choice.xml +++ b/core/res/res/layout/simple_list_item_multiple_choice.xml @@ -16,7 +16,7 @@ <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center_vertical" diff --git a/core/res/res/layout/simple_list_item_single_choice.xml b/core/res/res/layout/simple_list_item_single_choice.xml index 326de1d..27afd1d 100644 --- a/core/res/res/layout/simple_list_item_single_choice.xml +++ b/core/res/res/layout/simple_list_item_single_choice.xml @@ -16,7 +16,7 @@ <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center_vertical" diff --git a/core/res/res/layout/simple_spinner_dropdown_item.xml b/core/res/res/layout/simple_spinner_dropdown_item.xml index 7006b09..5fd7a09 100644 --- a/core/res/res/layout/simple_spinner_dropdown_item.xml +++ b/core/res/res/layout/simple_spinner_dropdown_item.xml @@ -21,6 +21,6 @@ android:id="@android:id/text1" style="?android:attr/spinnerDropDownItemStyle" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:ellipsize="marquee" /> diff --git a/core/res/res/layout/simple_spinner_item.xml b/core/res/res/layout/simple_spinner_item.xml index 4dd739f..77929ee 100644 --- a/core/res/res/layout/simple_spinner_item.xml +++ b/core/res/res/layout/simple_spinner_item.xml @@ -21,6 +21,6 @@ android:id="@android:id/text1" style="?android:attr/spinnerItemStyle" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:ellipsize="marquee" /> diff --git a/core/res/res/layout/status_bar.xml b/core/res/res/layout/status_bar.xml index 0bc0dac..e8d8866 100644 --- a/core/res/res/layout/status_bar.xml +++ b/core/res/res/layout/status_bar.xml @@ -27,14 +27,14 @@ > <LinearLayout android:id="@+id/icons" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="horizontal"> <com.android.server.status.IconMerger android:id="@+id/notificationIcons" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_alignParentLeft="true" android:paddingLeft="6dip" android:gravity="center_vertical" @@ -42,7 +42,7 @@ <LinearLayout android:id="@+id/statusIcons" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_alignParentRight="true" android:paddingRight="6dip" android:gravity="center_vertical" @@ -50,14 +50,14 @@ </LinearLayout> <LinearLayout android:id="@+id/ticker" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:paddingLeft="6dip" android:animationCache="false" android:orientation="horizontal" > <ImageSwitcher android:id="@+id/tickerIcon" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_marginRight="8dip" > <com.android.server.status.AnimatedImageView @@ -76,12 +76,12 @@ android:paddingTop="2dip" android:paddingRight="10dip"> <TextView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" android:textColor="#ff000000" /> <TextView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" android:textColor="#ff000000" /> @@ -90,7 +90,7 @@ <com.android.server.status.DateView android:id="@+id/date" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:singleLine="true" android:textSize="16sp" android:textStyle="bold" diff --git a/core/res/res/layout/status_bar_expanded.xml b/core/res/res/layout/status_bar_expanded.xml index fd9d26e..a0cd11d 100644 --- a/core/res/res/layout/status_bar_expanded.xml +++ b/core/res/res/layout/status_bar_expanded.xml @@ -25,7 +25,7 @@ android:descendantFocusability="afterDescendants"> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingTop="3dp" @@ -77,26 +77,26 @@ </LinearLayout> <FrameLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" > <ScrollView android:id="@+id/scroll" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:fadingEdge="none" > <com.android.server.status.NotificationLinearLayout android:id="@+id/notificationLinearLayout" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" > <TextView android:id="@+id/noNotificationsTitle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/title_bar_portrait" android:paddingLeft="5dp" @@ -105,7 +105,7 @@ /> <TextView android:id="@+id/ongoingTitle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/title_bar_portrait" android:paddingLeft="5dp" @@ -113,13 +113,13 @@ android:text="@string/status_bar_ongoing_events_title" /> <LinearLayout android:id="@+id/ongoingItems" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" /> <TextView android:id="@+id/latestTitle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/title_bar_portrait" android:paddingLeft="5dp" @@ -127,7 +127,7 @@ android:text="@string/status_bar_latest_events_title" /> <LinearLayout android:id="@+id/latestItems" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" /> @@ -135,7 +135,7 @@ </ScrollView> <ImageView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:src="@drawable/title_bar_shadow" android:scaleType="fitXY" diff --git a/core/res/res/layout/status_bar_icon.xml b/core/res/res/layout/status_bar_icon.xml index 1516036..0536792 100644 --- a/core/res/res/layout/status_bar_icon.xml +++ b/core/res/res/layout/status_bar_icon.xml @@ -26,8 +26,8 @@ > <com.android.server.status.AnimatedImageView android:id="@+id/image" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" /> <TextView android:id="@+id/number" diff --git a/core/res/res/layout/status_bar_latest_event.xml b/core/res/res/layout/status_bar_latest_event.xml index d524bb6..59cc90d 100644 --- a/core/res/res/layout/status_bar_latest_event.xml +++ b/core/res/res/layout/status_bar_latest_event.xml @@ -1,11 +1,11 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="65sp" android:orientation="vertical" > <com.android.server.status.LatestItemView android:id="@+id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64sp" android:background="@drawable/status_bar_item_background" android:focusable="true" @@ -15,7 +15,7 @@ </com.android.server.status.LatestItemView> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1sp" android:background="@drawable/divider_horizontal_bright" /> diff --git a/core/res/res/layout/status_bar_latest_event_content.xml b/core/res/res/layout/status_bar_latest_event_content.xml index eeb9d9d..2f7036f 100644 --- a/core/res/res/layout/status_bar_latest_event_content.xml +++ b/core/res/res/layout/status_bar_latest_event_content.xml @@ -1,13 +1,13 @@ <LinearLayout 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:paddingTop="7dp" android:paddingLeft="5dp" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingTop="3dp" @@ -18,7 +18,7 @@ android:scaleType="fitCenter" android:src="@drawable/arrow_down_float"/> <TextView android:id="@+id/title" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:singleLine="true" @@ -30,7 +30,7 @@ android:textColor="#ff000000" /> </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > diff --git a/core/res/res/layout/status_bar_tracking.xml b/core/res/res/layout/status_bar_tracking.xml index aa3b733..c0a7a97 100644 --- a/core/res/res/layout/status_bar_tracking.xml +++ b/core/res/res/layout/status_bar_tracking.xml @@ -26,18 +26,18 @@ > <com.android.server.status.TrackingPatternView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" /> <com.android.server.status.CloseDragHandle android:id="@+id/close" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <ImageView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" android:scaleType="fitXY" diff --git a/core/res/res/layout/tab_content.xml b/core/res/res/layout/tab_content.xml index 8f67af0..0ee87ce 100644 --- a/core/res/res/layout/tab_content.xml +++ b/core/res/res/layout/tab_content.xml @@ -19,13 +19,13 @@ --> <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"> - <TabWidget android:id="@android:id/tabs" android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="match_parent"> + <TabWidget android:id="@android:id/tabs" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="0" /> <FrameLayout android:id="@android:id/tabcontent" - android:layout_width="fill_parent" android:layout_height="0dip" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1"/> </LinearLayout> </TabHost> diff --git a/core/res/res/layout/test_list_item.xml b/core/res/res/layout/test_list_item.xml index f4e0d3c..ede32e8 100644 --- a/core/res/res/layout/test_list_item.xml +++ b/core/res/res/layout/test_list_item.xml @@ -19,6 +19,6 @@ android:textAppearance="?android:attr/textAppearanceSmall" android:paddingTop="2dip" android:paddingBottom="3dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/core/res/res/layout/textview_hint.xml b/core/res/res/layout/textview_hint.xml index d69a2f6..4978be5 100644 --- a/core/res/res/layout/textview_hint.xml +++ b/core/res/res/layout/textview_hint.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:background="@drawable/popup_inline_error" android:textAppearance="?android:attr/textAppearanceSmallInverse" /> diff --git a/core/res/res/layout/transient_notification.xml b/core/res/res/layout/transient_notification.xml index 1d3be14..12b67f1 100644 --- a/core/res/res/layout/transient_notification.xml +++ b/core/res/res/layout/transient_notification.xml @@ -19,8 +19,8 @@ --> <LinearLayout 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:background="@drawable/toast_frame"> diff --git a/core/res/res/layout/two_line_list_item.xml b/core/res/res/layout/two_line_list_item.xml index 2a2e759..24ba47a 100644 --- a/core/res/res/layout/two_line_list_item.xml +++ b/core/res/res/layout/two_line_list_item.xml @@ -18,19 +18,19 @@ */ --> <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"> <TextView android:id="@android:id/text1" android:textSize="16sp" android:textStyle="bold" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"/> <TextView android:id="@android:id/text2" android:textSize="16sp" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"/> </LinearLayout> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 0b605ed..8dadd88 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1394,8 +1394,10 @@ be a dimension (such as "12dip") for a constant width or one of the special constants. --> <attr name="layout_width" format="dimension"> - <!-- The view should be as big as its parent (minus padding). --> + <!-- {@deprecated Use match_parent instead.} --> <enum name="fill_parent" value="-1" /> + <!-- The view should be as big as its parent (minus padding). --> + <enum name="match_parent" value="-1" /> <!-- The view should be only big enough to enclose its content (plus padding). --> <enum name="wrap_content" value="-2" /> </attr> @@ -1405,8 +1407,10 @@ be a dimension (such as "12dip") for a constant height or one of the special constants. --> <attr name="layout_height" format="dimension"> - <!-- The view should be as big as its parent (minus padding). --> + <!-- {@deprecated Use match_parent instead.} --> <enum name="fill_parent" value="-1" /> + <!-- The view should be as big as its parent (minus padding). --> + <enum name="match_parent" value="-1" /> <!-- The view should be only big enough to enclose its content (plus padding). --> <enum name="wrap_content" value="-2" /> </attr> @@ -2110,22 +2114,26 @@ is used. --> <attr name="dropDownAnchor" format="reference" /> <!-- Specifies the basic width of the dropdown. Its value may - be a dimension (such as "12dip") for a constant width, fill_parent - to fill the width of the screen, or wrap_content to match the width + be a dimension (such as "12dip") for a constant width, match_parent + to match the width of the screen, or wrap_content to match the width of the anchored view. --> <attr name="dropDownWidth" format="dimension"> - <!-- The dropdown should fill the width of the screen. --> + <!-- {@deprecated Use match_parent instead.} --> <enum name="fill_parent" value="-1" /> + <!-- The dropdown should fit the width of the screen. --> + <enum name="match_parent" value="-1" /> <!-- The dropdown should fit the width of its anchor. --> <enum name="wrap_content" value="-2" /> </attr> <!-- Specifies the basic width of the dropdown. Its value may - be a dimension (such as "12dip") for a constant width, fill_parent + be a dimension (such as "12dip") for a constant width, match_parent to fill the width of the screen, or wrap_content to match the height of the content of the drop down. --> <attr name="dropDownHeight" format="dimension"> - <!-- The dropdown should fill the width of the screen. --> + <!-- {@deprecated Use match_parent instead.} --> <enum name="fill_parent" value="-1" /> + <!-- The dropdown should fill the width of the screen. --> + <enum name="match_parent" value="-1" /> <!-- The dropdown should fit the width of its anchor. --> <enum name="wrap_content" value="-2" /> </attr> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index f2b52d9..58e9f45 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -371,7 +371,7 @@ <style name="Widget.TextView.ListSeparator"> <item name="android:background">@android:drawable/dark_header_dither</item> - <item name="android:layout_width">fill_parent</item> + <item name="android:layout_width">match_parent</item> <item name="android:layout_height">25dip</item> <item name="android:textStyle">bold</item> <item name="android:textColor">?textColorSecondary</item> |