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 | |
| 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')
111 files changed, 360 insertions, 376 deletions
diff --git a/tests/AndroidTests/res/layout/layout_five.xml b/tests/AndroidTests/res/layout/layout_five.xml index fd1e0ef..9923eaf 100644 --- a/tests/AndroidTests/res/layout/layout_five.xml +++ b/tests/AndroidTests/res/layout/layout_five.xml @@ -17,6 +17,6 @@ ** limitations under the License. */ --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <TextView android:id="@+id/text" android:text="@string/layout_five_text_text" android:layout_width="fill_parent" android:layout_height="wrap_content" /> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> + <TextView android:id="@+id/text" android:text="@string/layout_five_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> diff --git a/tests/AndroidTests/res/layout/layout_one.xml b/tests/AndroidTests/res/layout/layout_one.xml index f5c78bd..c326b2b 100644 --- a/tests/AndroidTests/res/layout/layout_one.xml +++ b/tests/AndroidTests/res/layout/layout_one.xml @@ -17,4 +17,4 @@ ** limitations under the License. */ --> -<view xmlns:android="http://schemas.android.com/apk/res/android" class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/viewOne" android:layout_width="fill_parent" android:layout_height="fill_parent"/> +<view xmlns:android="http://schemas.android.com/apk/res/android" class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/viewOne" android:layout_width="match_parent" android:layout_height="match_parent"/> diff --git a/tests/AndroidTests/res/layout/layout_six.xml b/tests/AndroidTests/res/layout/layout_six.xml index 6efcdf3..b78082d 100644 --- a/tests/AndroidTests/res/layout/layout_six.xml +++ b/tests/AndroidTests/res/layout/layout_six.xml @@ -17,11 +17,11 @@ ** limitations under the License. */ --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="fill_parent" android:layout_height="wrap_content" /> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> + <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> diff --git a/tests/AndroidTests/res/layout/layout_tag.xml b/tests/AndroidTests/res/layout/layout_tag.xml index 1f17701..72874a6 100644 --- a/tests/AndroidTests/res/layout/layout_tag.xml +++ b/tests/AndroidTests/res/layout/layout_tag.xml @@ -20,4 +20,4 @@ <view xmlns:android="http://schemas.android.com/apk/res/android" class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/viewOne" android:tag="MyTag" - android:layout_width="fill_parent" android:layout_height="fill_parent"/> + android:layout_width="match_parent" android:layout_height="match_parent"/> diff --git a/tests/AndroidTests/res/layout/layout_three.xml b/tests/AndroidTests/res/layout/layout_three.xml index 77b2aa9..7b1ccc5 100644 --- a/tests/AndroidTests/res/layout/layout_three.xml +++ b/tests/AndroidTests/res/layout/layout_three.xml @@ -17,11 +17,11 @@ ** limitations under the License. */ --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view1" android:layout_width="fill_parent" android:layout_height="fill_parent"/> - <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view2" android:layout_width="fill_parent" android:layout_height="fill_parent"/> - <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view3" android:layout_width="fill_parent" android:layout_height="fill_parent"/> - <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view4" android:layout_width="fill_parent" android:layout_height="fill_parent"/> - <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view5" android:layout_width="fill_parent" android:layout_height="fill_parent"/> - <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view6" android:layout_width="fill_parent" android:layout_height="fill_parent"/> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> + <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view1" android:layout_width="match_parent" android:layout_height="match_parent"/> + <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view2" android:layout_width="match_parent" android:layout_height="match_parent"/> + <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view3" android:layout_width="match_parent" android:layout_height="match_parent"/> + <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view4" android:layout_width="match_parent" android:layout_height="match_parent"/> + <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view5" android:layout_width="match_parent" android:layout_height="match_parent"/> + <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view6" android:layout_width="match_parent" android:layout_height="match_parent"/> </LinearLayout> diff --git a/tests/AndroidTests/res/layout/layout_two.xml b/tests/AndroidTests/res/layout/layout_two.xml index 9c99710..af14228 100644 --- a/tests/AndroidTests/res/layout/layout_two.xml +++ b/tests/AndroidTests/res/layout/layout_two.xml @@ -17,7 +17,7 @@ ** limitations under the License. */ --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/viewOne" android:layout_width="fill_parent" android:layout_height="fill_parent"/> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> + <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/viewOne" android:layout_width="match_parent" android:layout_height="match_parent"/> </LinearLayout> diff --git a/tests/AndroidTests/res/raw/medium.xml b/tests/AndroidTests/res/raw/medium.xml index 51c952c..5757a24 100644 --- a/tests/AndroidTests/res/raw/medium.xml +++ b/tests/AndroidTests/res/raw/medium.xml @@ -17,11 +17,11 @@ ** limitations under the License. */ --> -<LinearLayout id="@+id/content" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <TextView id="@+id/text" android:text="S" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView id="@+id/text" android:text="M" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView id="@+id/text" android:text="T" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView id="@+id/text" android:text="W" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView id="@+id/text" android:text="H" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView id="@+id/text" android:text="F" android:layout_width="fill_parent" android:layout_height="wrap_content" /> +<LinearLayout id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> + <TextView id="@+id/text" android:text="S" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView id="@+id/text" android:text="M" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView id="@+id/text" android:text="T" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView id="@+id/text" android:text="W" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView id="@+id/text" android:text="H" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView id="@+id/text" android:text="F" android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> diff --git a/tests/AndroidTests/res/raw/small.xml b/tests/AndroidTests/res/raw/small.xml index 2697fb8..ee859b9 100644 --- a/tests/AndroidTests/res/raw/small.xml +++ b/tests/AndroidTests/res/raw/small.xml @@ -17,4 +17,4 @@ ** limitations under the License. */ --> -<view class="com.android.tests.InflateTest$ViewOne" id="@+id/viewOne" android:layout_width="fill_parent" android:layout_height="fill_parent"/> +<view class="com.android.tests.InflateTest$ViewOne" id="@+id/viewOne" android:layout_width="match_parent" android:layout_height="match_parent"/> diff --git a/tests/AndroidTests/src/com/android/unit_tests/CreateViewTest.java b/tests/AndroidTests/src/com/android/unit_tests/CreateViewTest.java index 342094d..0c57ac4 100644 --- a/tests/AndroidTests/src/com/android/unit_tests/CreateViewTest.java +++ b/tests/AndroidTests/src/com/android/unit_tests/CreateViewTest.java @@ -21,7 +21,7 @@ import android.test.AndroidTestCase; import android.test.PerformanceTestCase; import android.test.suitebuilder.annotation.SmallTest; import android.view.View; -import static android.view.ViewGroup.LayoutParams.FILL_PARENT; +import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; import android.widget.LinearLayout; import android.widget.TextView; @@ -45,7 +45,7 @@ public class CreateViewTest extends AndroidTestCase implements PerformanceTestCa public void testLayout2() throws Exception { LinearLayout vert = new LinearLayout(mContext); vert.addView(new CreateViewTest.ViewOne(mContext), - new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 0)); + new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0)); } @SmallTest @@ -53,22 +53,22 @@ public class CreateViewTest extends AndroidTestCase implements PerformanceTestCa LinearLayout vert = new LinearLayout(mContext); ViewOne one = new ViewOne(mContext); - vert.addView(one, new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 0)); + vert.addView(one, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0)); ViewOne two = new ViewOne(mContext); - vert.addView(two, new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 0)); + vert.addView(two, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0)); ViewOne three = new ViewOne(mContext); - vert.addView(three, new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 0)); + vert.addView(three, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0)); ViewOne four = new ViewOne(mContext); - vert.addView(four, new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 0)); + vert.addView(four, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0)); ViewOne five = new ViewOne(mContext); - vert.addView(five, new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 0)); + vert.addView(five, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0)); ViewOne six = new ViewOne(mContext); - vert.addView(six, new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 0)); + vert.addView(six, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0)); } @SmallTest @@ -83,7 +83,7 @@ public class CreateViewTest extends AndroidTestCase implements PerformanceTestCa text.setText("S"); LinearLayout vert = new LinearLayout(mContext); - vert.addView(text, new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0)); + vert.addView(text, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0)); } @SmallTest @@ -92,27 +92,27 @@ public class CreateViewTest extends AndroidTestCase implements PerformanceTestCa TextView one = new TextView(mContext); one.setText("S"); - vert.addView(one, new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0)); + vert.addView(one, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0)); TextView two = new TextView(mContext); two.setText("M"); - vert.addView(two, new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0)); + vert.addView(two, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0)); TextView three = new TextView(mContext); three.setText("T"); - vert.addView(three, new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0)); + vert.addView(three, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0)); TextView four = new TextView(mContext); four.setText("W"); - vert.addView(four, new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0)); + vert.addView(four, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0)); TextView five = new TextView(mContext); five.setText("H"); - vert.addView(five, new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0)); + vert.addView(five, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0)); TextView six = new TextView(mContext); six.setText("F"); - vert.addView(six, new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0)); + vert.addView(six, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0)); } public static class ViewOne extends View { diff --git a/tests/BatteryWaster/res/layout/battery_waster.xml b/tests/BatteryWaster/res/layout/battery_waster.xml index b6eab03..e1cb6bf 100644 --- a/tests/BatteryWaster/res/layout/battery_waster.xml +++ b/tests/BatteryWaster/res/layout/battery_waster.xml @@ -15,13 +15,13 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" > <CheckBox android:id="@+id/checkbox" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="25dp" android:layout_marginTop="25dp" @@ -31,12 +31,12 @@ /> <ScrollView android:id="@+id/scroll" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="1" > <TextView android:id="@+id/log" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="25dp" android:textSize="12sp" diff --git a/tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java b/tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java index 77e390b..e750ac8 100644 --- a/tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java +++ b/tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java @@ -65,8 +65,8 @@ public class PowerTestActivity extends Activity { webView.setWebChromeClient(chromeClient); contentView.addView(webView, new LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT, 0.0f)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, 0.0f)); handler = new Handler() { @Override diff --git a/tests/DpiTest/src/com/google/android/test/dpi/DpiTestActivity.java b/tests/DpiTest/src/com/google/android/test/dpi/DpiTestActivity.java index ae53b76..cde2c71 100644 --- a/tests/DpiTest/src/com/google/android/test/dpi/DpiTestActivity.java +++ b/tests/DpiTest/src/com/google/android/test/dpi/DpiTestActivity.java @@ -141,20 +141,20 @@ public class DpiTestActivity extends Activity { private View scrollWrap(View view) { ScrollView scroller = new ScrollView(this); - scroller.addView(view, new ScrollView.LayoutParams(ScrollView.LayoutParams.FILL_PARENT, - ScrollView.LayoutParams.FILL_PARENT)); + scroller.addView(view, new ScrollView.LayoutParams(ScrollView.LayoutParams.MATCH_PARENT, + ScrollView.LayoutParams.MATCH_PARENT)); return scroller; } private void addLabelToRoot(LinearLayout root, String text) { TextView label = new TextView(this); label.setText(text); - root.addView(label, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT, + root.addView(label, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)); } private void addChildToRoot(LinearLayout root, LinearLayout layout) { - root.addView(layout, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT, + root.addView(layout, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)); } diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java index fbce78a..9a4e99e 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java @@ -85,8 +85,8 @@ public class ReliabilityTestActivity extends Activity { webView.setWebChromeClient(chromeClient); contentView.addView(webView, new LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT, 0.0f)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, 0.0f)); handler = new Handler() { @Override diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java index b6b1661..5763b85 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java @@ -126,7 +126,7 @@ public class TestShellActivity extends Activity implements LayoutTestController mWebView.addJavascriptInterface(mCallbackProxy, "eventSender"); setupWebViewForLayoutTests(mWebView, mCallbackProxy); - contentView.addView(mWebView, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT, 0.0f)); + contentView.addView(mWebView, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, 0.0f)); mWebView.getSettings().setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NORMAL); diff --git a/tests/FrameworkTest/res/layout/add_column_in_table.xml b/tests/FrameworkTest/res/layout/add_column_in_table.xml index 62c27f3..05f55a8 100644 --- a/tests/FrameworkTest/res/layout/add_column_in_table.xml +++ b/tests/FrameworkTest/res/layout/add_column_in_table.xml @@ -16,11 +16,11 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <TableLayout android:id="@+id/table" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1.0"> diff --git a/tests/FrameworkTest/res/layout/autocompletetextview_simple.xml b/tests/FrameworkTest/res/layout/autocompletetextview_simple.xml index d408a86..1a20076 100644 --- a/tests/FrameworkTest/res/layout/autocompletetextview_simple.xml +++ b/tests/FrameworkTest/res/layout/autocompletetextview_simple.xml @@ -20,12 +20,12 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <AutoCompleteTextView android:id="@+id/autocompletetextview1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="text|textAutoComplete" android:completionThreshold="1" /> diff --git a/tests/FrameworkTest/res/layout/baseline_0width_and_weight.xml b/tests/FrameworkTest/res/layout/baseline_0width_and_weight.xml index 83f3fcb..aa3132d 100644 --- a/tests/FrameworkTest/res/layout/baseline_0width_and_weight.xml +++ b/tests/FrameworkTest/res/layout/baseline_0width_and_weight.xml @@ -19,10 +19,10 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:id="@+id/layout" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:visibility="gone"> diff --git a/tests/FrameworkTest/res/layout/baseline_buttons.xml b/tests/FrameworkTest/res/layout/baseline_buttons.xml index ae94201..3e364bd 100644 --- a/tests/FrameworkTest/res/layout/baseline_buttons.xml +++ b/tests/FrameworkTest/res/layout/baseline_buttons.xml @@ -19,7 +19,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/layout" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> diff --git a/tests/FrameworkTest/res/layout/baseline_center_gravity.xml b/tests/FrameworkTest/res/layout/baseline_center_gravity.xml index 9793ab4..dd1318d 100644 --- a/tests/FrameworkTest/res/layout/baseline_center_gravity.xml +++ b/tests/FrameworkTest/res/layout/baseline_center_gravity.xml @@ -19,7 +19,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <Button android:id="@+id/button1" android:layout_height="wrap_content" diff --git a/tests/FrameworkTest/res/layout/descendant_focusability.xml b/tests/FrameworkTest/res/layout/descendant_focusability.xml index 6a30d50..0cb75fd 100644 --- a/tests/FrameworkTest/res/layout/descendant_focusability.xml +++ b/tests/FrameworkTest/res/layout/descendant_focusability.xml @@ -20,19 +20,19 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" > <LinearLayout android:id="@+id/beforeDescendants" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:descendantFocusability="beforeDescendants" > <Button - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> @@ -40,12 +40,12 @@ <LinearLayout android:id="@+id/afterDescendants" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:descendantFocusability="afterDescendants" > <Button - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> @@ -53,12 +53,12 @@ <LinearLayout android:id="@+id/blocksDescendants" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:descendantFocusability="blocksDescendants" > <Button - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> diff --git a/tests/FrameworkTest/res/layout/disabled.xml b/tests/FrameworkTest/res/layout/disabled.xml index ed7ff06..4b41248 100644 --- a/tests/FrameworkTest/res/layout/disabled.xml +++ b/tests/FrameworkTest/res/layout/disabled.xml @@ -23,8 +23,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/clickableParent" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Button android:id="@+id/disabledButton" android:layout_width="wrap_content" diff --git a/tests/FrameworkTest/res/layout/fill_in_wrap.xml b/tests/FrameworkTest/res/layout/fill_in_wrap.xml index b61fd30..1c3f811 100644 --- a/tests/FrameworkTest/res/layout/fill_in_wrap.xml +++ b/tests/FrameworkTest/res/layout/fill_in_wrap.xml @@ -15,7 +15,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:orientation="horizontal" android:baselineAligned="false" @@ -28,7 +28,7 @@ /> <LinearLayout android:id="@+id/layout" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingLeft="0dip" android:paddingRight="0dip" @@ -43,7 +43,7 @@ <EditText android:id="@+id/data" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_marginLeft="8dip" android:paddingBottom="4dip" android:layout_gravity="center_vertical" diff --git a/tests/FrameworkTest/res/layout/focus_after_removal.xml b/tests/FrameworkTest/res/layout/focus_after_removal.xml index 7cf6cbe..f4e388d 100644 --- a/tests/FrameworkTest/res/layout/focus_after_removal.xml +++ b/tests/FrameworkTest/res/layout/focus_after_removal.xml @@ -20,7 +20,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <LinearLayout android:id="@+id/leftLayout" diff --git a/tests/FrameworkTest/res/layout/focus_listener.xml b/tests/FrameworkTest/res/layout/focus_listener.xml index a838205..6faa21c 100644 --- a/tests/FrameworkTest/res/layout/focus_listener.xml +++ b/tests/FrameworkTest/res/layout/focus_listener.xml @@ -20,7 +20,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <Button android:id="@+id/left" diff --git a/tests/FrameworkTest/res/layout/framelayout_gravity.xml b/tests/FrameworkTest/res/layout/framelayout_gravity.xml index ce48825..e89fce5 100644 --- a/tests/FrameworkTest/res/layout/framelayout_gravity.xml +++ b/tests/FrameworkTest/res/layout/framelayout_gravity.xml @@ -16,8 +16,8 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/parent" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Button android:id="@+id/left" android:layout_gravity="left" diff --git a/tests/FrameworkTest/res/layout/framelayout_margin.xml b/tests/FrameworkTest/res/layout/framelayout_margin.xml index 1e14899..9120bcb 100644 --- a/tests/FrameworkTest/res/layout/framelayout_margin.xml +++ b/tests/FrameworkTest/res/layout/framelayout_margin.xml @@ -16,8 +16,8 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/parent" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Button android:id="@+id/left" android:layout_gravity="left" diff --git a/tests/FrameworkTest/res/layout/grid_in_horizontal.xml b/tests/FrameworkTest/res/layout/grid_in_horizontal.xml index 835dce3..62d7bcb 100644 --- a/tests/FrameworkTest/res/layout/grid_in_horizontal.xml +++ b/tests/FrameworkTest/res/layout/grid_in_horizontal.xml @@ -16,12 +16,12 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <GridView android:id="@+id/grid" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:padding="10dip" android:verticalSpacing="10dp" diff --git a/tests/FrameworkTest/res/layout/grid_in_vertical.xml b/tests/FrameworkTest/res/layout/grid_in_vertical.xml index 731bc54..fea459a 100644 --- a/tests/FrameworkTest/res/layout/grid_in_vertical.xml +++ b/tests/FrameworkTest/res/layout/grid_in_vertical.xml @@ -16,8 +16,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <GridView android:id="@+id/grid" android:layout_width="wrap_content" diff --git a/tests/FrameworkTest/res/layout/grid_scroll_listener.xml b/tests/FrameworkTest/res/layout/grid_scroll_listener.xml index c02aed9..82b1058 100644 --- a/tests/FrameworkTest/res/layout/grid_scroll_listener.xml +++ b/tests/FrameworkTest/res/layout/grid_scroll_listener.xml @@ -16,11 +16,11 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <GridView android:id="@+id/grid" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:padding="10dip" @@ -32,7 +32,7 @@ android:gravity="center"/> <TextView android:id="@+id/text" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal"/> diff --git a/tests/FrameworkTest/res/layout/grid_thrasher.xml b/tests/FrameworkTest/res/layout/grid_thrasher.xml index 1a260df..346acff 100644 --- a/tests/FrameworkTest/res/layout/grid_thrasher.xml +++ b/tests/FrameworkTest/res/layout/grid_thrasher.xml @@ -16,12 +16,12 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <GridView android:id="@+id/grid" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:padding="10dip" android:verticalSpacing="10dp" android:horizontalSpacing="10dp" @@ -31,7 +31,7 @@ android:gravity="center"/> <TextView android:id="@+id/text" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal"/> diff --git a/tests/FrameworkTest/res/layout/include_tag.xml b/tests/FrameworkTest/res/layout/include_tag.xml index d1047f1..b2f6ab1 100644 --- a/tests/FrameworkTest/res/layout/include_tag.xml +++ b/tests/FrameworkTest/res/layout/include_tag.xml @@ -16,8 +16,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <TextView android:text="@string/include_label" diff --git a/tests/FrameworkTest/res/layout/inflated_expandablelistview.xml b/tests/FrameworkTest/res/layout/inflated_expandablelistview.xml index d01e7c5..6f683e5 100644 --- a/tests/FrameworkTest/res/layout/inflated_expandablelistview.xml +++ b/tests/FrameworkTest/res/layout/inflated_expandablelistview.xml @@ -16,5 +16,5 @@ <ExpandableListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/elv" - android:layout_height="fill_parent" - android:layout_width="fill_parent" /> + android:layout_height="match_parent" + android:layout_width="match_parent" /> diff --git a/tests/FrameworkTest/res/layout/linear_layout_buttons.xml b/tests/FrameworkTest/res/layout/linear_layout_buttons.xml index f60692a..bcb28e7 100644 --- a/tests/FrameworkTest/res/layout/linear_layout_buttons.xml +++ b/tests/FrameworkTest/res/layout/linear_layout_buttons.xml @@ -20,26 +20,26 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Button android:id="@+id/button1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0sp" android:layout_weight="1" android:text="@string/keypad_one"/> <Button android:id="@+id/button2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0sp" android:layout_weight="1" android:text="@string/keypad_two"/> <Button android:id="@+id/button3" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0sp" android:layout_weight="1" android:text="@string/keypad_three"/> diff --git a/tests/FrameworkTest/res/layout/linear_layout_edittext_then_button.xml b/tests/FrameworkTest/res/layout/linear_layout_edittext_then_button.xml index 21e7399..ab76e29 100644 --- a/tests/FrameworkTest/res/layout/linear_layout_edittext_then_button.xml +++ b/tests/FrameworkTest/res/layout/linear_layout_edittext_then_button.xml @@ -20,18 +20,18 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <EditText android:id="@+id/editText" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0sp" android:layout_weight="1"/> <Button android:id="@+id/button" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0sp" android:layout_weight="1" android:text="@string/keypad_one"/> diff --git a/tests/FrameworkTest/res/layout/linear_layout_grid.xml b/tests/FrameworkTest/res/layout/linear_layout_grid.xml index 81f7b15..67b6877 100644 --- a/tests/FrameworkTest/res/layout/linear_layout_grid.xml +++ b/tests/FrameworkTest/res/layout/linear_layout_grid.xml @@ -20,80 +20,80 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:id="@+id/column1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0sp" android:layout_weight="1" android:orientation="horizontal"> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_one"/> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_two"/> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_three"/> </LinearLayout> <LinearLayout android:id="@+id/column2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0sp" android:layout_weight="1" android:orientation="horizontal"> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_four"/> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_five"/> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_six"/> </LinearLayout> <LinearLayout android:id="@+id/column3" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0sp" android:layout_weight="1" android:orientation="horizontal"> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_seven"/> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_eight"/> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_nine"/> </LinearLayout> diff --git a/tests/FrameworkTest/res/layout/linear_layout_listview_height.xml b/tests/FrameworkTest/res/layout/linear_layout_listview_height.xml index 10ef2ce..873b2d2 100644 --- a/tests/FrameworkTest/res/layout/linear_layout_listview_height.xml +++ b/tests/FrameworkTest/res/layout/linear_layout_listview_height.xml @@ -20,19 +20,19 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <!-- Outer linear layout providing vertical layout --> <LinearLayout android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" > <!-- The control buttons --> <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" > <Button @@ -58,7 +58,7 @@ <ListView android:id="@+id/inner_list" android:layout_width="200dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:background="@android:drawable/spinner_dropdown_background" android:divider="@android:drawable/divider_horizontal_bright" /> diff --git a/tests/FrameworkTest/res/layout/linear_layout_spinner_then_button.xml b/tests/FrameworkTest/res/layout/linear_layout_spinner_then_button.xml index 7ed245b..53c0280 100644 --- a/tests/FrameworkTest/res/layout/linear_layout_spinner_then_button.xml +++ b/tests/FrameworkTest/res/layout/linear_layout_spinner_then_button.xml @@ -20,7 +20,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <Spinner android:id="@+id/reminder_value" diff --git a/tests/FrameworkTest/res/layout/linear_layout_textviews.xml b/tests/FrameworkTest/res/layout/linear_layout_textviews.xml index 84a898c..ccec213 100644 --- a/tests/FrameworkTest/res/layout/linear_layout_textviews.xml +++ b/tests/FrameworkTest/res/layout/linear_layout_textviews.xml @@ -21,7 +21,7 @@ android:id="@+id/layout" android:background="#FFFF0000" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <EditText diff --git a/tests/FrameworkTest/res/layout/list_dividers.xml b/tests/FrameworkTest/res/layout/list_dividers.xml index b56511e..93810b4 100644 --- a/tests/FrameworkTest/res/layout/list_dividers.xml +++ b/tests/FrameworkTest/res/layout/list_dividers.xml @@ -16,8 +16,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Button android:layout_width="wrap_content" diff --git a/tests/FrameworkTest/res/layout/list_filter.xml b/tests/FrameworkTest/res/layout/list_filter.xml index cea518c..0ab7101 100644 --- a/tests/FrameworkTest/res/layout/list_filter.xml +++ b/tests/FrameworkTest/res/layout/list_filter.xml @@ -16,24 +16,24 @@ <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"> <FrameLayout android:id="@+id/frame" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1"> <ListView android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:drawSelectorOnTop="false" /> </FrameLayout> <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <Button android:id="@+id/hide" diff --git a/tests/FrameworkTest/res/layout/list_in_horizontal.xml b/tests/FrameworkTest/res/layout/list_in_horizontal.xml index 371cb84..b770628 100644 --- a/tests/FrameworkTest/res/layout/list_in_horizontal.xml +++ b/tests/FrameworkTest/res/layout/list_in_horizontal.xml @@ -15,8 +15,8 @@ --> <TableLayout 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"> <TableRow> diff --git a/tests/FrameworkTest/res/layout/list_in_vertical.xml b/tests/FrameworkTest/res/layout/list_in_vertical.xml index 0ea2475..f951cb7 100644 --- a/tests/FrameworkTest/res/layout/list_in_vertical.xml +++ b/tests/FrameworkTest/res/layout/list_in_vertical.xml @@ -15,16 +15,16 @@ --> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <ListView android:id="@+id/list" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <ImageButton diff --git a/tests/FrameworkTest/res/layout/list_recycler_profiling.xml b/tests/FrameworkTest/res/layout/list_recycler_profiling.xml index 9678eb7..3fc6bd6 100644 --- a/tests/FrameworkTest/res/layout/list_recycler_profiling.xml +++ b/tests/FrameworkTest/res/layout/list_recycler_profiling.xml @@ -16,11 +16,11 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <ListView android:id="@+id/list" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1.0" /> diff --git a/tests/FrameworkTest/res/layout/list_scroll_listener.xml b/tests/FrameworkTest/res/layout/list_scroll_listener.xml index 001296a..58ab55f 100644 --- a/tests/FrameworkTest/res/layout/list_scroll_listener.xml +++ b/tests/FrameworkTest/res/layout/list_scroll_listener.xml @@ -16,17 +16,17 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <ListView android:id="@android:id/list" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:drawSelectorOnTop="false"/> <TextView android:id="@+id/text" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal"/> diff --git a/tests/FrameworkTest/res/layout/list_take_focus_from_side.xml b/tests/FrameworkTest/res/layout/list_take_focus_from_side.xml index cf141cc..ee40019 100644 --- a/tests/FrameworkTest/res/layout/list_take_focus_from_side.xml +++ b/tests/FrameworkTest/res/layout/list_take_focus_from_side.xml @@ -16,19 +16,19 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <ListView android:id="@android:id/list" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:drawSelectorOnTop="false"/> <LinearLayout android:orientation="vertical" android:layout_width="wrap_content" - android:layout_height="fill_parent"> + android:layout_height="match_parent"> <Button android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/tests/FrameworkTest/res/layout/list_thrasher.xml b/tests/FrameworkTest/res/layout/list_thrasher.xml index 001296a..58ab55f 100644 --- a/tests/FrameworkTest/res/layout/list_thrasher.xml +++ b/tests/FrameworkTest/res/layout/list_thrasher.xml @@ -16,17 +16,17 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <ListView android:id="@android:id/list" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:drawSelectorOnTop="false"/> <TextView android:id="@+id/text" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal"/> diff --git a/tests/FrameworkTest/res/layout/list_with_button_above.xml b/tests/FrameworkTest/res/layout/list_with_button_above.xml index 25db016..18bcf6b 100644 --- a/tests/FrameworkTest/res/layout/list_with_button_above.xml +++ b/tests/FrameworkTest/res/layout/list_with_button_above.xml @@ -19,18 +19,18 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Button android:id="@+id/button" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/button_above_list_label"/> <ListView android:id="@android:id/list" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:paddingTop="2dip" diff --git a/tests/FrameworkTest/res/layout/list_with_disappearing_item_bug_item.xml b/tests/FrameworkTest/res/layout/list_with_disappearing_item_bug_item.xml index 0163d96..82af6ca 100644 --- a/tests/FrameworkTest/res/layout/list_with_disappearing_item_bug_item.xml +++ b/tests/FrameworkTest/res/layout/list_with_disappearing_item_bug_item.xml @@ -16,13 +16,13 @@ <!-- A layout is needed to reprod the bug. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight"> <TextView android:id="@+id/text1" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center_vertical" android:paddingLeft="27dip" diff --git a/tests/FrameworkTest/res/layout/list_with_empty_view.xml b/tests/FrameworkTest/res/layout/list_with_empty_view.xml index 00d81a7..23bb658 100644 --- a/tests/FrameworkTest/res/layout/list_with_empty_view.xml +++ b/tests/FrameworkTest/res/layout/list_with_empty_view.xml @@ -16,17 +16,17 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" > + android:layout_width="match_parent" + android:layout_height="match_parent" > <ListView android:id="@android:id/list" android:drawSelectorOnTop="false" - android:layout_width="fill_parent" - android:layout_height="fill_parent"/> + android:layout_width="match_parent" + android:layout_height="match_parent"/> <TextView android:id="@+id/empty" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:gravity="center" android:textSize="36sp" android:textColor="#999" diff --git a/tests/FrameworkTest/res/layout/longpress.xml b/tests/FrameworkTest/res/layout/longpress.xml index ef3672c..3a69fae 100644 --- a/tests/FrameworkTest/res/layout/longpress.xml +++ b/tests/FrameworkTest/res/layout/longpress.xml @@ -20,8 +20,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <View android:id="@+id/simple_view" android:background="@drawable/blue" diff --git a/tests/FrameworkTest/res/layout/mail_message.xml b/tests/FrameworkTest/res/layout/mail_message.xml index ed52751..7f15e4f 100644 --- a/tests/FrameworkTest/res/layout/mail_message.xml +++ b/tests/FrameworkTest/res/layout/mail_message.xml @@ -18,11 +18,11 @@ a list with a list of messages.--> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TextView android:id="@+id/subject" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"/> <WebView android:id="@+id/body" diff --git a/tests/FrameworkTest/res/layout/popup_window_visibility.xml b/tests/FrameworkTest/res/layout/popup_window_visibility.xml index 21c94bb..3aa714d 100644 --- a/tests/FrameworkTest/res/layout/popup_window_visibility.xml +++ b/tests/FrameworkTest/res/layout/popup_window_visibility.xml @@ -16,25 +16,25 @@ <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"> <FrameLayout android:id="@+id/frame" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1"> <LinearLayout android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Spinner android:id="@+id/spinner" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <AutoCompleteTextView android:id="@+id/auto" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"/> </LinearLayout> @@ -43,7 +43,7 @@ <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <Button android:id="@+id/hide" diff --git a/tests/FrameworkTest/res/layout/pre_draw_listener.xml b/tests/FrameworkTest/res/layout/pre_draw_listener.xml index d348d9f..7a8f33f 100644 --- a/tests/FrameworkTest/res/layout/pre_draw_listener.xml +++ b/tests/FrameworkTest/res/layout/pre_draw_listener.xml @@ -16,20 +16,20 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <ScrollView android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1"> <view class="com.android.frameworktest.view.PreDrawListener$MyLinearLayout" android:id="@+id/frame" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> + android:layout_width="match_parent" + android:layout_height="match_parent" /> </ScrollView> diff --git a/tests/FrameworkTest/res/layout/radiogroup_checkedchild.xml b/tests/FrameworkTest/res/layout/radiogroup_checkedchild.xml index 7724729..db88f4d 100644 --- a/tests/FrameworkTest/res/layout/radiogroup_checkedchild.xml +++ b/tests/FrameworkTest/res/layout/radiogroup_checkedchild.xml @@ -21,23 +21,23 @@ <RadioButton android:id="@+id/value_one" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:textColor="#555555" android:checked="true" android:text="@string/visibility_1_view_1" /> <RadioButton android:id="@+id/value_two" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:textColor="#555555" android:text="@string/visibility_1_view_2" /> <RadioButton android:id="@+id/value_three" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:textColor="#555555" android:text="@string/visibility_1_view_3" /> diff --git a/tests/FrameworkTest/res/layout/remote_view_host.xml b/tests/FrameworkTest/res/layout/remote_view_host.xml index dc52181..19d0a73 100644 --- a/tests/FrameworkTest/res/layout/remote_view_host.xml +++ b/tests/FrameworkTest/res/layout/remote_view_host.xml @@ -20,6 +20,6 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> </LinearLayout> diff --git a/tests/FrameworkTest/res/layout/remote_view_test_bad_1.xml b/tests/FrameworkTest/res/layout/remote_view_test_bad_1.xml index 6a65976..bdac697 100644 --- a/tests/FrameworkTest/res/layout/remote_view_test_bad_1.xml +++ b/tests/FrameworkTest/res/layout/remote_view_test_bad_1.xml @@ -21,8 +21,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/linear" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <EditText android:id="@+id/edit" android:layout_width="wrap_content" diff --git a/tests/FrameworkTest/res/layout/remote_view_test_bad_2.xml b/tests/FrameworkTest/res/layout/remote_view_test_bad_2.xml index 70613c3..630e603 100644 --- a/tests/FrameworkTest/res/layout/remote_view_test_bad_2.xml +++ b/tests/FrameworkTest/res/layout/remote_view_test_bad_2.xml @@ -21,8 +21,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/linear" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <WebView android:id="@+id/web" android:layout_width="wrap_content" diff --git a/tests/FrameworkTest/res/layout/remote_view_test_good.xml b/tests/FrameworkTest/res/layout/remote_view_test_good.xml index 54f4db9..ce9755b 100644 --- a/tests/FrameworkTest/res/layout/remote_view_test_good.xml +++ b/tests/FrameworkTest/res/layout/remote_view_test_good.xml @@ -21,8 +21,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/linear" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <TextView android:id="@+id/text" android:layout_width="wrap_content" diff --git a/tests/FrameworkTest/res/layout/scroll_to_rect_with_internal_scroll.xml b/tests/FrameworkTest/res/layout/scroll_to_rect_with_internal_scroll.xml index d22122d..b6ec479 100644 --- a/tests/FrameworkTest/res/layout/scroll_to_rect_with_internal_scroll.xml +++ b/tests/FrameworkTest/res/layout/scroll_to_rect_with_internal_scroll.xml @@ -22,24 +22,24 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/scrollView" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:scrollbars="none"> <LinearLayout android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <Button android:id="@+id/scrollToBlob" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/scroll_top_button"/> <TextView android:id="@+id/blob" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="80dip" android:layout_marginTop="500dip" android:layout_marginBottom="5dip"/> diff --git a/tests/FrameworkTest/res/layout/scroll_to_rectangle.xml b/tests/FrameworkTest/res/layout/scroll_to_rectangle.xml index 0839b1a..55d057d 100644 --- a/tests/FrameworkTest/res/layout/scroll_to_rectangle.xml +++ b/tests/FrameworkTest/res/layout/scroll_to_rectangle.xml @@ -22,55 +22,55 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/scrollView" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:scrollbars="none"> <LinearLayout android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <Button android:id="@+id/scrollToRectFromTop" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/scroll_top_button"/> <Button android:id="@+id/scrollToRectFromTop2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingBottom="10dip" android:text="@string/scroll_top_button2"/> <TextView android:id="@+id/topBlob" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5dip" android:layout_marginBottom="5dip"/> <TextView android:id="@+id/childToMakeVisible" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5dip" android:layout_marginBottom="5dip" android:text="@string/scroll_to_me"/> <TextView android:id="@+id/bottomBlob" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5dip" android:layout_marginBottom="5dip"/> <Button android:id="@+id/scrollToRectFromBottom2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="10dip" android:text="@string/scroll_bottom_button2"/> <Button android:id="@+id/scrollToRectFromBottom" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/scroll_bottom_button"/> diff --git a/tests/FrameworkTest/res/layout/scrollview_linear_layout.xml b/tests/FrameworkTest/res/layout/scrollview_linear_layout.xml index 536d2ed..a3c12ce 100644 --- a/tests/FrameworkTest/res/layout/scrollview_linear_layout.xml +++ b/tests/FrameworkTest/res/layout/scrollview_linear_layout.xml @@ -16,14 +16,14 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/scrollView" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:scrollbars="none"> <LinearLayout android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> </LinearLayout> diff --git a/tests/FrameworkTest/res/layout/scrollview_with_webviews.xml b/tests/FrameworkTest/res/layout/scrollview_with_webviews.xml index 7963475..e0c0c66 100644 --- a/tests/FrameworkTest/res/layout/scrollview_with_webviews.xml +++ b/tests/FrameworkTest/res/layout/scrollview_with_webviews.xml @@ -16,27 +16,27 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/scrollView" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:scrollbars="none"> <LinearLayout android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <WebView android:id="@+id/wb1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"/> <Button android:id="@+id/button" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"/> <WebView android:id="@+id/wb2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"/> </LinearLayout> diff --git a/tests/FrameworkTest/res/layout/table_layout_cell_span.xml b/tests/FrameworkTest/res/layout/table_layout_cell_span.xml index 26831e4..fceef0a 100644 --- a/tests/FrameworkTest/res/layout/table_layout_cell_span.xml +++ b/tests/FrameworkTest/res/layout/table_layout_cell_span.xml @@ -18,7 +18,7 @@ --> <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TableRow> diff --git a/tests/FrameworkTest/res/layout/table_layout_fixed_width.xml b/tests/FrameworkTest/res/layout/table_layout_fixed_width.xml index 91d9128..507701e 100644 --- a/tests/FrameworkTest/res/layout/table_layout_fixed_width.xml +++ b/tests/FrameworkTest/res/layout/table_layout_fixed_width.xml @@ -19,7 +19,7 @@ --> <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TableRow> diff --git a/tests/FrameworkTest/res/layout/table_layout_horizontal_gravity.xml b/tests/FrameworkTest/res/layout/table_layout_horizontal_gravity.xml index dee81a5..fb72d81 100644 --- a/tests/FrameworkTest/res/layout/table_layout_horizontal_gravity.xml +++ b/tests/FrameworkTest/res/layout/table_layout_horizontal_gravity.xml @@ -19,7 +19,7 @@ --> <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:stretchColumns="1"> diff --git a/tests/FrameworkTest/res/layout/table_layout_vertical_gravity.xml b/tests/FrameworkTest/res/layout/table_layout_vertical_gravity.xml index 6a8b784..ae17ada 100644 --- a/tests/FrameworkTest/res/layout/table_layout_vertical_gravity.xml +++ b/tests/FrameworkTest/res/layout/table_layout_vertical_gravity.xml @@ -19,7 +19,7 @@ --> <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TableRow> diff --git a/tests/FrameworkTest/res/layout/table_layout_weight.xml b/tests/FrameworkTest/res/layout/table_layout_weight.xml index 432c04a..ba4fade 100644 --- a/tests/FrameworkTest/res/layout/table_layout_weight.xml +++ b/tests/FrameworkTest/res/layout/table_layout_weight.xml @@ -19,7 +19,7 @@ --> <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TableRow android:id="@+id/row" diff --git a/tests/FrameworkTest/res/layout/translucent_background.xml b/tests/FrameworkTest/res/layout/translucent_background.xml index 6b6e1cf..c4a1acf 100644 --- a/tests/FrameworkTest/res/layout/translucent_background.xml +++ b/tests/FrameworkTest/res/layout/translucent_background.xml @@ -19,6 +19,6 @@ <!-- This screen consists of a single text field that displays some text. --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text" - android:layout_width="fill_parent" android:layout_height="fill_parent" + android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center_vertical|center_horizontal" android:text="@string/translucent_background"/> diff --git a/tests/FrameworkTest/res/layout/viewgroupchildren.xml b/tests/FrameworkTest/res/layout/viewgroupchildren.xml index a5bb7cb..22595ed 100644 --- a/tests/FrameworkTest/res/layout/viewgroupchildren.xml +++ b/tests/FrameworkTest/res/layout/viewgroupchildren.xml @@ -23,7 +23,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/group" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> </LinearLayout> diff --git a/tests/FrameworkTest/res/layout/viewstub.xml b/tests/FrameworkTest/res/layout/viewstub.xml index 9a6f376..8b32d8f 100644 --- a/tests/FrameworkTest/res/layout/viewstub.xml +++ b/tests/FrameworkTest/res/layout/viewstub.xml @@ -20,8 +20,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Button android:id="@+id/vis" android:layout_width="wrap_content" diff --git a/tests/FrameworkTest/res/layout/visibility.xml b/tests/FrameworkTest/res/layout/visibility.xml index b4f9d8b..7edfa33 100644 --- a/tests/FrameworkTest/res/layout/visibility.xml +++ b/tests/FrameworkTest/res/layout/visibility.xml @@ -22,30 +22,30 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:orientation="vertical" android:background="@drawable/box" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TextView android:id="@+id/refUp" android:background="@drawable/red" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/visibility_1_view_1"/> <TextView android:id="@+id/victim" android:background="@drawable/green" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/visibility_1_view_2"/> <TextView android:id="@+id/refDown" android:background="@drawable/blue" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/visibility_1_view_3"/> diff --git a/tests/FrameworkTest/res/layout/visibility_callback.xml b/tests/FrameworkTest/res/layout/visibility_callback.xml index 8fd7c8f..322b640 100644 --- a/tests/FrameworkTest/res/layout/visibility_callback.xml +++ b/tests/FrameworkTest/res/layout/visibility_callback.xml @@ -22,35 +22,35 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:orientation="vertical" android:background="@drawable/box" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TextView android:id="@+id/refUp" android:background="@drawable/red" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/visibility_1_view_1"/> <FrameLayout android:id="@+id/parent" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <view class="com.android.frameworktest.view.VisibilityCallback$MonitoredTextView" android:id="@+id/victim" android:background="@drawable/green" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/visibility_1_view_2"/> </FrameLayout> <TextView android:id="@+id/refDown" android:background="@drawable/blue" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/visibility_1_view_3"/> diff --git a/tests/FrameworkTest/res/layout/weight_sum.xml b/tests/FrameworkTest/res/layout/weight_sum.xml index 249dc68..f8921ec 100644 --- a/tests/FrameworkTest/res/layout/weight_sum.xml +++ b/tests/FrameworkTest/res/layout/weight_sum.xml @@ -22,8 +22,8 @@ android:orientation="horizontal" android:weightSum="1.0" android:gravity="center_horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Button android:id="@+id/child" android:layout_width="0dip" diff --git a/tests/FrameworkTest/res/layout/with_bitmap_background.xml b/tests/FrameworkTest/res/layout/with_bitmap_background.xml index b32d99e..01605d5 100644 --- a/tests/FrameworkTest/res/layout/with_bitmap_background.xml +++ b/tests/FrameworkTest/res/layout/with_bitmap_background.xml @@ -20,8 +20,8 @@ <LinearLayout android:id="@+id/container" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="@drawable/bitmap_drawable"> </LinearLayout> diff --git a/tests/FrameworkTest/res/layout/zero_sized.xml b/tests/FrameworkTest/res/layout/zero_sized.xml index c837bf9..f1c94f8 100644 --- a/tests/FrameworkTest/res/layout/zero_sized.xml +++ b/tests/FrameworkTest/res/layout/zero_sized.xml @@ -22,8 +22,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <View android:id="@+id/dimension" android:background="#ffff0000" diff --git a/tests/FrameworkTest/src/com/android/frameworktest/expandablelistview/InflatedExpandableListView.java b/tests/FrameworkTest/src/com/android/frameworktest/expandablelistview/InflatedExpandableListView.java index f1089a1..aff0507 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/expandablelistview/InflatedExpandableListView.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/expandablelistview/InflatedExpandableListView.java @@ -65,7 +65,7 @@ public class InflatedExpandableListView extends Activity { public TextView getGenericView() { // Layout parameters for the ExpandableListView AbsListView.LayoutParams lp = new AbsListView.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, 64); + ViewGroup.LayoutParams.MATCH_PARENT, 64); TextView textView = new TextView(InflatedExpandableListView.this); textView.setLayoutParams(lp); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/AdjacentVerticalRectLists.java b/tests/FrameworkTest/src/com/android/frameworktest/focus/AdjacentVerticalRectLists.java index c4e2705..09bec2c 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/focus/AdjacentVerticalRectLists.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/focus/AdjacentVerticalRectLists.java @@ -66,11 +66,11 @@ public class AdjacentVerticalRectLists extends Activity { mLayout = new LinearLayout(this); mLayout.setOrientation(LinearLayout.HORIZONTAL); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0, - ViewGroup.LayoutParams.FILL_PARENT, 1); + ViewGroup.LayoutParams.MATCH_PARENT, 1); mLeftColumn = new InternalSelectionView(this, 5, "left column"); mLeftColumn.setLayoutParams(params); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/GoneParentFocusedChild.java b/tests/FrameworkTest/src/com/android/frameworktest/focus/GoneParentFocusedChild.java index 91bd7b4..8f2245f 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/focus/GoneParentFocusedChild.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/focus/GoneParentFocusedChild.java @@ -58,15 +58,15 @@ public class GoneParentFocusedChild extends Activity { mLayout = new LinearLayout(this); mLayout.setOrientation(LinearLayout.HORIZONTAL); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mGoneGroup = new LinearLayout(this); mGoneGroup.setOrientation(LinearLayout.HORIZONTAL); mGoneGroup.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mButton = new Button(this); mButton.setLayoutParams(new LinearLayout.LayoutParams( diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/HorizontalFocusSearch.java b/tests/FrameworkTest/src/com/android/frameworktest/focus/HorizontalFocusSearch.java index 01a9821..05f05ee 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/focus/HorizontalFocusSearch.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/focus/HorizontalFocusSearch.java @@ -61,8 +61,8 @@ public class HorizontalFocusSearch extends Activity { mLayout = new LinearLayout(this); mLayout.setOrientation(LinearLayout.HORIZONTAL); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mLeftTall = makeTall("left tall"); mLayout.addView(mLeftTall); @@ -95,7 +95,7 @@ public class HorizontalFocusSearch extends Activity { button.setText(label); button.setLayoutParams(new LinearLayout.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT)); return button; } @@ -118,7 +118,7 @@ public class HorizontalFocusSearch extends Activity { ll.setOrientation(LinearLayout.VERTICAL); ll.setLayoutParams(new LinearLayout.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT)); if (atBottom) { ll.addView(filler); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfEditTexts.java b/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfEditTexts.java index f59e2b7..41a276a 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfEditTexts.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfEditTexts.java @@ -45,14 +45,14 @@ public class ListOfEditTexts extends Activity { mLinearLayout = new LinearLayout(this); mLinearLayout.setOrientation(LinearLayout.VERTICAL); mLinearLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); // add a button above Button buttonAbove = new Button(this); buttonAbove.setLayoutParams( new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); buttonAbove.setText("button above list"); mLinearLayout.addView(buttonAbove); @@ -60,12 +60,12 @@ public class ListOfEditTexts extends Activity { // add a list view to it mListView = new ListView(this); mListView.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mListView.setDrawSelectorOnTop(false); mListView.setItemsCanFocus(true); mListView.setLayoutParams((new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f))); @@ -82,7 +82,7 @@ public class ListOfEditTexts extends Activity { Button buttonBelow = new Button(this); buttonBelow.setLayoutParams( new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); buttonBelow.setText("button below list"); mLinearLayout.addView(buttonBelow); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfInternalSelectionViews.java b/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfInternalSelectionViews.java index 4bbca74..6104068 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfInternalSelectionViews.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfInternalSelectionViews.java @@ -119,8 +119,8 @@ public class ListOfInternalSelectionViews extends Activity { mListView = new ListView(this); mListView.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mListView.setDrawSelectorOnTop(false); mListView.setAdapter(new MyAdapter()); mListView.setItemsCanFocus(true); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/VerticalFocusSearch.java b/tests/FrameworkTest/src/com/android/frameworktest/focus/VerticalFocusSearch.java index d1b83a3..a8f12d8 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/focus/VerticalFocusSearch.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/focus/VerticalFocusSearch.java @@ -68,8 +68,8 @@ public class VerticalFocusSearch extends Activity { mLayout.setOrientation(LinearLayout.VERTICAL); mLayout.setHorizontalGravity(Gravity.LEFT); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mTopWide = makeWide("top wide"); mLayout.addView(mTopWide); @@ -102,7 +102,7 @@ public class VerticalFocusSearch extends Activity { Button button = new MyButton(this); button.setText(label); button.setLayoutParams(new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); return button; } @@ -133,7 +133,7 @@ public class VerticalFocusSearch extends Activity { LinearLayout ll = new LinearLayout(this); ll.setOrientation(LinearLayout.HORIZONTAL); ll.setLayoutParams(new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); if (atRight) { diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemISVAndButton.java b/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemISVAndButton.java index d6c11b7..ceb94b7 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemISVAndButton.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemISVAndButton.java @@ -47,13 +47,13 @@ public class ListItemISVAndButton extends ListScenario { final InternalSelectionView isv = new InternalSelectionView(context, 8, "ISV postion " + position); isv.setLayoutParams(new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, desiredHeight - 240)); ll.addView(isv); final LinearLayout.LayoutParams buttonLp = new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, 40); final Button topButton = new Button(context); topButton.setLayoutParams( @@ -63,7 +63,7 @@ public class ListItemISVAndButton extends ListScenario { final TextView filler = new TextView(context); filler.setLayoutParams(new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, 200)); filler.setText("filler"); ll.addView(filler); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemsExpandOnSelection.java b/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemsExpandOnSelection.java index a137116..b0ad5e9 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemsExpandOnSelection.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemsExpandOnSelection.java @@ -44,7 +44,7 @@ public class ListItemsExpandOnSelection extends ListScenario { result.setFocusable(mItemsFocusable); result.setText(getValueAtPosition(position)); final AbsListView.LayoutParams lp = new AbsListView.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); result.setLayoutParams(lp); return result; diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListSetSelection.java b/tests/FrameworkTest/src/com/android/frameworktest/listview/ListSetSelection.java index 87888ca..45d5892 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListSetSelection.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/listview/ListSetSelection.java @@ -51,7 +51,7 @@ public class ListSetSelection extends ListScenario { }); getListViewContainer().addView(mButton, new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.FILL_PARENT, + LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT )); } diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListViewHeight.java b/tests/FrameworkTest/src/com/android/frameworktest/listview/ListViewHeight.java index 17222d9..1d6d598 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListViewHeight.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/listview/ListViewHeight.java @@ -70,14 +70,14 @@ public class ListViewHeight extends Activity { } }); - // Clicking this button will show the list view and set it fill_parent height + // Clicking this button will show the list view and set it match_parent height // If you then hide the views, there is an NPE when calculating the ListView height. mButton2.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { // set listview to fill screen ViewGroup.MarginLayoutParams lp; lp = (ViewGroup.MarginLayoutParams) mInnerList.getLayoutParams(); - lp.height = lp.FILL_PARENT; + lp.height = lp.MATCH_PARENT; mInnerList.setLayoutParams(lp); // enable list adapter mInnerList.setAdapter(mAdapter); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/scroll/ScrollViewButtonsAndLabels.java b/tests/FrameworkTest/src/com/android/frameworktest/scroll/ScrollViewButtonsAndLabels.java index 4763ab1..2d3be2e 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/scroll/ScrollViewButtonsAndLabels.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/scroll/ScrollViewButtonsAndLabels.java @@ -70,7 +70,7 @@ public class ScrollViewButtonsAndLabels extends Activity { mLinearLayout = (LinearLayout) findViewById(R.id.layout); LinearLayout.LayoutParams p = new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.FILL_PARENT, + LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT ); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/ExpandableListScenario.java b/tests/FrameworkTest/src/com/android/frameworktest/util/ExpandableListScenario.java index f72cbe8..5aa9479 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/util/ExpandableListScenario.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/util/ExpandableListScenario.java @@ -18,7 +18,6 @@ package com.android.frameworktest.util; import java.util.ArrayList; import java.util.List; -import java.util.Random; import android.view.Gravity; import android.view.View; @@ -256,7 +255,7 @@ public abstract class ExpandableListScenario extends ListScenario { result.setHeight(desiredHeight); result.setText(getValueAtPosition(packedPosition)); final ViewGroup.LayoutParams lp = new AbsListView.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); result.setLayoutParams(lp); result.setGravity(Gravity.CENTER_VERTICAL); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/GridScenario.java b/tests/FrameworkTest/src/com/android/frameworktest/util/GridScenario.java index 746cf23..76a1101 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/util/GridScenario.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/util/GridScenario.java @@ -242,8 +242,8 @@ public abstract class GridScenario extends Activity { mGridView = new GridView(this); mGridView.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mGridView.setDrawSelectorOnTop(false); if (mNumColumns >= GridView.AUTO_FIT) { mGridView.setNumColumns(mNumColumns); @@ -330,7 +330,7 @@ public abstract class GridScenario extends Activity { result.setHeight(desiredHeight); result.setText(getValueAtPosition(position)); final ViewGroup.LayoutParams lp = new AbsListView.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); result.setLayoutParams(lp); result.setId(position); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/ListItemFactory.java b/tests/FrameworkTest/src/com/android/frameworktest/util/ListItemFactory.java index 4327a8a..2c1cf5b 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/util/ListItemFactory.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/util/ListItemFactory.java @@ -50,7 +50,7 @@ public class ListItemFactory { final LinearLayout.LayoutParams buttonLp = new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, 50); final Button topButton = new Button(context); @@ -61,7 +61,7 @@ public class ListItemFactory { final TextView middleFiller = new TextView(context); middleFiller.setLayoutParams(new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, desiredHeight - 100)); middleFiller.setText("filler"); ll.addView(middleFiller); @@ -157,7 +157,7 @@ public class ListItemFactory { result.setHeight(desiredHeight); result.setText(text); final ViewGroup.LayoutParams lp = new AbsListView.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); result.setLayoutParams(lp); result.setId(position); @@ -197,7 +197,7 @@ public class ListItemFactory { result.setHeight(desiredHeight); result.setText(text); final ViewGroup.LayoutParams lp = new AbsListView.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); result.setLayoutParams(lp); result.setId(position); @@ -239,7 +239,7 @@ public class ListItemFactory { final AbsListView.LayoutParams lp = new AbsListView.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, desiredHeight); ll.setLayoutParams(lp); ll.setId(position); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/ListScenario.java b/tests/FrameworkTest/src/com/android/frameworktest/util/ListScenario.java index 5889658..a6ae188 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/util/ListScenario.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/util/ListScenario.java @@ -315,8 +315,8 @@ public abstract class ListScenario extends Activity { mListView = createListView(); mListView.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mListView.setDrawSelectorOnTop(false); for (int i=0; i<mHeaderViewCount; i++) { @@ -375,16 +375,16 @@ public abstract class ListScenario extends Activity { mHeaderTextView = new TextView(this); mHeaderTextView.setText("hi"); mHeaderTextView.setLayoutParams(new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); mLinearLayout.addView(mHeaderTextView); mLinearLayout.setOrientation(LinearLayout.VERTICAL); mLinearLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mListView.setLayoutParams((new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f))); @@ -394,10 +394,10 @@ public abstract class ListScenario extends Activity { mLinearLayout = new LinearLayout(this); mLinearLayout.setOrientation(LinearLayout.VERTICAL); mLinearLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mListView.setLayoutParams((new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f))); mLinearLayout.addView(mListView); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/ScrollViewScenario.java b/tests/FrameworkTest/src/com/android/frameworktest/util/ScrollViewScenario.java index aa17194..daa168d 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/util/ScrollViewScenario.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/util/ScrollViewScenario.java @@ -174,7 +174,7 @@ public abstract class ScrollViewScenario extends Activity { // fill width, equally weighted on height final LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, 0, 1f); + ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f); for (int i = 0; i < numButtons; i++) { final Button button = new Button(context); button.setText(prefix + i); @@ -240,15 +240,15 @@ public abstract class ScrollViewScenario extends Activity { // create views specified by params for (ViewFactory viewFactory : params.mViewFactories) { final LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, (int) (viewFactory.getHeightRatio() * screenHeight)); mLinearLayout.addView(viewFactory.create(this), lp); } mScrollView = createScrollView(); mScrollView.addView(mLinearLayout, new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); // no animation to speed up tests mScrollView.setSmoothScrollingEnabled(false); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/BigCache.java b/tests/FrameworkTest/src/com/android/frameworktest/view/BigCache.java index 6f5eb00..52f7a07 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/view/BigCache.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/view/BigCache.java @@ -39,7 +39,7 @@ public class BigCache extends Activity { final LinearLayout testBed = new LinearLayout(this); testBed.setOrientation(LinearLayout.VERTICAL); testBed.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); final int cacheSize = ViewConfiguration.getMaximumDrawingCacheSize(); final Display display = getWindowManager().getDefaultDisplay(); @@ -60,7 +60,7 @@ public class BigCache extends Activity { final ScrollView scroller = new ScrollView(this); scroller.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); testBed.addView(tiny); testBed.addView(large); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/PreDrawListener.java b/tests/FrameworkTest/src/com/android/frameworktest/view/PreDrawListener.java index cb456b2..e907b24 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/view/PreDrawListener.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/view/PreDrawListener.java @@ -60,7 +60,7 @@ public class PreDrawListener extends Activity implements OnClickListener { if (mCancelNextDraw) { Button b = new Button(this.getContext()); b.setText("Hello"); - addView(b, new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, + addView(b, new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)); mCancelNextDraw = false; return false; diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/ViewGroupChildrenTest.java b/tests/FrameworkTest/tests/src/com/android/frameworktest/view/ViewGroupChildrenTest.java index fceec51..a6007e1 100644 --- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/ViewGroupChildrenTest.java +++ b/tests/FrameworkTest/tests/src/com/android/frameworktest/view/ViewGroupChildrenTest.java @@ -260,7 +260,7 @@ public class ViewGroupChildrenTest extends ActivityInstrumentationTestCase<ViewG TextView view = new TextView(getActivity()); view.setText(text); view.setLayoutParams(new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.FILL_PARENT, + LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT )); return view; 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; diff --git a/tests/LowStorageTest/res/layout/main.xml b/tests/LowStorageTest/res/layout/main.xml index cc99102..f1cc680 100644 --- a/tests/LowStorageTest/res/layout/main.xml +++ b/tests/LowStorageTest/res/layout/main.xml @@ -14,8 +14,8 @@ limitations under the License. --> <TableLayout 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:stretchColumns="1"> <TextView diff --git a/tests/StatusBar/res/layout/chrono_notification.xml b/tests/StatusBar/res/layout/chrono_notification.xml index 913a860..98a9fdd 100644 --- a/tests/StatusBar/res/layout/chrono_notification.xml +++ b/tests/StatusBar/res/layout/chrono_notification.xml @@ -1,12 +1,12 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="80sp" android:orientation="horizontal" > <LinearLayout android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="0" android:orientation="vertical" > diff --git a/tests/appwidgets/AppWidgetHostTest/res/layout/appwidget_host.xml b/tests/appwidgets/AppWidgetHostTest/res/layout/appwidget_host.xml index e5c3b28..88c6488 100644 --- a/tests/appwidgets/AppWidgetHostTest/res/layout/appwidget_host.xml +++ b/tests/appwidgets/AppWidgetHostTest/res/layout/appwidget_host.xml @@ -16,8 +16,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" > + android:layout_width="match_parent" + android:layout_height="match_parent" > <TextView android:layout_width="wrap_content" @@ -26,7 +26,7 @@ /> <ScrollView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" > diff --git a/tests/appwidgets/AppWidgetHostTest/res/layout/test_appwidget_configure.xml b/tests/appwidgets/AppWidgetHostTest/res/layout/test_appwidget_configure.xml index 0d9b983..a0f9cc2 100644 --- a/tests/appwidgets/AppWidgetHostTest/res/layout/test_appwidget_configure.xml +++ b/tests/appwidgets/AppWidgetHostTest/res/layout/test_appwidget_configure.xml @@ -15,21 +15,21 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <TextView android:id="@+id/oh_hai_text" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/oh_hai" /> <EditText android:id="@+id/edit_text" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/AppWidgetHostActivity.java b/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/AppWidgetHostActivity.java index 2fb2d1d..bb0fa60 100644 --- a/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/AppWidgetHostActivity.java +++ b/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/AppWidgetHostActivity.java @@ -129,7 +129,7 @@ public class AppWidgetHostActivity extends Activity // Add it to the list LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.FILL_PARENT, + LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT); mAppWidgetContainer.addView(view, layoutParams); |