commit 980a938c1c9a6a5791a8240e5a1e6638ab28dc77
author Romain Guy <romainguy@android.com> Fri Jan 08 15:06:28 2010 -0800
committer Romain Guy <romainguy@android.com> Fri Jan 08 15:11:38 2010 -0800
tree 75a3a1347b5423cc98859d3976076cea3dc22564
parent 0a0289420227fee51406cf4cc508f09d8ecdd2f4

Deprecate fill_parent and introduce match_parent.
Bug: #2361749.

tests/FrameworkTest/src/com/android/frameworktest/util/ListScenario.java

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 @@
 
         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 @@
             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 @@
             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);