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

6
apps/CustomLocale/res/layout/list_item.xml
View File

@@ -15,12 +15,12 @@
--> -->
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="5dip"> android:padding="5dip">
<TextView <TextView
android:id="@+id/locale_code" android:id="@+id/locale_code"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:textAppearanceLarge" android:textAppearance="?android:textAppearanceLarge"
android:layout_weight="1" android:layout_weight="1"
@@ -28,7 +28,7 @@
<TextView <TextView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/locale_name" android:id="@+id/locale_name"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:textAppearance" android:textAppearance="?android:textAppearance"
android:layout_weight="1" /> android:layout_weight="1" />

20
apps/CustomLocale/res/layout/main.xml
View File

@@ -16,10 +16,10 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:text="@string/header_current_locale" android:text="@string/header_current_locale"
@@ -28,12 +28,12 @@
android:background="@color/header_background" /> android:background="@color/header_background" />
<TextView <TextView
android:id="@+id/current_locale" android:id="@+id/current_locale"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:padding="5dip" /> android:padding="5dip" />
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:text="@string/header_locale_list" android:text="@string/header_locale_list"
@@ -42,18 +42,18 @@
android:background="@color/header_background" /> android:background="@color/header_background" />
<ListView <ListView
android:id="@id/android:list" android:id="@id/android:list"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:padding="8dip" /> android:padding="8dip" />
<TextView <TextView
android:id="@id/android:empty" android:id="@id/android:empty"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:text="@string/no_data_label" /> android:text="@string/no_data_label" />
<Button <Button
android:id="@+id/new_locale" android:id="@+id/new_locale"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:paddingLeft="8dip" android:paddingLeft="8dip"

12
apps/CustomLocale/res/layout/new_locale.xml
View File

@@ -16,32 +16,32 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="8dip" android:paddingLeft="8dip"
android:paddingRight="8dip"> android:paddingRight="8dip">
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/new_locale_label" /> android:text="@string/new_locale_label" />
<EditText <EditText
android:id="@+id/value" android:id="@+id/value"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/locale_default" android:inputType="text"/> android:hint="@string/locale_default" android:inputType="text"/>
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<Button <Button
android:id="@+id/add" android:id="@+id/add"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/add_button" android:layout_gravity="center_vertical"/> android:text="@string/add_button" android:layout_gravity="center_vertical"/>
<Button <Button
android:id="@+id/add_and_select" android:id="@+id/add_and_select"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/add_select_button" android:layout_gravity="center_vertical"/> android:text="@string/add_select_button" android:layout_gravity="center_vertical"/>

4
apps/Development/res/layout/account_list_view.xml
View File

@@ -16,5 +16,5 @@
<ListView <ListView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"/> android:layout_height="match_parent"/>

22
apps/Development/res/layout/accounts_tester.xml
View File

@@ -17,20 +17,20 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ListView android:id="@+id/accounts_tester_authenticators_list" <ListView android:id="@+id/accounts_tester_authenticators_list"
android:layout_width="fill_parent" android:layout_height="fill_parent"/> android:layout_width="match_parent" android:layout_height="match_parent"/>
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView android:id="@+id/accounts_tester_account_types_spinner_label" <TextView android:id="@+id/accounts_tester_account_types_spinner_label"
@@ -45,11 +45,11 @@
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<Button <Button
android:id="@+id/accounts_tester_get_accounts_by_type" android:id="@+id/accounts_tester_get_accounts_by_type"
@@ -75,7 +75,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView android:id="@+id/accounts_tester_desiredFeatures" <TextView android:id="@+id/accounts_tester_desiredFeatures"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -89,7 +89,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView android:id="@+id/accounts_tester_desiredFeatures" <TextView android:id="@+id/accounts_tester_desiredFeatures"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -106,11 +106,11 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ListView android:id="@+id/accounts_tester_accounts_list" <ListView android:id="@+id/accounts_tester_accounts_list"
android:layout_width="fill_parent" android:layout_height="fill_parent"/> android:layout_width="match_parent" android:layout_height="match_parent"/>
</LinearLayout> </LinearLayout>

36
apps/Development/res/layout/application_hw_pref.xml
View File

@@ -15,75 +15,75 @@
--> -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:padding="4dip" > android:padding="4dip" >
<TextView android:id="@+id/attr_package_label" <TextView android:id="@+id/attr_package_label"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/package_label" android:text="@string/package_label"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView android:id="@+id/attr_package" <TextView android:id="@+id/attr_package"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView android:id="@+id/attr_touchscreen_label" <TextView android:id="@+id/attr_touchscreen_label"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/touchscreen_label" android:text="@string/touchscreen_label"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView android:id="@+id/attr_touchscreen" <TextView android:id="@+id/attr_touchscreen"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView android:id="@+id/attr_input_method_label" <TextView android:id="@+id/attr_input_method_label"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/input_method_label" android:text="@string/input_method_label"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView android:id="@+id/attr_input_method" <TextView android:id="@+id/attr_input_method"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView android:id="@+id/attr_hard_keyboard_label" <TextView android:id="@+id/attr_hard_keyboard_label"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/hard_keyboard_label" android:text="@string/hard_keyboard_label"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView android:id="@+id/attr_hard_keyboard" <TextView android:id="@+id/attr_hard_keyboard"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView android:id="@+id/attr_navigation_label" <TextView android:id="@+id/attr_navigation_label"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/navigation_label" android:text="@string/navigation_label"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView android:id="@+id/attr_navigation" <TextView android:id="@+id/attr_navigation"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView android:id="@+id/attr_five_way_nav_label" <TextView android:id="@+id/attr_five_way_nav_label"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/five_way_nav_label" android:text="@string/five_way_nav_label"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView android:id="@+id/attr_five_way_nav" <TextView android:id="@+id/attr_five_way_nav"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView android:id="@+id/attr_gles_version_label" <TextView android:id="@+id/attr_gles_version_label"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/gles_version_label" android:text="@string/gles_version_label"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView android:id="@+id/attr_gles_version" <TextView android:id="@+id/attr_gles_version"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

4
apps/Development/res/layout/authenticators_list_item.xml
View File

@@ -19,7 +19,7 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingTop="1dip" android:paddingTop="1dip"
@@ -35,7 +35,7 @@
<TextView android:id="@+id/accounts_tester_authenticator_label" <TextView android:id="@+id/accounts_tester_authenticator_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_gravity="center_horizontal|center_vertical" /> android:layout_gravity="center_horizontal|center_vertical" />

4
apps/Development/res/layout/bad_behavior.xml
View File

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

34
apps/Development/res/layout/connectivity.xml
View File

@@ -20,12 +20,12 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<Button android:id="@+id/enableWifi" <Button android:id="@+id/enableWifi"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -39,13 +39,13 @@
<!-- divider line --> <!-- divider line -->
<View android:background="#FFFFFFFF" <View android:background="#FFFFFFFF"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="3dip" /> android:layout_height="3dip" />
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="4dip" android:paddingTop="4dip"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<Button android:id="@+id/startDelayedCycle" <Button android:id="@+id/startDelayedCycle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -59,7 +59,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -73,7 +73,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -87,7 +87,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -101,13 +101,13 @@
<!-- divider line --> <!-- divider line -->
<View android:background="#FFFFFFFF" <View android:background="#FFFFFFFF"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="3dip" /> android:layout_height="3dip" />
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="4dip" android:paddingTop="4dip"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<Button android:id="@+id/startScreenCycle" <Button android:id="@+id/startScreenCycle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -121,7 +121,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -135,7 +135,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -149,7 +149,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -163,13 +163,13 @@
<!-- divider line --> <!-- divider line -->
<View android:background="#FFFFFFFF" <View android:background="#FFFFFFFF"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="3dip" /> android:layout_height="3dip" />
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="4dip" android:paddingTop="4dip"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<Button android:id="@+id/start_mms" <Button android:id="@+id/start_mms"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -182,7 +182,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<Button android:id="@+id/start_hipri" <Button android:id="@+id/start_hipri"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -195,7 +195,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<Button android:id="@+id/crash" <Button android:id="@+id/crash"
android:layout_width="wrap_content" android:layout_width="wrap_content"

16
apps/Development/res/layout/development_settings.xml
View File

@@ -18,12 +18,12 @@
*/ */
--> -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<TextView android:id="@+id/debug_app_label" <TextView android:id="@+id/debug_app_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -76,7 +76,7 @@
android:text="@string/development_settings_compatibility_mode_text" /> android:text="@string/development_settings_compatibility_mode_text" />
<Spinner android:id="@+id/max_procs" <Spinner android:id="@+id/max_procs"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/compatibility_mode" android:layout_below="@id/compatibility_mode"
android:layout_alignParentLeft="true" /> android:layout_alignParentLeft="true" />
@@ -123,21 +123,21 @@
android:text="@string/development_settings_show_sleep_text" /> android:text="@string/development_settings_show_sleep_text" />
<Spinner android:id="@+id/window_animation_scale" <Spinner android:id="@+id/window_animation_scale"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/show_sleep" android:layout_below="@id/show_sleep"
android:layout_alignParentLeft="true"> android:layout_alignParentLeft="true">
</Spinner> </Spinner>
<Spinner android:id="@+id/transition_animation_scale" <Spinner android:id="@+id/transition_animation_scale"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/window_animation_scale" android:layout_below="@id/window_animation_scale"
android:layout_alignParentLeft="true"> android:layout_alignParentLeft="true">
</Spinner> </Spinner>
<Spinner android:id="@+id/font_hinting" <Spinner android:id="@+id/font_hinting"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/transition_animation_scale" android:layout_below="@id/transition_animation_scale"
android:layout_alignParentLeft="true"> android:layout_alignParentLeft="true">

8
apps/Development/res/layout/enter_url.xml
View File

@@ -15,19 +15,19 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" <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">
<com.android.development.UrlEditText android:id="@+id/url_edit_text" <com.android.development.UrlEditText android:id="@+id/url_edit_text"
android:textSize="13sp" android:textSize="13sp"
android:autoText="false" android:autoText="false"
android:capitalize="none" android:capitalize="none"
android:layout_width="fill_parent" android:layout_height="wrap_content"/> android:layout_width="match_parent" android:layout_height="wrap_content"/>
<com.android.development.DisplayEditText android:id="@+id/display_edit_text" <com.android.development.DisplayEditText android:id="@+id/display_edit_text"
android:textSize="13sp" android:textSize="13sp"
android:autoText="false" android:autoText="false"
android:capitalize="none" android:capitalize="none"
android:layout_width="fill_parent" android:layout_height="wrap_content"/> android:layout_width="match_parent" android:layout_height="wrap_content"/>
<ListView android:id="@android:id/list" <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"/>
</LinearLayout> </LinearLayout>

8
apps/Development/res/layout/get_auth_token_view.xml
View File

@@ -17,16 +17,16 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<TextView android:id="@+id/accounts_tester_get_auth_token_dialog_message" <TextView android:id="@+id/accounts_tester_get_auth_token_dialog_message"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/accounts_tester_enter_auth_token_type" /> android:text="@string/accounts_tester_enter_auth_token_type" />
<EditText android:id="@+id/accounts_tester_auth_token_type" <EditText android:id="@+id/accounts_tester_auth_token_type"
android:singleLine="true" android:singleLine="true"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minWidth="250dip" android:minWidth="250dip"
android:scrollHorizontally="true" android:scrollHorizontally="true"

4
apps/Development/res/layout/log_viewer.xml
View File

@@ -15,6 +15,6 @@
--> -->
<com.android.development.LogTextBox xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text" <com.android.development.LogTextBox xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
/> />

6
apps/Development/res/layout/media_scanner_activity.xml
View File

@@ -15,11 +15,11 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView android:id="@+id/title" android:textSize="16sp" android:textStyle="bold" <TextView android:id="@+id/title" android:textSize="16sp" android:textStyle="bold"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>

12
apps/Development/res/layout/monkey_screen.xml
View File

@@ -16,12 +16,12 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="10dip" > android:paddingTop="10dip" >
@@ -32,14 +32,14 @@
android:text="@string/monkey_screen_initial_activity_label" /> android:text="@string/monkey_screen_initial_activity_label" />
<Button android:id="@+id/initialActivity" <Button android:id="@+id/initialActivity"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/monkey_screen_initialActivity_text" /> android:text="@string/monkey_screen_initialActivity_text" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="5dip" > android:paddingTop="5dip" >
@@ -51,7 +51,7 @@
<EditText android:id="@+id/numberOfEvents" <EditText android:id="@+id/numberOfEvents"
android:layout_marginLeft="2dip" android:layout_marginLeft="2dip"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:drawable/editbox_background" android:background="@android:drawable/editbox_background"
android:numeric="integer" android:numeric="integer"

2
apps/Development/res/layout/package_item.xml
View File

@@ -15,6 +15,6 @@
--> -->
<Button xmlns:android="http://schemas.android.com/apk/res/android" <Button xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<!--android:background="@android:drawable/list_highlight"--> <!--android:background="@android:drawable/list_highlight"-->

6
apps/Development/res/layout/package_list_item.xml
View File

@@ -18,14 +18,14 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="vertical" android:orientation="vertical"
android:gravity="fill" > android:gravity="fill" >
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:orientation="horizontal" android:orientation="horizontal"
@@ -43,7 +43,7 @@
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content" >
<TextView android:id="@+id/name" <TextView android:id="@+id/name"
android:layout_width="wrap_content" android:layout_width="wrap_content"

50
apps/Development/res/layout/package_summary.xml
View File

@@ -15,21 +15,21 @@
--> -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:padding="4dip" > android:padding="4dip" >
<TextView android:id="@+id/packageView" <TextView android:id="@+id/packageView"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" /> android:textStyle="bold" />
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="4dip" android:paddingTop="4dip"
android:paddingBottom="6dip" android:paddingBottom="6dip"
@@ -44,29 +44,29 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView android:id="@+id/classView" <TextView android:id="@+id/classView"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView android:id="@+id/label" <TextView android:id="@+id/label"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView android:id="@+id/disabled" <TextView android:id="@+id/disabled"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/disabled" /> android:text="@string/disabled" />
<TextView android:id="@+id/system" <TextView android:id="@+id/system"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/system" /> android:text="@string/system" />
<TextView android:id="@+id/debuggable" <TextView android:id="@+id/debuggable"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/debuggable" /> android:text="@string/debuggable" />
<TextView android:id="@+id/nocode" <TextView android:id="@+id/nocode"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/nocode" /> android:text="@string/nocode" />
<TextView android:id="@+id/persistent" <TextView android:id="@+id/persistent"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/persistent" /> android:text="@string/persistent" />
</LinearLayout> </LinearLayout>
@@ -80,46 +80,46 @@
</LinearLayout> </LinearLayout>
<TextView style="@style/SummaryCategoryLayout" <TextView style="@style/SummaryCategoryLayout"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/package_summary_process_label" /> android:textStyle="bold" android:text="@string/package_summary_process_label" />
<TextView android:id="@+id/process" <TextView android:id="@+id/process"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout" <TextView style="@style/SummaryCategoryLayout"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/package_summary_uid_label" /> android:textStyle="bold" android:text="@string/package_summary_uid_label" />
<TextView android:id="@+id/uid" <TextView android:id="@+id/uid"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout" <TextView style="@style/SummaryCategoryLayout"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/package_summary_task_label" /> android:textStyle="bold" android:text="@string/package_summary_task_label" />
<TextView android:id="@+id/task" <TextView android:id="@+id/task"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout" <TextView style="@style/SummaryCategoryLayout"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/package_summary_version_label" /> android:textStyle="bold" android:text="@string/package_summary_version_label" />
<TextView android:id="@+id/version" <TextView android:id="@+id/version"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout" <TextView style="@style/SummaryCategoryLayout"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/package_summary_source_label" /> android:textStyle="bold" android:text="@string/package_summary_source_label" />
<TextView android:id="@+id/source" <TextView android:id="@+id/source"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout" <TextView style="@style/SummaryCategoryLayout"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/package_summary_data_label" /> android:textStyle="bold" android:text="@string/package_summary_data_label" />
<TextView android:id="@+id/data" <TextView android:id="@+id/data"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
<LinearLayout android:id="@+id/activities" style="@style/SummaryCategoryLayout"> <LinearLayout android:id="@+id/activities" style="@style/SummaryCategoryLayout">
<TextView style="@style/SummaryCategoryHeader" <TextView style="@style/SummaryCategoryHeader"

24
apps/Development/res/layout/permission_details.xml
View File

@@ -16,16 +16,16 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:fillViewport="true" android:fillViewport="true"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<LinearLayout android:orientation="vertical" <LinearLayout android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:padding="4dip" > android:padding="4dip" >
<LinearLayout android:orientation="horizontal" <LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dip" > android:padding="4dip" >
<TextView android:id="@+id/perm_name_label" <TextView android:id="@+id/perm_name_label"
@@ -39,7 +39,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout android:orientation="horizontal" <LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dip" > android:padding="4dip" >
<TextView android:id="@+id/perm_desc_label" <TextView android:id="@+id/perm_desc_label"
@@ -53,7 +53,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout android:orientation="horizontal" <LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dip" > android:padding="4dip" >
<TextView android:id="@+id/perm_group_label" <TextView android:id="@+id/perm_group_label"
@@ -67,7 +67,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout android:orientation="horizontal" <LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dip" > android:padding="4dip" >
<TextView android:id="@+id/perm_protection_label" <TextView android:id="@+id/perm_protection_label"
@@ -81,7 +81,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout android:orientation="horizontal" <LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dip" > android:padding="4dip" >
<TextView android:id="@+id/perm_source_label" <TextView android:id="@+id/perm_source_label"
@@ -95,7 +95,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout android:orientation="horizontal" <LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dip" > android:padding="4dip" >
<TextView android:id="@+id/source_uid_label" <TextView android:id="@+id/source_uid_label"
@@ -109,7 +109,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/shared_pkgs_panel" <LinearLayout android:id="@+id/shared_pkgs_panel"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dip" > android:padding="4dip" >
<TextView android:id="@+id/shared_pkgs_label" <TextView android:id="@+id/shared_pkgs_label"
@@ -128,7 +128,7 @@
android:text="@string/perm_list_header_text" android:text="@string/perm_list_header_text"
android:textStyle="bold" /> android:textStyle="bold" />
<ListView android:id="@android:id/list" <ListView android:id="@android:id/list"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

2
apps/Development/res/layout/pkg_list_item.xml
View File

@@ -18,7 +18,7 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal" android:orientation="horizontal"

16
apps/Development/res/layout/process_info.xml
View File

@@ -15,31 +15,31 @@
--> -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:padding="4dip" > android:padding="4dip" >
<TextView android:id="@+id/process_name_header" <TextView android:id="@+id/process_name_header"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/process_name_header" android:text="@string/process_name_header"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView android:id="@+id/process_name" <TextView android:id="@+id/process_name"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView android:id="@+id/package_list_header" <TextView android:id="@+id/package_list_header"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/package_list_header" android:text="@string/package_list_header"
android:textStyle="bold" /> android:textStyle="bold" />
<LinearLayout android:id="@+id/package_list" <LinearLayout android:id="@+id/package_list"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="4dip" android:paddingTop="4dip"

42
apps/Development/res/layout/show_activity.xml
View File

@@ -19,20 +19,20 @@
--> -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_width="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="8dip" android:paddingLeft="2dip" android:paddingRight="2dip" > android:paddingTop="8dip" android:paddingLeft="2dip" android:paddingRight="2dip" >
<TextView android:id="@+id/packageView" <TextView android:id="@+id/packageView"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" /> android:textStyle="bold" />
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="4dip" android:paddingTop="4dip"
android:paddingBottom="6dip" > android:paddingBottom="6dip" >
@@ -42,63 +42,63 @@
android:paddingRight="8dip" /> android:paddingRight="8dip" />
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<TextView android:id="@+id/classView" <TextView android:id="@+id/classView"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView android:id="@+id/label" <TextView android:id="@+id/label"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView android:id="@+id/launch" <TextView android:id="@+id/launch"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<TextView style="@style/SummaryCategoryLayout" <TextView style="@style/SummaryCategoryLayout"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/show_activity_process_label" /> android:textStyle="bold" android:text="@string/show_activity_process_label" />
<TextView android:id="@+id/process" <TextView android:id="@+id/process"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout" <TextView style="@style/SummaryCategoryLayout"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/show_activity_task_affinity_label" /> android:textStyle="bold" android:text="@string/show_activity_task_affinity_label" />
<TextView android:id="@+id/taskAffinity" <TextView android:id="@+id/taskAffinity"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout" <TextView style="@style/SummaryCategoryLayout"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/show_activity_required_permission_label" /> android:textStyle="bold" android:text="@string/show_activity_required_permission_label" />
<TextView android:id="@+id/permission" <TextView android:id="@+id/permission"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout" <TextView style="@style/SummaryCategoryLayout"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/show_activity_multiprocess_label" /> android:textStyle="bold" android:text="@string/show_activity_multiprocess_label" />
<TextView android:id="@+id/multiprocess" <TextView android:id="@+id/multiprocess"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout" <TextView style="@style/SummaryCategoryLayout"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/show_activity_clear_on_background_label" /> android:textStyle="bold" android:text="@string/show_activity_clear_on_background_label" />
<TextView android:id="@+id/clearOnBackground" <TextView android:id="@+id/clearOnBackground"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout" <TextView style="@style/SummaryCategoryLayout"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/show_activity_state_not_needed_label" /> android:textStyle="bold" android:text="@string/show_activity_state_not_needed_label" />
<TextView android:id="@+id/stateNotNeeded" <TextView android:id="@+id/stateNotNeeded"
android:layout_width="fill_parent" android:layout_height="wrap_content" /> android:layout_width="match_parent" android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>

10
apps/Development/res/layout/sync_adapter_driver.xml
View File

@@ -17,11 +17,11 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<LinearLayout android:orientation="vertical" <LinearLayout android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView android:id="@+id/sync_adapters_spinner_label" <TextView android:id="@+id/sync_adapters_spinner_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -34,7 +34,7 @@
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="52dip"> android:layout_height="52dip">
<Button <Button
android:id="@+id/bind_button" android:id="@+id/bind_button"
@@ -60,7 +60,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="52dip"> android:layout_height="52dip">
<Button <Button
android:id="@+id/start_sync_button" android:id="@+id/start_sync_button"

2
apps/Development/res/layout/sync_adapter_item.xml
View File

@@ -21,6 +21,6 @@
android:id="@android:id/text1" android:id="@android:id/text1"
style="?android:attr/spinnerItemStyle" style="?android:attr/spinnerItemStyle"
android:singleLine="true" android:singleLine="true"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="52dip" android:layout_height="52dip"
android:ellipsize="marquee" /> android:ellipsize="marquee" />

2
apps/Development/res/layout/url_list.xml
View File

@@ -15,7 +15,7 @@
--> -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" <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:layout_height="wrap_content"
android:textColor="#FF000000" android:textColor="#FF000000"
android:textSize="13sp" android:textSize="13sp"

6
apps/Development/res/values/styles.xml
View File

@@ -16,7 +16,7 @@
<resources> <resources>
<style name="SummaryCategoryLayout"> <style name="SummaryCategoryLayout">
<item name="android:layout_width">fill_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:orientation">vertical</item> <item name="android:orientation">vertical</item>
</style> </style>
@@ -34,8 +34,8 @@
<item name="android:paddingTop">10dip</item> <item name="android:paddingTop">10dip</item>
<item name="android:paddingRight">10dip</item> <item name="android:paddingRight">10dip</item>
<item name="android:paddingBottom">10dip</item> <item name="android:paddingBottom">10dip</item>
<item name="android:layout_width">fill_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">fill_parent</item> <item name="android:layout_height">match_parent</item>
</style> </style>
<style name="entry_layout"> <style name="entry_layout">
<item name="android:orientation">horizontal</item> <item name="android:orientation">horizontal</item>

7
apps/Development/src/com/android/development/Details.java
View File

@@ -27,7 +27,6 @@ import android.widget.ScrollView;
import android.os.Bundle; import android.os.Bundle;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
@@ -75,8 +74,8 @@ public class Details extends Activity
} }
mLinearLayout = new LinearLayout(this); mLinearLayout = new LinearLayout(this);
mScrollView.addView(mLinearLayout, new ViewGroup.LayoutParams( mScrollView.addView(mLinearLayout, new ViewGroup.LayoutParams(
ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.FILL_PARENT)); ViewGroup.LayoutParams.MATCH_PARENT));
mLinearLayout.setOrientation(LinearLayout.VERTICAL); mLinearLayout.setOrientation(LinearLayout.VERTICAL);
// Here in onStart, we're given data. We use that because some // Here in onStart, we're given data. We use that because some
@@ -109,7 +108,7 @@ public class Details extends Activity
LinearLayout.LayoutParams lazy() LinearLayout.LayoutParams lazy()
{ {
return new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, return new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT, 0); ViewGroup.LayoutParams.WRAP_CONTENT, 0);
} }

6
apps/FontLab/res/layout/font_lab.xml
View File

@@ -16,14 +16,14 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/content" android:id="@+id/content"
android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_width="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="4dip" android:paddingRight="4dip" android:paddingLeft="4dip" android:paddingRight="4dip"
android:paddingTop="4dip" android:paddingBottom="4dip"> android:paddingTop="4dip" android:paddingBottom="4dip">
<TextView android:id="@+id/column1" android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="1" <TextView android:id="@+id/column1" android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1"
android:layout_marginBottom="8dip" /> android:layout_marginBottom="8dip" />
<TextView android:id="@+id/column2" android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="1" /> <TextView android:id="@+id/column2" android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" />
</LinearLayout> </LinearLayout>

10
apps/GestureBuilder/res/layout/create_gesture.xml
View File

@@ -17,13 +17,13 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
@@ -49,7 +49,7 @@
<android.gesture.GestureOverlayView <android.gesture.GestureOverlayView
android:id="@+id/gestures_overlay" android:id="@+id/gestures_overlay"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1.0" android:layout_weight="1.0"
@@ -58,7 +58,7 @@
<LinearLayout <LinearLayout
style="@android:style/ButtonBar" style="@android:style/ButtonBar"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">

4
apps/GestureBuilder/res/layout/dialog_rename.xml
View File

@@ -15,7 +15,7 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="20dip" android:padding="20dip"
android:orientation="vertical"> android:orientation="vertical">
@@ -31,7 +31,7 @@
<EditText <EditText
android:id="@+id/name" android:id="@+id/name"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:scrollHorizontally="true" android:scrollHorizontally="true"
android:autoText="false" android:autoText="false"
android:capitalize="none" android:capitalize="none"

2
apps/GestureBuilder/res/layout/gestures_item.xml
View File

@@ -16,7 +16,7 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1" android:id="@android:id/text1"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"

10
apps/GestureBuilder/res/layout/gestures_list.xml
View File

@@ -16,21 +16,21 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<ListView <ListView
android:id="@android:id/list" android:id="@android:id/list"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1.0" /> android:layout_weight="1.0" />
<TextView <TextView
android:id="@android:id/empty" android:id="@android:id/empty"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1.0" android:layout_weight="1.0"
@@ -42,7 +42,7 @@
<LinearLayout <LinearLayout
style="@android:style/ButtonBar" style="@android:style/ButtonBar"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">

2
apps/GraphicsLab/res/layout/graphics_lab.xml
View File

@@ -16,7 +16,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/content" android:id="@+id/content"
android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_width="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="4dip" android:paddingRight="4dip" android:paddingLeft="4dip" android:paddingRight="4dip"
android:paddingTop="4dip" android:paddingBottom="4dip"> android:paddingTop="4dip" android:paddingBottom="4dip">

12
apps/SpareParts/res/layout/spare_parts.xml
View File

@@ -18,21 +18,21 @@
*/ */
--> -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<Spinner android:id="@+id/window_animation_scale" <Spinner android:id="@+id/window_animation_scale"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"> android:layout_alignParentLeft="true">
</Spinner> </Spinner>
<Spinner android:id="@+id/transition_animation_scale" <Spinner android:id="@+id/transition_animation_scale"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/window_animation_scale" android:layout_below="@id/window_animation_scale"
android:layout_alignParentLeft="true"> android:layout_alignParentLeft="true">

4
apps/Term/res/layout/term_activity.xml
View File

@@ -17,8 +17,8 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<com.android.term.EmulatorView android:id="@+id/emulatorView" <com.android.term.EmulatorView android:id="@+id/emulatorView"

30
apps/launchperf/res/layout/complex_layout.xml
View File

@@ -23,36 +23,36 @@
--> -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<!-- <TabHost <!-- <TabHost
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="200dip"> android:layout_height="200dip">
</TabHost> </TabHost>
<GridView <GridView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="200dip" android:layout_height="200dip"
android:numColumns="5"> android:numColumns="5">
</GridView> --> </GridView> -->
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="200dip" android:layout_height="200dip"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/header_absolute"/> android:text="@string/header_absolute"/>
<AbsoluteLayout <AbsoluteLayout
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_x="0dip" android:layout_x="0dip"
android:layout_y="0dip" android:layout_y="0dip"
@@ -175,12 +175,12 @@
</AbsoluteLayout> </AbsoluteLayout>
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/header_relative"/> android:text="@string/header_relative"/>
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<Button android:id="@+id/relative_button1" <Button android:id="@+id/relative_button1"
@@ -238,17 +238,17 @@
</RelativeLayout> </RelativeLayout>
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/header_linear"/> android:text="@string/header_linear"/>
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
@@ -272,11 +272,11 @@
</LinearLayout> </LinearLayout>
<EditText <EditText
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/blue" android:background="@color/blue"
android:text="@string/test_long_paragraph"/> android:text="@string/test_long_paragraph"/>

22
apps/launchperf/res/layout/simple_layout.xml
View File

@@ -26,28 +26,28 @@
a row, here set to be vertical (so the first is at the top) --> a row, here set to be vertical (so the first is at the top) -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<RelativeLayout android:id="@+id/replay_pane" <RelativeLayout android:id="@+id/replay_pane"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="True" android:layout_alignParentBottom="True"
android:background="@color/replay_background"> android:background="@color/replay_background">
<TextView android:id="@+id/instructions" <TextView android:id="@+id/instructions"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/response" /> android:text="@string/response" />
<EditText android:id="@+id/entry" <EditText android:id="@+id/entry"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="44dip" android:layout_height="44dip"
android:layout_below="@id/instructions"/> android:layout_below="@id/instructions"/>
@@ -68,13 +68,13 @@
</RelativeLayout> </RelativeLayout>
<ScrollView android:id="@+id/scroll_pane" <ScrollView android:id="@+id/scroll_pane"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:layout_above="@id/replay_pane"> android:layout_above="@id/replay_pane">
<TextView android:id="@+id/text_field" <TextView android:id="@+id/text_field"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:text="@string/text"/> android:text="@string/text"/>
<requestFocus/> <requestFocus/>

6
ndk/apps/san-angeles/project/res/layout/main.xml
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
> >
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Hello World, DemoActivity" android:text="Hello World, DemoActivity"
/> />

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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal" 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 <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:layout_weight="0"
android:paddingBottom="4dip" android:paddingBottom="4dip"
android:text="@string/activity_animation_msg"/> 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal" 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 <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:layout_weight="0"
android:paddingBottom="4dip" android:paddingBottom="4dip"
android:text="@string/alarm_controller"/> 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal" 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 <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:layout_weight="0"
android:paddingBottom="4dip" android:paddingBottom="4dip"
android:text="@string/alarm_service"/> 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. --> 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" <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"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_width="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<Button android:id="@+id/two_buttons" <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"/> android:text="@string/alert_dialog_two_buttons"/>
<Button android:id="@+id/two_buttons2" <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"/> android:text="@string/alert_dialog_two_buttons2"/>
<Button android:id="@+id/select_button" <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"/> android:text="@string/alert_dialog_select_button"/>
<Button android:id="@+id/progress_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"/> android:text="@string/alert_dialog_progress_button"/>
<Button android:id="@+id/radio_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"/> android:text="@string/alert_dialog_single_choice"/>
<Button android:id="@+id/checkbox_button" <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"/> android:text="@string/alert_dialog_multi_choice"/>
<Button android:id="@+id/checkbox_button2" <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"/> android:text="@string/alert_dialog_multi_choice_cursor"/>
<Button android:id="@+id/text_entry_button" <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"/> android:text="@string/alert_dialog_text_entry"/>
</LinearLayout> </LinearLayout>
</ScrollView> </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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
@@ -32,7 +32,7 @@
<EditText <EditText
android:id="@+id/username_edit" android:id="@+id/username_edit"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_marginLeft="20dip" android:layout_marginLeft="20dip"
android:layout_marginRight="20dip" android:layout_marginRight="20dip"
android:scrollHorizontally="true" android:scrollHorizontally="true"
@@ -54,7 +54,7 @@
<EditText <EditText
android:id="@+id/password_edit" android:id="@+id/password_edit"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_marginLeft="20dip" android:layout_marginLeft="20dip"
android:layout_marginRight="20dip" android:layout_marginRight="20dip"
android:scrollHorizontally="true" 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:padding="10dip" android:padding="10dip"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dip" android:layout_marginBottom="10dip"
android:text="@string/animation_1_instructions" android:text="@string/animation_1_instructions"
/> />
<EditText android:id="@+id/pw" <EditText android:id="@+id/pw"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
android:singleLine="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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:padding="10dip" android:padding="10dip"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ViewFlipper android:id="@+id/flipper" <ViewFlipper android:id="@+id/flipper"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:flipInterval="2000" android:flipInterval="2000"
android:layout_marginBottom="20dip" > android:layout_marginBottom="20dip" >
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textSize="26sp" android:textSize="26sp"
android:text="@string/animation_2_text_1"/> android:text="@string/animation_2_text_1"/>
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textSize="26sp" android:textSize="26sp"
android:text="@string/animation_2_text_2"/> android:text="@string/animation_2_text_2"/>
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textSize="26sp" android:textSize="26sp"
android:text="@string/animation_2_text_3"/> android:text="@string/animation_2_text_3"/>
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textSize="26sp" android:textSize="26sp"
@@ -52,14 +52,14 @@
</ViewFlipper> </ViewFlipper>
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="5dip" android:layout_marginBottom="5dip"
android:text="@string/animation_2_instructions" android:text="@string/animation_2_instructions"
/> />
<Spinner android:id="@+id/spinner" <Spinner android:id="@+id/spinner"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:padding="10dip" android:padding="10dip"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clipToPadding="false"> android:clipToPadding="false">
@@ -29,7 +29,7 @@
android:text="@string/animation_3_text"/> android:text="@string/animation_3_text"/>
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dip" android:layout_marginTop="20dip"
android:layout_marginBottom="5dip" android:layout_marginBottom="5dip"
@@ -37,7 +37,7 @@
<Spinner <Spinner
android:id="@+id/spinner" android:id="@+id/spinner"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</LinearLayout> </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" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/container" android:id="@+id/container"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<ListView <ListView
android:id="@android:id/list" android:id="@android:id/list"
android:persistentDrawingCache="animation|scrolling" android:persistentDrawingCache="animation|scrolling"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:layoutAnimation="@anim/layout_bottom_to_top_slide" /> android:layoutAnimation="@anim/layout_bottom_to_top_slide" />
<ImageView <ImageView
android:id="@+id/picture" android:id="@+id/picture"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:visibility="gone" /> android:visibility="gone" />
</FrameLayout> </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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
> >
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/appwidget_configure_instructions" android:text="@string/appwidget_configure_instructions"
/> />
<EditText <EditText
android:id="@+id/appwidget_prefix" android:id="@+id/appwidget_prefix"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@@ -26,7 +26,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@@ -35,7 +35,7 @@
android:text="@string/autocomplete_1_country" /> android:text="@string/autocomplete_1_country" />
<AutoCompleteTextView android:id="@+id/edit" <AutoCompleteTextView android:id="@+id/edit"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</LinearLayout> </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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:gravity="bottom"> android:gravity="bottom">
<Button <Button
@@ -27,7 +27,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@@ -36,7 +36,7 @@
android:text="@string/autocomplete_2_country" /> android:text="@string/autocomplete_2_country" />
<AutoCompleteTextView android:id="@+id/edit" <AutoCompleteTextView android:id="@+id/edit"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</LinearLayout> </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" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<Button <Button
@@ -105,7 +105,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@@ -114,7 +114,7 @@
android:text="@string/autocomplete_3_country" /> android:text="@string/autocomplete_3_country" />
<AutoCompleteTextView android:id="@+id/edit" <AutoCompleteTextView android:id="@+id/edit"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
@@ -146,7 +146,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@@ -155,7 +155,7 @@
android:text="@string/autocomplete_3_country" /> android:text="@string/autocomplete_3_country" />
<AutoCompleteTextView android:id="@+id/edit2" <AutoCompleteTextView android:id="@+id/edit2"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</LinearLayout> </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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@@ -26,7 +26,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@@ -36,7 +36,7 @@
<AutoCompleteTextView android:id="@+id/edit" <AutoCompleteTextView android:id="@+id/edit"
android:completionThreshold="1" android:completionThreshold="1"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</LinearLayout> </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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@@ -26,7 +26,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@@ -37,7 +37,7 @@
<AutoCompleteTextView android:id="@+id/edit" <AutoCompleteTextView android:id="@+id/edit"
android:completionThreshold="1" android:completionThreshold="1"
android:completionHint="@string/autocomplete_5_hint" android:completionHint="@string/autocomplete_5_hint"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</LinearLayout> </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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@@ -26,7 +26,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@@ -35,7 +35,7 @@
android:text="@string/autocomplete_7_country" /> android:text="@string/autocomplete_7_country" />
<MultiAutoCompleteTextView android:id="@+id/edit" <MultiAutoCompleteTextView android:id="@+id/edit"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</LinearLayout> </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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<TextView <TextView
android:layout_width="wrap_content" 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -26,7 +26,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_weight="1.0" android:layout_weight="1.0"
android:layout_height="0dip"> 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<TextView <TextView
android:layout_width="wrap_content" 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" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<EditText android:id="@+id/anchor" <EditText android:id="@+id/anchor"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:textSize="20sp" android:textSize="20sp"
android:text="@string/baseline_6_multi_line" /> 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" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<TextView android:id="@+id/anchor" <TextView android:id="@+id/anchor"
android:layout_width="wrap_content" 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<TextView <TextView
android:layout_width="wrap_content" 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<TextView <TextView
android:layout_width="wrap_content" 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"

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

@@ -16,8 +16,8 @@
<!-- Lots of buttons = need scrolling --> <!-- Lots of buttons = need scrolling -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<Chronometer android:id="@+id/chronometer" <Chronometer android:id="@+id/chronometer"
android:format="@string/chronometer_initial_format" 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal" 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 <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:layout_weight="0"
android:paddingBottom="4dip" android:paddingBottom="4dip"
android:text="@string/contacts_filter"/> 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" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<Button android:id="@+id/button" <Button android:id="@+id/button"
@@ -30,7 +30,7 @@
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<EditText android:id="@+id/edit" <EditText android:id="@+id/edit"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<CheckBox android:id="@+id/check1" <CheckBox android:id="@+id/check1"
@@ -46,7 +46,7 @@
android:text="@string/controls_1_checkbox_2" /> android:text="@string/controls_1_checkbox_2" />
<RadioGroup <RadioGroup
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
@@ -77,13 +77,13 @@
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<Spinner android:id="@+id/spinner1" <Spinner android:id="@+id/spinner1"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawSelectorOnTop="true" android:drawSelectorOnTop="true"
/> />
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dip" android:layout_marginTop="5dip"
android:text="@string/textColorPrimary" android:text="@string/textColorPrimary"
@@ -92,7 +92,7 @@
/> />
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dip" android:layout_marginTop="5dip"
android:text="@string/textColorSecondary" android:text="@string/textColorSecondary"
@@ -102,7 +102,7 @@
/> />
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dip" android:layout_marginTop="5dip"
android:text="@string/textColorTertiary" 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. --> <!-- 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" <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:gravity="center_vertical|center_horizontal"
android:text="@string/custom_dialog_activity_text"/> 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/screen" android:id="@+id/screen"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout android:layout_width="fill_parent" <LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:baselineAligned="false"> android:baselineAligned="false">
<EditText android:id="@+id/left_text_edit" <EditText android:id="@+id/left_text_edit"
@@ -38,7 +38,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/custom_title_left_button"/> android:text="@string/custom_title_left_button"/>
</LinearLayout> </LinearLayout>
<LinearLayout android:layout_width="fill_parent" <LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:baselineAligned="false"> android:baselineAligned="false">
<EditText android:id="@+id/right_text_edit" <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. --> 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" <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"> android:orientation="vertical">
<TextView android:id="@+id/left_text" <TextView android:id="@+id/left_text"
android:layout_width="wrap_content" 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res/com.example.android.apis" xmlns:app="http://schemas.android.com/apk/res/com.example.android.apis"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<com.example.android.apis.view.LabelView <com.example.android.apis.view.LabelView
android:background="@drawable/red" android:background="@drawable/red"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:text="Red"/> app:text="Red"/>
<com.example.android.apis.view.LabelView <com.example.android.apis.view.LabelView
android:background="@drawable/blue" android:background="@drawable/blue"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:text="Blue" app:textSize="20dp"/> app:text="Blue" app:textSize="20dp"/>
<com.example.android.apis.view.LabelView <com.example.android.apis.view.LabelView
android:background="@drawable/green" android:background="@drawable/green"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:text="Green" app:textColor="#ffffffff" /> 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" <TimePicker android:id="@+id/timePicker"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent"/> android:layout_width="match_parent"/>
<TextView android:id="@+id/dateDisplay" <TextView android:id="@+id/dateDisplay"
android:layout_width="wrap_content" 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. --> <!-- 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" <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:gravity="center_vertical|center_horizontal"
android:text="@string/dialog_activity_text"/> 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<TextView android:id="@+id/txtStatus" <TextView android:id="@+id/txtStatus"
@@ -27,12 +27,12 @@
<ListView android:id="@+id/rssListView" <ListView android:id="@+id/rssListView"
android:background="#7700CC00" android:background="#7700CC00"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" /> android:layout_width="match_parent" />
<WebView android:id="@+id/rssWebView" <WebView android:id="@+id/rssWebView"
android:background="#77CC0000" android:background="#77CC0000"
android:layout_height="50dip" android:layout_height="50dip"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:focusable="false" /> android:focusable="false" />
<Button android:layout_height="wrap_content" <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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:orientation="horizontal"> android:orientation="horizontal">
<Button android:id="@+id/leftButton" <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.--> focus behavior that would be difficult with default focus calculation alg.-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:padding="10dip"> android:padding="10dip">
<Button android:id="@+id/top" <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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal" 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 <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:layout_weight="0"
android:paddingBottom="4dip" android:paddingBottom="4dip"
android:text="@string/foreground_service_controller"/> 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal" 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 <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:layout_weight="0"
android:text="@string/forward_target"/> 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal" 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 <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:layout_weight="0"
android:paddingBottom="4dip" android:paddingBottom="4dip"
android:text="@string/forwarding"/> 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" <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" 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<Button <Button
@@ -28,7 +28,7 @@
/> />
<Gallery android:id="@+id/gallery" <Gallery android:id="@+id/gallery"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:spacing="16dp" 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 --> See corresponding Java code com.android.sdk.content.StyledText -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<Button <Button
@@ -46,14 +46,14 @@
<TextView <TextView
android:id="@+id/username_label" android:id="@+id/username_label"
android:visibility="gone" android:visibility="gone"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/googlelogin_user"/> android:text="@string/googlelogin_user"/>
<TextView <TextView
android:id="@+id/username" android:id="@+id/username"
android:visibility="gone" android:visibility="gone"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/google_login_username_text"/> 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" <GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/myGrid"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:padding="10dp" android:padding="10dp"
android:verticalSpacing="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" <GridView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/myGrid" android:id="@+id/myGrid"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:padding="10dp" android:padding="10dp"
android:verticalSpacing="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 <!-- This screen consists of a single text field that
displays our "Hello, World!" text. --> displays our "Hello, World!" text. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/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:gravity="center_vertical|center_horizontal"
android:text="@string/hello_world"/> 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<ImageButton <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" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<ImageSwitcher android:id="@+id/switcher" <ImageSwitcher android:id="@+id/switcher"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
/> />
<Gallery android:id="@+id/gallery" <Gallery android:id="@+id/gallery"
android:background="#55000000" android:background="#55000000"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="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" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<!-- The following four examples use a large image --> <!-- The following four examples use a large image -->
<!-- 1. Non-scaled view, for reference --> <!-- 1. Non-scaled view, for reference -->
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="10dip" android:paddingTop="10dip"
android:text="@string/image_view_large_normal"/> android:text="@string/image_view_large_normal"/>
@@ -38,7 +38,7 @@
<!-- 2. Limit to at most 50x50 --> <!-- 2. Limit to at most 50x50 -->
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="10dip" android:paddingTop="10dip"
android:text="@string/image_view_large_at_most"/> 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 --> <!-- 3. Limit to at most 70x70, with 10 pixels of padding all around -->
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="10dip" android:paddingTop="10dip"
android:text="@string/image_view_large_at_most_padded"/> 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 --> <!-- 4. Limit to exactly 70x70, with 10 pixels of padding all around -->
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="10dip" android:paddingTop="10dip"
android:text="@string/image_view_large_exactly_padded"/> android:text="@string/image_view_large_exactly_padded"/>
@@ -83,7 +83,7 @@
<!-- Repeating the previous four examples with small image --> <!-- Repeating the previous four examples with small image -->
<!-- 1. Non-scaled view, for reference --> <!-- 1. Non-scaled view, for reference -->
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="10dip" android:paddingTop="10dip"
android:text="@string/image_view_small_normal"/> android:text="@string/image_view_small_normal"/>
@@ -96,7 +96,7 @@
<!-- 2. Limit to at most 50x50 --> <!-- 2. Limit to at most 50x50 -->
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="10dip" android:paddingTop="10dip"
android:text="@string/image_view_small_at_most"/> 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 --> <!-- 3. Limit to at most 70x70, with 10 pixels of padding all around -->
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="10dip" android:paddingTop="10dip"
android:text="@string/image_view_small_at_most_padded"/> 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 --> <!-- 4. Limit to exactly 70x70, with 10 pixels of padding all around -->
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="10dip" android:paddingTop="10dip"
android:text="@string/image_view_small_exactly_padded"/> 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"> android:layout_height="match_parent">
<Button <Button
android:id="@+id/notify" 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ImageView <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" <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:layout_height="wrap_content"
android:background="@android:drawable/toast_frame"> android:background="@android:drawable/toast_frame">
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ImageView <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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:paddingLeft="4dip" android:paddingLeft="4dip"
android:paddingRight="4dip" android:paddingRight="4dip"
android:paddingTop="4dip" android:paddingTop="4dip"
@@ -25,7 +25,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal" 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 <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:layout_weight="0"
android:paddingBottom="4dip" android:paddingBottom="4dip"
android:text="@string/intents"/> 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 --> <!-- This activity provides information about launcher shortcuts -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<!-- Section: Information --> <!-- Section: Information -->
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="4dip" android:paddingBottom="4dip"
android:text="@string/msg_launcher_shortcuts" /> 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" <GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid"
android:layoutAnimation="@anim/layout_grid_fade" android:layoutAnimation="@anim/layout_grid_fade"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:padding="10dp" android:padding="10dp"
android:verticalSpacing="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" <ListView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/list" android:id="@android:id/list"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:layoutAnimation="@anim/layout_bottom_to_top_slide" /> 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" <GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid"
android:layoutAnimation="@anim/layout_random_fade" android:layoutAnimation="@anim/layout_random_fade"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:padding="10dp" android:padding="10dp"
android:verticalSpacing="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" <GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid"
android:layoutAnimation="@anim/layout_grid_inverse_fade" android:layoutAnimation="@anim/layout_grid_inverse_fade"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:padding="10dp" android:padding="10dp"
android:verticalSpacing="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" <GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid"
android:layoutAnimation="@anim/layout_wave_scale" android:layoutAnimation="@anim/layout_wave_scale"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:verticalSpacing="10dp" android:verticalSpacing="10dp"
android:horizontalSpacing="10dp" android:horizontalSpacing="10dp"

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

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

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