LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deprecate fill_parent and introduce match_parent.

Browse Source 
Bug: #2361749.
This commit is contained in:
Romain Guy
2010-01-08 15:05:33 -08:00
parent b4e39aebf6
commit 74192eafec
243 changed files with 1003 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/ApiDemos/res/layout/activity_animation.xml
View File

@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal"
android:layout_width="fill_parent" android:layout_height="fill_parent">
android:layout_width="match_parent" android:layout_height="match_parent">
<TextView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/activity_animation_msg"/>

4
samples/ApiDemos/res/layout/alarm_controller.xml
View File

@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal"
android:layout_width="fill_parent" android:layout_height="fill_parent">
android:layout_width="match_parent" android:layout_height="match_parent">
<TextView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/alarm_controller"/>

4
samples/ApiDemos/res/layout/alarm_service.xml
View File

@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal"
android:layout_width="fill_parent" android:layout_height="fill_parent">
android:layout_width="match_parent" android:layout_height="match_parent">
<TextView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/alarm_service"/>

20
samples/ApiDemos/res/layout/alert_dialog.xml
View File

@@ -18,34 +18,34 @@
See corresponding Java code com.example.android.apis.app.AlertDialogSamples.java. -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/screen"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:orientation="vertical">
<Button android:id="@+id/two_buttons"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/alert_dialog_two_buttons"/>
<Button android:id="@+id/two_buttons2"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/alert_dialog_two_buttons2"/>
<Button android:id="@+id/select_button"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/alert_dialog_select_button"/>
<Button android:id="@+id/progress_button"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/alert_dialog_progress_button"/>
<Button android:id="@+id/radio_button"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/alert_dialog_single_choice"/>
<Button android:id="@+id/checkbox_button"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/alert_dialog_multi_choice"/>
<Button android:id="@+id/checkbox_button2"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/alert_dialog_multi_choice_cursor"/>
<Button android:id="@+id/text_entry_button"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/alert_dialog_text_entry"/>
</LinearLayout>
</ScrollView>

6
samples/ApiDemos/res/layout/alert_dialog_text_entry.xml
View File

@@ -15,7 +15,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@@ -32,7 +32,7 @@
<EditText
android:id="@+id/username_edit"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
android:scrollHorizontally="true"
@@ -54,7 +54,7 @@
<EditText
android:id="@+id/password_edit"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
android:scrollHorizontally="true"

6
samples/ApiDemos/res/layout/animation_1.xml
View File

@@ -17,18 +17,18 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:padding="10dip"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dip"
android:text="@string/animation_1_instructions"
/>
<EditText android:id="@+id/pw"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:singleLine="true"

16
samples/ApiDemos/res/layout/animation_2.xml
View File

@@ -17,34 +17,34 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:padding="10dip"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ViewFlipper android:id="@+id/flipper"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:flipInterval="2000"
android:layout_marginBottom="20dip" >
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textSize="26sp"
android:text="@string/animation_2_text_1"/>
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textSize="26sp"
android:text="@string/animation_2_text_2"/>
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textSize="26sp"
android:text="@string/animation_2_text_3"/>
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textSize="26sp"
@@ -52,14 +52,14 @@
</ViewFlipper>
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dip"
android:text="@string/animation_2_instructions"
/>
<Spinner android:id="@+id/spinner"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>

6
samples/ApiDemos/res/layout/animation_3.xml
View File

@@ -17,7 +17,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:padding="10dip"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false">
@@ -29,7 +29,7 @@
android:text="@string/animation_3_text"/>
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dip"
android:layout_marginBottom="5dip"
@@ -37,7 +37,7 @@
<Spinner
android:id="@+id/spinner"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>

12
samples/ApiDemos/res/layout/animations_main_screen.xml
View File

@@ -16,21 +16,21 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/container"
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:persistentDrawingCache="animation|scrolling"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layoutAnimation="@anim/layout_bottom_to_top_slide" />
<ImageView
android:id="@+id/picture"
android:scaleType="fitCenter"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
</FrameLayout>

6
samples/ApiDemos/res/layout/appwidget_configure.xml
View File

@@ -15,20 +15,20 @@
-->
<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:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/appwidget_configure_instructions"
/>
<EditText
android:id="@+id/appwidget_prefix"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>

6
samples/ApiDemos/res/layout/autocomplete_1.xml
View File

@@ -16,7 +16,7 @@
<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">
<TextView
@@ -26,7 +26,7 @@
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -35,7 +35,7 @@
android:text="@string/autocomplete_1_country" />
<AutoCompleteTextView android:id="@+id/edit"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>

8
samples/ApiDemos/res/layout/autocomplete_2.xml
View File

@@ -16,8 +16,8 @@
<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"
android:gravity="bottom">
<Button
@@ -27,7 +27,7 @@
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -36,7 +36,7 @@
android:text="@string/autocomplete_2_country" />
<AutoCompleteTextView android:id="@+id/edit"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>

14
samples/ApiDemos/res/layout/autocomplete_3.xml
View File

@@ -15,12 +15,12 @@
-->
<ScrollView 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">
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
@@ -105,7 +105,7 @@
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -114,7 +114,7 @@
android:text="@string/autocomplete_3_country" />
<AutoCompleteTextView android:id="@+id/edit"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
@@ -146,7 +146,7 @@
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -155,7 +155,7 @@
android:text="@string/autocomplete_3_country" />
<AutoCompleteTextView android:id="@+id/edit2"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>

6
samples/ApiDemos/res/layout/autocomplete_4.xml
View File

@@ -16,7 +16,7 @@
<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">
<TextView
@@ -26,7 +26,7 @@
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -36,7 +36,7 @@
<AutoCompleteTextView android:id="@+id/edit"
android:completionThreshold="1"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>

6
samples/ApiDemos/res/layout/autocomplete_5.xml
View File

@@ -16,7 +16,7 @@
<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">
<TextView
@@ -26,7 +26,7 @@
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -37,7 +37,7 @@
<AutoCompleteTextView android:id="@+id/edit"
android:completionThreshold="1"
android:completionHint="@string/autocomplete_5_hint"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>

6
samples/ApiDemos/res/layout/autocomplete_6.xml
View File

@@ -16,7 +16,7 @@
<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">
<TextView
@@ -26,7 +26,7 @@
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -35,7 +35,7 @@
android:text="@string/autocomplete_7_country" />
<MultiAutoCompleteTextView android:id="@+id/edit"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>

2
samples/ApiDemos/res/layout/baseline_1.xml
View File

@@ -16,7 +16,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView

4
samples/ApiDemos/res/layout/baseline_2.xml
View File

@@ -16,8 +16,8 @@
<LinearLayout 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">
<TextView
android:layout_width="wrap_content"

6
samples/ApiDemos/res/layout/baseline_3.xml
View File

@@ -16,8 +16,8 @@
<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">
<TextView
android:layout_width="wrap_content"
@@ -26,7 +26,7 @@
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_weight="1.0"
android:layout_height="0dip">

4
samples/ApiDemos/res/layout/baseline_4.xml
View File

@@ -16,8 +16,8 @@
<LinearLayout 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">
<TextView
android:layout_width="wrap_content"

8
samples/ApiDemos/res/layout/baseline_6.xml
View File

@@ -15,12 +15,12 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<EditText android:id="@+id/anchor"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textSize="20sp"
android:text="@string/baseline_6_multi_line" />

4
samples/ApiDemos/res/layout/baseline_7.xml
View File

@@ -15,8 +15,8 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView android:id="@+id/anchor"
android:layout_width="wrap_content"

4
samples/ApiDemos/res/layout/baseline_nested_1.xml
View File

@@ -16,8 +16,8 @@
<LinearLayout 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">
<TextView
android:layout_width="wrap_content"

4
samples/ApiDemos/res/layout/baseline_nested_2.xml
View File

@@ -16,8 +16,8 @@
<LinearLayout 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">
<TextView
android:layout_width="wrap_content"

4
samples/ApiDemos/res/layout/baseline_nested_3.xml
View File

@@ -16,8 +16,8 @@
<LinearLayout 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">
<TextView
android:layout_width="wrap_content"

4
samples/ApiDemos/res/layout/buttons_1.xml
View File

@@ -16,8 +16,8 @@
<!-- Lots of buttons = need scrolling -->
<ScrollView 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">
<LinearLayout
android:layout_width="wrap_content"

4
samples/ApiDemos/res/layout/chronometer.xml
View File

@@ -16,8 +16,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<Chronometer android:id="@+id/chronometer"
android:format="@string/chronometer_initial_format"

4
samples/ApiDemos/res/layout/contacts_filter.xml
View File

@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal"
android:layout_width="fill_parent" android:layout_height="fill_parent">
android:layout_width="match_parent" android:layout_height="match_parent">
<TextView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/contacts_filter"/>

18
samples/ApiDemos/res/layout/controls_1.xml
View File

@@ -16,12 +16,12 @@
<ScrollView 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">
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/button"
@@ -30,7 +30,7 @@
android:layout_height="wrap_content"/>
<EditText android:id="@+id/edit"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<CheckBox android:id="@+id/check1"
@@ -46,7 +46,7 @@
android:text="@string/controls_1_checkbox_2" />
<RadioGroup
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@@ -77,13 +77,13 @@
android:layout_height="wrap_content" />
<Spinner android:id="@+id/spinner1"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawSelectorOnTop="true"
/>
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dip"
android:text="@string/textColorPrimary"
@@ -92,7 +92,7 @@
/>
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dip"
android:text="@string/textColorSecondary"
@@ -102,7 +102,7 @@
/>
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dip"
android:text="@string/textColorTertiary"

2
samples/ApiDemos/res/layout/custom_dialog_activity.xml
View File

@@ -19,6 +19,6 @@
<!-- This screen consists of a single text field that displays some text. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical|center_horizontal"
android:text="@string/custom_dialog_activity_text"/>

8
samples/ApiDemos/res/layout/custom_title.xml
View File

@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/screen"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout android:layout_width="fill_parent"
<LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false">
<EditText android:id="@+id/left_text_edit"
@@ -38,7 +38,7 @@
android:layout_gravity="center_vertical"
android:text="@string/custom_title_left_button"/>
</LinearLayout>
<LinearLayout android:layout_width="fill_parent"
<LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false">
<EditText android:id="@+id/right_text_edit"

2
samples/ApiDemos/res/layout/custom_title_1.xml
View File

@@ -18,7 +18,7 @@
See corresponding Java code com.example.android.apis.app.CustomTitle.java. -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/screen"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:orientation="vertical">
<TextView android:id="@+id/left_text"
android:layout_width="wrap_content"

8
samples/ApiDemos/res/layout/custom_view_1.xml
View File

@@ -19,24 +19,24 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res/com.example.android.apis"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.example.android.apis.view.LabelView
android:background="@drawable/red"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:text="Red"/>
<com.example.android.apis.view.LabelView
android:background="@drawable/blue"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:text="Blue" app:textSize="20dp"/>
<com.example.android.apis.view.LabelView
android:background="@drawable/green"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:text="Green" app:textColor="#ffffffff" />

2
samples/ApiDemos/res/layout/date_widgets_example_2.xml
View File

@@ -22,7 +22,7 @@
<TimePicker android:id="@+id/timePicker"
android:layout_height="wrap_content"
android:layout_width="fill_parent"/>
android:layout_width="match_parent"/>
<TextView android:id="@+id/dateDisplay"
android:layout_width="wrap_content"

2
samples/ApiDemos/res/layout/dialog_activity.xml
View File

@@ -19,6 +19,6 @@
<!-- This screen consists of a single text field that displays some text. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical|center_horizontal"
android:text="@string/dialog_activity_text"/>

6
samples/ApiDemos/res/layout/focus_1.xml
View File

@@ -16,7 +16,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:orientation="vertical">
<TextView android:id="@+id/txtStatus"
@@ -27,12 +27,12 @@
<ListView android:id="@+id/rssListView"
android:background="#7700CC00"
android:layout_height="wrap_content"
android:layout_width="fill_parent" />
android:layout_width="match_parent" />
<WebView android:id="@+id/rssWebView"
android:background="#77CC0000"
android:layout_height="50dip"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:focusable="false" />
<Button android:layout_height="wrap_content"

2
samples/ApiDemos/res/layout/focus_2.xml
View File

@@ -16,7 +16,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:orientation="horizontal">
<Button android:id="@+id/leftButton"

4
samples/ApiDemos/res/layout/focus_3.xml
View File

@@ -18,8 +18,8 @@
focus behavior that would be difficult with default focus calculation alg.-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="10dip">
<Button android:id="@+id/top"

4
samples/ApiDemos/res/layout/foreground_service_controller.xml
View File

@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal"
android:layout_width="fill_parent" android:layout_height="fill_parent">
android:layout_width="match_parent" android:layout_height="match_parent">
<TextView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/foreground_service_controller"/>

4
samples/ApiDemos/res/layout/forward_target.xml
View File

@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal"
android:layout_width="fill_parent" android:layout_height="fill_parent">
android:layout_width="match_parent" android:layout_height="match_parent">
<TextView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:text="@string/forward_target"/>

4
samples/ApiDemos/res/layout/forwarding.xml
View File

@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal"
android:layout_width="fill_parent" android:layout_height="fill_parent">
android:layout_width="match_parent" android:layout_height="match_parent">
<TextView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/forwarding"/>

2
samples/ApiDemos/res/layout/gallery_1.xml
View File

@@ -15,7 +15,7 @@
-->
<Gallery xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/gallery"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>

4
samples/ApiDemos/res/layout/gallery_2.xml
View File

@@ -16,7 +16,7 @@
<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">
<Button
@@ -28,7 +28,7 @@
/>
<Gallery android:id="@+id/gallery"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:spacing="16dp"

8
samples/ApiDemos/res/layout/google_login.xml
View File

@@ -18,8 +18,8 @@
See corresponding Java code com.android.sdk.content.StyledText -->
<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">
<Button
@@ -46,14 +46,14 @@
<TextView
android:id="@+id/username_label"
android:visibility="gone"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/googlelogin_user"/>
<TextView
android:id="@+id/username"
android:visibility="gone"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/google_login_username_text"/>

4
samples/ApiDemos/res/layout/grid_1.xml
View File

@@ -15,8 +15,8 @@
-->
<GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/myGrid"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="10dp"
android:verticalSpacing="10dp"

4
samples/ApiDemos/res/layout/grid_2.xml
View File

@@ -16,8 +16,8 @@
<GridView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/myGrid"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="10dp"
android:verticalSpacing="10dp"

2
samples/ApiDemos/res/layout/hello_world.xml
View File

@@ -20,6 +20,6 @@
<!-- This screen consists of a single text field that
displays our "Hello, World!" text. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical|center_horizontal"
android:text="@string/hello_world"/>

4
samples/ApiDemos/res/layout/image_button_1.xml
View File

@@ -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">
<ImageButton

10
samples/ApiDemos/res/layout/image_switcher_1.xml
View File

@@ -15,19 +15,19 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageSwitcher android:id="@+id/switcher"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
/>
<Gallery android:id="@+id/gallery"
android:background="#55000000"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"

24
samples/ApiDemos/res/layout/image_view_1.xml
View File

@@ -15,18 +15,18 @@
-->
<ScrollView 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">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<!-- The following four examples use a large image -->
<!-- 1. Non-scaled view, for reference -->
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:text="@string/image_view_large_normal"/>
@@ -38,7 +38,7 @@
<!-- 2. Limit to at most 50x50 -->
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:text="@string/image_view_large_at_most"/>
@@ -52,7 +52,7 @@
<!-- 3. Limit to at most 70x70, with 10 pixels of padding all around -->
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:text="@string/image_view_large_at_most_padded"/>
@@ -68,7 +68,7 @@
<!-- 4. Limit to exactly 70x70, with 10 pixels of padding all around -->
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:text="@string/image_view_large_exactly_padded"/>
@@ -83,7 +83,7 @@
<!-- Repeating the previous four examples with small image -->
<!-- 1. Non-scaled view, for reference -->
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:text="@string/image_view_small_normal"/>
@@ -96,7 +96,7 @@
<!-- 2. Limit to at most 50x50 -->
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:text="@string/image_view_small_at_most"/>
@@ -111,7 +111,7 @@
<!-- 3. Limit to at most 70x70, with 10 pixels of padding all around -->
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:text="@string/image_view_small_at_most_padded"/>
@@ -127,7 +127,7 @@
<!-- 4. Limit to exactly 70x70, with 10 pixels of padding all around -->
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:text="@string/image_view_small_exactly_padded"/>

4
samples/ApiDemos/res/layout/incoming_message.xml
View File

@@ -16,8 +16,8 @@
<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">
<Button
android:id="@+id/notify"

2
samples/ApiDemos/res/layout/incoming_message_info.xml
View File

@@ -16,7 +16,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView

4
samples/ApiDemos/res/layout/incoming_message_panel.xml
View File

@@ -15,13 +15,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"
android:background="@android:drawable/toast_frame">
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView

6
samples/ApiDemos/res/layout/incoming_message_view.xml
View File

@@ -16,8 +16,8 @@
<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"
android:paddingLeft="4dip"
android:paddingRight="4dip"
android:paddingTop="4dip"
@@ -25,7 +25,7 @@
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>

4
samples/ApiDemos/res/layout/intents.xml
View File

@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal"
android:layout_width="fill_parent" android:layout_height="fill_parent">
android:layout_width="match_parent" android:layout_height="match_parent">
<TextView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/intents"/>

6
samples/ApiDemos/res/layout/launcher_shortcuts.xml
View File

@@ -17,13 +17,13 @@
<!-- This activity provides information about launcher shortcuts -->
<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">
<!-- Section: Information -->
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="4dip"
android:text="@string/msg_launcher_shortcuts" />

4
samples/ApiDemos/res/layout/layout_animation_1.xml
View File

@@ -17,8 +17,8 @@
<GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid"
android:layoutAnimation="@anim/layout_grid_fade"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="10dp"
android:verticalSpacing="10dp"

4
samples/ApiDemos/res/layout/layout_animation_3.xml
View File

@@ -16,6 +16,6 @@
<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:layoutAnimation="@anim/layout_bottom_to_top_slide" />

4
samples/ApiDemos/res/layout/layout_animation_4.xml
View File

@@ -17,8 +17,8 @@
<GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid"
android:layoutAnimation="@anim/layout_random_fade"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="10dp"
android:verticalSpacing="10dp"

4
samples/ApiDemos/res/layout/layout_animation_5.xml
View File

@@ -17,8 +17,8 @@
<GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid"
android:layoutAnimation="@anim/layout_grid_inverse_fade"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="10dp"
android:verticalSpacing="10dp"

4
samples/ApiDemos/res/layout/layout_animation_6.xml
View File

@@ -17,8 +17,8 @@
<GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid"
android:layoutAnimation="@anim/layout_wave_scale"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:verticalSpacing="10dp"
android:horizontalSpacing="10dp"

4
samples/ApiDemos/res/layout/layout_animation_7.xml
View File

@@ -19,8 +19,8 @@
android:animationCache="false"
android:clipToPadding="false"
android:padding="12dp"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:stretchColumns="1">
<TableRow

8
samples/ApiDemos/res/layout/linear_layout_1.xml
View File

@@ -19,27 +19,27 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:background="@drawable/blue"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- view1 goes on top -->
<TextView
android:background="@drawable/box"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_1_top"/>
<!-- view2 goes in the middle -->
<TextView
android:background="@drawable/box"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_1_middle"/>
<!-- view3 goes on the bottom -->
<TextView
android:background="@drawable/box"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_1_bottom"/>

6
samples/ApiDemos/res/layout/linear_layout_10.xml
View File

@@ -18,14 +18,14 @@
TextViews, EditTexts, and Buttons. -->
<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">
<!-- Top label/button text field. -->
<LinearLayout
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:addStatesFromChildren="true"
android:gravity="center_vertical"
@@ -74,7 +74,7 @@
except for the label.) -->
<LinearLayout
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:addStatesFromChildren="true"
android:gravity="center_vertical"

10
samples/ApiDemos/res/layout/linear_layout_2.xml
View File

@@ -19,27 +19,27 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:background="@drawable/blue"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- view1 goes on top -->
<TextView
android:background="@drawable/box"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_2_top"/>
<!-- view2 goes in the middle -->
<TextView
android:background="@drawable/box"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_2_middle"/>
<!-- view3 goes on the bottom -->
<TextView
android:background="@drawable/box"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_2_bottom"/>

10
samples/ApiDemos/res/layout/linear_layout_3.xml
View File

@@ -23,20 +23,20 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:background="@drawable/blue"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- view1 goes on top -->
<TextView
android:background="@drawable/box"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_3_top"/>
<!-- view2 goes in the middle -->
<TextView
android:background="@drawable/box"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/linear_layout_3_middle"/>
@@ -44,7 +44,7 @@
<!-- view3 goes on the bottom -->
<TextView
android:background="@drawable/box"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_3_bottom"/>

12
samples/ApiDemos/res/layout/linear_layout_4.xml
View File

@@ -20,31 +20,31 @@
<LinearLayout 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">
<TextView
android:background="@drawable/red"
android:layout_width="0dip"
android:layout_height="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"/>
<TextView
android:background="@drawable/green"
android:layout_width="0dip"
android:layout_height="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"/>
<TextView
android:background="@drawable/blue"
android:layout_width="0dip"
android:layout_height="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"/>
<TextView
android:background="@drawable/yellow"
android:layout_width="0dip"
android:layout_height="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"/>
</LinearLayout>

8
samples/ApiDemos/res/layout/linear_layout_5.xml
View File

@@ -21,7 +21,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:background="@drawable/blue"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dip">
@@ -29,7 +29,7 @@
TextView goes on top...
-->
<TextView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_5_instructions"/>
@@ -42,7 +42,7 @@
an application resource.
-->
<EditText
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:drawable/editbox_background"/>
@@ -51,7 +51,7 @@
This item has layout_gravity="right". This means the whole
horizontal LinearLayout is right aligned, not the individual
items within it. The horizontal LinearLayout's width is set to
wrap_content. (If it was fill_parent it would not have any
wrap_content. (If it was match_parent it would not have any
room to slide to the right.)
-->
<LinearLayout

10
samples/ApiDemos/res/layout/linear_layout_6.xml
View File

@@ -16,7 +16,7 @@
<!--
LinearLayout which uses a combination of wrap_content on itself and
fill_parent on its children to get every item to be the same width.
match_parent on its children to get every item to be the same width.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -28,25 +28,25 @@
<TextView
android:background="@drawable/box"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_6_one"/>
<TextView
android:background="@drawable/box"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_6_two"/>
<TextView
android:background="@drawable/box"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_6_three"/>
<TextView
android:background="@drawable/box"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_6_four"/>

8
samples/ApiDemos/res/layout/linear_layout_7.xml
View File

@@ -20,27 +20,27 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:background="@drawable/red"
android:layout_width="0dip"
android:layout_height="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/linear_layout_7_small"/>
<TextView
android:background="@drawable/green"
android:layout_width="0dip"
android:layout_height="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/linear_layout_7_big"/>
<TextView
android:background="@drawable/blue"
android:layout_width="0dip"
android:layout_height="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/linear_layout_7_small" />

8
samples/ApiDemos/res/layout/linear_layout_8.xml
View File

@@ -19,15 +19,15 @@
children stacked from the top.
-->
<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:padding="30dip">
<LinearLayout
android:id="@+id/layout"
android:orientation="vertical"
android:background="@drawable/blue"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="30dip">
<TextView

8
samples/ApiDemos/res/layout/linear_layout_9.xml
View File

@@ -21,16 +21,16 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<ListView android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.0" />
<Button
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_9_button" />

18
samples/ApiDemos/res/layout/link.xml
View File

@@ -16,7 +16,7 @@
<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">
<!-- Four TextView widgets, each one displaying text containing links. -->
@@ -24,8 +24,8 @@
<!-- text1 automatically linkifies things like URLs and phone numbers. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/text1"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:autoLink="all"
android:text="@string/link_text_auto"
/>
@@ -34,23 +34,23 @@
specify links. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/text2"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/link_text_manual"
/>
<!-- text3 builds the text in the Java code using HTML. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/text3"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
<!-- text4 builds the text in the Java code without using HTML. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/text4"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
</LinearLayout>

8
samples/ApiDemos/res/layout/list_12.xml
View File

@@ -16,20 +16,20 @@
<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"
android:paddingLeft="8dip"
android:paddingRight="8dip">
<ListView android:id="@android:id/list"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:stackFromBottom="true"
android:transcriptMode="normal"/>
<EditText android:id="@+id/userText"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>

8
samples/ApiDemos/res/layout/list_13.xml
View File

@@ -16,17 +16,17 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<ListView android:id="@android:id/list"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:drawSelectorOnTop="false"/>
<TextView android:id="@+id/status"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="8dip"
android:paddingRight="8dip"/>

8
samples/ApiDemos/res/layout/list_7.xml
View File

@@ -16,19 +16,19 @@
<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"
android:paddingLeft="8dip"
android:paddingRight="8dip">
<ListView android:id="@android:id/list"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:drawSelectorOnTop="false"/>
<TextView android:id="@+id/phone"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/blue"/>

16
samples/ApiDemos/res/layout/list_8.xml
View File

@@ -16,12 +16,12 @@
<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">
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/add"
@@ -39,21 +39,21 @@
<!-- The frame layout is here since we will be showing either
the empty view or the list view. -->
<FrameLayout
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1" >
<!-- Here is the list. Since we are using a ListActivity, we
have to call it "@android:id/list" so ListActivity will
find it -->
<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"
android:drawSelectorOnTop="false"/>
<!-- Here is the view to show if the list is emtpy -->
<TextView android:id="@+id/empty"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/list_8_no_photos"/>
</FrameLayout>

2
samples/ApiDemos/res/layout/list_item_checkbox.xml
View File

@@ -16,7 +16,7 @@
<CheckBox 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"
/>

4
samples/ApiDemos/res/layout/list_item_icon_text.xml
View File

@@ -16,8 +16,8 @@
<LinearLayout 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">
<ImageView android:id="@+id/icon"
android:layout_width="48dip"

4
samples/ApiDemos/res/layout/local_sample.xml
View File

@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal"
android:layout_width="fill_parent" android:layout_height="fill_parent">
android:layout_width="match_parent" android:layout_height="match_parent">
<TextView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/local_sample"/>

4
samples/ApiDemos/res/layout/local_service_binding.xml
View File

@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal"
android:layout_width="fill_parent" android:layout_height="fill_parent">
android:layout_width="match_parent" android:layout_height="match_parent">
<TextView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/local_service_binding"/>

4
samples/ApiDemos/res/layout/local_service_controller.xml
View File

@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal"
android:layout_width="fill_parent" android:layout_height="fill_parent">
android:layout_width="match_parent" android:layout_height="match_parent">
<TextView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/local_service_controller"/>

6
samples/ApiDemos/res/layout/log_text_box_1.xml
View File

@@ -17,8 +17,8 @@
<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">
<Button
android:id="@+id/add"
@@ -29,7 +29,7 @@
<com.example.android.apis.text.LogTextBox
android:id="@+id/text"
android:background="@drawable/box"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:scrollbars="vertical"/>

8
samples/ApiDemos/res/layout/mapview.xml
View File

@@ -19,11 +19,11 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.maps.MapView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:enabled="true"
android:clickable="true"
android:apiKey="apisamples"

4
samples/ApiDemos/res/layout/marquee.xml
View File

@@ -17,8 +17,8 @@
<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">
<Button
android:layout_width="150dip"

12
samples/ApiDemos/res/layout/mediaplayer_1.xml
View File

@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<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"
>
<Button android:id="@+id/localvideo"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:text="@string/local_video"
/>
<Button android:id="@+id/streamvideo"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:text="@string/stream_video"
/>
<Button android:id="@+id/localaudio"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:text="@string/local_audio"
/>
<Button android:id="@+id/resourcesaudio"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:text="@string/res_audio"
/>

4
samples/ApiDemos/res/layout/mediaplayer_2.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<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">
<SurfaceView android:id="@+id/surface"
android:layout_width="wrap_content"

6
samples/ApiDemos/res/layout/morse_code.xml
View File

@@ -17,13 +17,13 @@
<!-- This activity exercises search invocation options -->
<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">
<EditText
android:id="@+id/text"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="4dip"
/>

4
samples/ApiDemos/res/layout/notify_with_text.xml
View File

@@ -16,8 +16,8 @@
<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">
<Button
android:id="@+id/short_notify"

4
samples/ApiDemos/res/layout/notifying_controller.xml
View File

@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal"
android:layout_width="fill_parent" android:layout_height="fill_parent">
android:layout_width="match_parent" android:layout_height="match_parent">
<TextView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/notifying_service_controller"/>

6
samples/ApiDemos/res/layout/progressbar_1.xml
View File

@@ -16,7 +16,7 @@
<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">
<ProgressBar android:id="@+id/progress_horizontal"
@@ -34,7 +34,7 @@
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/decrease"
@@ -56,7 +56,7 @@
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/decrease_secondary"

2
samples/ApiDemos/res/layout/progressbar_2.xml
View File

@@ -16,7 +16,7 @@
<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">
<ProgressBar android:id="@+android:id/progress_large"

2
samples/ApiDemos/res/layout/progressbar_3.xml
View File

@@ -16,7 +16,7 @@
<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">
<Button android:id="@+id/showIndeterminate"

2
samples/ApiDemos/res/layout/progressbar_4.xml
View File

@@ -16,7 +16,7 @@
<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">
<Button android:id="@+id/toggle"

4
samples/ApiDemos/res/layout/quick_contacts.xml
View File

@@ -16,7 +16,7 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:paddingLeft="0dip"
android:paddingRight="9dip"
android:layout_height= "wrap_content"
@@ -41,7 +41,7 @@
android:paddingLeft="2dip"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/badge"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</RelativeLayout>

6
samples/ApiDemos/res/layout/radio_group_1.xml
View File

@@ -15,11 +15,11 @@
-->
<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">
<RadioGroup
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:checkedButton="@+id/lunch"

6
samples/ApiDemos/res/layout/ratingbar_1.xml
View File

@@ -17,8 +17,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:paddingLeft="10dip"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<RatingBar android:id="@+id/ratingbar1"
android:layout_width="wrap_content"
@@ -33,7 +33,7 @@
android:rating="2.25" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dip">

4
samples/ApiDemos/res/layout/read_asset.xml
View File

@@ -18,11 +18,11 @@
See corresponding Java code com.android.sdk.content.StyledText -->
<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 android:id="@+id/text"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textStyle="normal"/>

6
samples/ApiDemos/res/layout/receive_result.xml
View File

@@ -21,16 +21,16 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal"
android:layout_width="fill_parent" android:layout_height="fill_parent">
android:layout_width="match_parent" android:layout_height="match_parent">
<TextView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/receive_result_instructions"/>
<TextView android:id="@+id/results"
android:layout_width="fill_parent" android:layout_height="10dip"
android:layout_width="match_parent" android:layout_height="10dip"
android:layout_weight="1"
android:paddingBottom="4dip"
android:background="@drawable/green">

4
samples/ApiDemos/res/layout/redirect_enter.xml
View File

@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal"
android:layout_width="fill_parent" android:layout_height="fill_parent">
android:layout_width="match_parent" android:layout_height="match_parent">
<TextView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/redirect_enter"/>

Some files were not shown because too many files have changed in this diff Show More