diff options
author | Romain Guy <romainguy@android.com> | 2010-01-08 15:06:28 -0800 |
---|---|---|
committer | Romain Guy <romainguy@android.com> | 2010-01-08 15:11:38 -0800 |
commit | 980a938c1c9a6a5791a8240e5a1e6638ab28dc77 (patch) | |
tree | 75a3a1347b5423cc98859d3976076cea3dc22564 /tests/ImfTest | |
parent | 0a0289420227fee51406cf4cc508f09d8ecdd2f4 (diff) | |
download | frameworks_base-980a938c1c9a6a5791a8240e5a1e6638ab28dc77.zip frameworks_base-980a938c1c9a6a5791a8240e5a1e6638ab28dc77.tar.gz frameworks_base-980a938c1c9a6a5791a8240e5a1e6638ab28dc77.tar.bz2 |
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
Diffstat (limited to 'tests/ImfTest')
11 files changed, 33 insertions, 48 deletions
diff --git a/tests/ImfTest/res/layout/dialog_edit_text_no_scroll.xml b/tests/ImfTest/res/layout/dialog_edit_text_no_scroll.xml index e8ffa1c..1a2b7eb 100644 --- a/tests/ImfTest/res/layout/dialog_edit_text_no_scroll.xml +++ b/tests/ImfTest/res/layout/dialog_edit_text_no_scroll.xml @@ -15,21 +15,21 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:padding="20dip" android:orientation="vertical"> <View android:id="@+id/blank" android:layout_height="0dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_weight="1"/> <EditText android:id="@+id/dialog_edit_text" android:layout_height="wrap_content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:scrollHorizontally="true" android:textAppearance="?android:attr/textAppearanceMedium" /> diff --git a/tests/ImfTest/res/layout/full_screen_edit_text.xml b/tests/ImfTest/res/layout/full_screen_edit_text.xml index f22aa2f..e760ac1 100755 --- a/tests/ImfTest/res/layout/full_screen_edit_text.xml +++ b/tests/ImfTest/res/layout/full_screen_edit_text.xml @@ -20,8 +20,8 @@ <EditText xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/data" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:minLines="15" android:gravity="top"/> diff --git a/tests/ImfTest/res/layout/one_edit_text_activity.xml b/tests/ImfTest/res/layout/one_edit_text_activity.xml index 09925e1..0558228 100755 --- a/tests/ImfTest/res/layout/one_edit_text_activity.xml +++ b/tests/ImfTest/res/layout/one_edit_text_activity.xml @@ -18,32 +18,32 @@ */ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <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:baselineAligned="false"> <View android:id="@+id/blank" android:layout_height="0dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_weight="1" /> <EditText android:id="@+id/dialog_edit_text" android:layout_height="wrap_content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:scrollHorizontally="true" android:textAppearance="?android:attr/textAppearanceMedium" /> </LinearLayout> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:background="@android:drawable/divider_horizontal_dark" /> diff --git a/tests/ImfTest/res/layout/sample_edit_text.xml b/tests/ImfTest/res/layout/sample_edit_text.xml index 99a5cf8..3ff6767 100755 --- a/tests/ImfTest/res/layout/sample_edit_text.xml +++ b/tests/ImfTest/res/layout/sample_edit_text.xml @@ -18,12 +18,12 @@ */ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:orientation="horizontal" @@ -46,7 +46,7 @@ </LinearLayout> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:background="@android:drawable/divider_horizontal_dark" /> diff --git a/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java b/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java index 9754381..21734a6 100644 --- a/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java +++ b/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java @@ -7,9 +7,7 @@ import android.os.Bundle; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; -import android.widget.EditText; import android.widget.LinearLayout; -import android.widget.ScrollView; public class BigEditTextActivityNonScrollablePanScan extends Activity { @@ -25,8 +23,8 @@ public class BigEditTextActivityNonScrollablePanScan extends Activity { mRootView = new LinearLayout(this); ((LinearLayout) mRootView).setOrientation(LinearLayout.VERTICAL); mRootView.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); View view = getLayoutInflater().inflate( R.layout.full_screen_edit_text, ((LinearLayout) mRootView), false); diff --git a/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java b/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java index 701795f..48287fb 100644 --- a/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java +++ b/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java @@ -7,9 +7,7 @@ import android.os.Bundle; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; -import android.widget.EditText; import android.widget.LinearLayout; -import android.widget.ScrollView; public class BigEditTextActivityNonScrollableResize extends Activity { @@ -25,8 +23,8 @@ public class BigEditTextActivityNonScrollableResize extends Activity { mRootView = new LinearLayout(this); ((LinearLayout) mRootView).setOrientation(LinearLayout.VERTICAL); mRootView.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); View view = getLayoutInflater().inflate( R.layout.full_screen_edit_text, ((LinearLayout) mRootView), false); diff --git a/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java b/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java index bb3f767..48e1359 100644 --- a/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java +++ b/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java @@ -7,7 +7,6 @@ import android.os.Bundle; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; -import android.widget.EditText; import android.widget.LinearLayout; import android.widget.ScrollView; @@ -26,14 +25,14 @@ public class BigEditTextActivityScrollablePanScan extends Activity { mRootView = new ScrollView(this); ((ScrollView) mRootView).setFillViewport(true); mRootView.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mLayout = new LinearLayout(this); mLayout.setOrientation(LinearLayout.VERTICAL); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); View view = getLayoutInflater().inflate( R.layout.full_screen_edit_text, ((ScrollView) mRootView), false); diff --git a/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java b/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java index f2cae1c..d51e8a7 100644 --- a/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java +++ b/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java @@ -7,7 +7,6 @@ import android.os.Bundle; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; -import android.widget.EditText; import android.widget.LinearLayout; import android.widget.ScrollView; @@ -26,14 +25,14 @@ public class BigEditTextActivityScrollableResize extends Activity { mRootView = new ScrollView(this); ((ScrollView) mRootView).setFillViewport(true); mRootView.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mLayout = new LinearLayout(this); mLayout.setOrientation(LinearLayout.VERTICAL); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); View view = getLayoutInflater().inflate( R.layout.full_screen_edit_text, ((ScrollView) mRootView), false); diff --git a/tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java b/tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java index e49301c..f65e1fd 100644 --- a/tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java +++ b/tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java @@ -2,18 +2,14 @@ package com.android.imftest.samples; import android.app.Activity; import android.os.Bundle; -import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; -import android.view.WindowManager; import android.widget.LinearLayout; import android.widget.EditText; import android.widget.Button; import android.view.LayoutInflater; import android.app.Dialog; -import com.android.internal.R; - public class DialogActivity extends Activity { private static final int DIALOG_WITHOUT_EDITTEXT = 0; @@ -34,8 +30,8 @@ public class DialogActivity extends Activity { mLayout = new LinearLayout(this); mLayout.setOrientation(LinearLayout.VERTICAL); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mButton1 = new Button(this); mButton1.setText("Dialog WITHOUT EditText");//(R.string.open_dialog_scrollable); diff --git a/tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java b/tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java index bd1e934..d4726fc 100644 --- a/tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java +++ b/tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java @@ -3,7 +3,6 @@ package com.android.imftest.samples; import com.android.imftest.R; import android.app.Activity; -import android.app.AlertDialog; import android.app.Dialog; import android.os.Bundle; import android.view.LayoutInflater; @@ -33,8 +32,8 @@ public class EditTextActivityDialog extends Activity { mLayout = new LinearLayout(this); mLayout.setOrientation(LinearLayout.VERTICAL); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mButton1 = new Button(this); mButton1.setText(R.string.open_dialog_scrollable); diff --git a/tests/ImfTest/src/com/android/imftest/samples/InputTypeActivity.java b/tests/ImfTest/src/com/android/imftest/samples/InputTypeActivity.java index 17f6bdc..25ac2f0 100755 --- a/tests/ImfTest/src/com/android/imftest/samples/InputTypeActivity.java +++ b/tests/ImfTest/src/com/android/imftest/samples/InputTypeActivity.java @@ -21,17 +21,13 @@ import com.android.imftest.R; import android.app.Activity; import android.widget.EditText; import android.widget.LinearLayout; -import android.widget.Button; import android.widget.ScrollView; import android.widget.TextView; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.view.ViewParent; -import android.view.ViewRoot; import android.view.inputmethod.EditorInfo; -import android.content.Context; public class InputTypeActivity extends Activity { @@ -49,8 +45,8 @@ public class InputTypeActivity extends Activity { mLayout = new LinearLayout(this); mLayout.setOrientation(LinearLayout.VERTICAL); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mInflater = getLayoutInflater(); mParent = mLayout; |