diff options
254 files changed, 954 insertions, 953 deletions
diff --git a/api/current.xml b/api/current.xml index f2af5ee..0f152d1 100644 --- a/api/current.xml +++ b/api/current.xml @@ -3162,7 +3162,7 @@ value="16843395" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -3239,7 +3239,7 @@ value="16843362" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -5109,7 +5109,7 @@ value="16842997" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -5230,7 +5230,7 @@ value="16842996" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -174003,6 +174003,17 @@ value="-1" static="true" final="true" + deprecated="deprecated" + visibility="public" +> +</field> +<field name="MATCH_PARENT" + type="int" + transient="false" + volatile="false" + value="-1" + static="true" + final="true" deprecated="not deprecated" visibility="public" > diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 49ebce3..1c3414d 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -2087,8 +2087,8 @@ public class Activity extends ContextThemeWrapper event.setPackageName(getPackageName()); LayoutParams params = getWindow().getAttributes(); - boolean isFullScreen = (params.width == LayoutParams.FILL_PARENT) && - (params.height == LayoutParams.FILL_PARENT); + boolean isFullScreen = (params.width == LayoutParams.MATCH_PARENT) && + (params.height == LayoutParams.MATCH_PARENT); event.setFullScreen(isFullScreen); CharSequence title = getTitle(); diff --git a/core/java/android/app/AlertDialog.java b/core/java/android/app/AlertDialog.java index 20a579a..2603579 100644 --- a/core/java/android/app/AlertDialog.java +++ b/core/java/android/app/AlertDialog.java @@ -40,7 +40,7 @@ import com.android.internal.app.AlertController; * * <pre> * FrameLayout fl = (FrameLayout) findViewById(R.id.body); - * fl.add(myView, new LayoutParams(FILL_PARENT, WRAP_CONTENT)); + * fl.add(myView, new LayoutParams(MATCH_PARENT, WRAP_CONTENT)); * </pre> * * <p>The AlertDialog class takes care of automatically setting diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java index 58e8b32..fa5d4a8 100644 --- a/core/java/android/app/Dialog.java +++ b/core/java/android/app/Dialog.java @@ -668,8 +668,8 @@ public class Dialog implements DialogInterface, Window.Callback, event.setPackageName(mContext.getPackageName()); LayoutParams params = getWindow().getAttributes(); - boolean isFullScreen = (params.width == LayoutParams.FILL_PARENT) && - (params.height == LayoutParams.FILL_PARENT); + boolean isFullScreen = (params.width == LayoutParams.MATCH_PARENT) && + (params.height == LayoutParams.MATCH_PARENT); event.setFullScreen(isFullScreen); return false; diff --git a/core/java/android/app/ExpandableListActivity.java b/core/java/android/app/ExpandableListActivity.java index a2e048f..9651078 100644 --- a/core/java/android/app/ExpandableListActivity.java +++ b/core/java/android/app/ExpandableListActivity.java @@ -65,21 +65,21 @@ import java.util.Map; * <?xml version="1.0" encoding="UTF-8"?> * <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" * android:orientation="vertical" - * android:layout_width="fill_parent" - * android:layout_height="fill_parent" + * android:layout_width="match_parent" + * android:layout_height="match_parent" * android:paddingLeft="8dp" * android:paddingRight="8dp"> * * <ExpandableListView android:id="@id/android:list" - * android:layout_width="fill_parent" - * android:layout_height="fill_parent" + * android:layout_width="match_parent" + * android:layout_height="match_parent" * android:background="#00FF00" * android:layout_weight="1" * android:drawSelectorOnTop="false"/> * * <TextView android:id="@id/android:empty" - * android:layout_width="fill_parent" - * android:layout_height="fill_parent" + * android:layout_width="match_parent" + * android:layout_height="match_parent" * android:background="#FF0000" * android:text="No data"/> * </LinearLayout> @@ -114,19 +114,19 @@ import java.util.Map; * <pre> * <?xml version="1.0" encoding="utf-8"?> * <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/text1" * android:textSize="16sp" * android:textStyle="bold" - * android:layout_width="fill_parent" + * android:layout_width="match_parent" * android:layout_height="wrap_content"/> * * <TextView android:id="@+id/text2" * android:textSize="16sp" - * android:layout_width="fill_parent" + * android:layout_width="match_parent" * android:layout_height="wrap_content"/> * </LinearLayout> * </pre> diff --git a/core/java/android/app/ListActivity.java b/core/java/android/app/ListActivity.java index 19b99c8..4b4cc05 100644 --- a/core/java/android/app/ListActivity.java +++ b/core/java/android/app/ListActivity.java @@ -56,21 +56,21 @@ import android.widget.ListView; * <?xml version="1.0" encoding="utf-8"?> * <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" * android:orientation="vertical" - * android:layout_width="fill_parent" - * android:layout_height="fill_parent" + * android:layout_width="match_parent" + * android:layout_height="match_parent" * android:paddingLeft="8dp" * android:paddingRight="8dp"> * * <ListView android:id="@id/android:list" - * android:layout_width="fill_parent" - * android:layout_height="fill_parent" + * android:layout_width="match_parent" + * android:layout_height="match_parent" * android:background="#00FF00" * android:layout_weight="1" * android:drawSelectorOnTop="false"/> * * <TextView id="@id/android:empty" - * android:layout_width="fill_parent" - * android:layout_height="fill_parent" + * android:layout_width="match_parent" + * android:layout_height="match_parent" * android:background="#FF0000" * android:text="No data"/> * </LinearLayout> @@ -100,19 +100,19 @@ import android.widget.ListView; * <pre> * <?xml version="1.0" encoding="utf-8"?> * <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/text1" * android:textSize="16sp" * android:textStyle="bold" - * android:layout_width="fill_parent" + * android:layout_width="match_parent" * android:layout_height="wrap_content"/> * * <TextView android:id="@+id/text2" * android:textSize="16sp" - * android:layout_width="fill_parent" + * android:layout_width="match_parent" * android:layout_height="wrap_content"/> * </LinearLayout> * </pre> diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java index b204c79..8968553 100644 --- a/core/java/android/app/SearchDialog.java +++ b/core/java/android/app/SearchDialog.java @@ -182,11 +182,11 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS Window theWindow = getWindow(); WindowManager.LayoutParams lp = theWindow.getAttributes(); lp.type = WindowManager.LayoutParams.TYPE_SEARCH_BAR; - lp.width = ViewGroup.LayoutParams.FILL_PARENT; + lp.width = ViewGroup.LayoutParams.MATCH_PARENT; // taking up the whole window (even when transparent) is less than ideal, // but necessary to show the popup window until the window manager supports // having windows anchored by their parent but not clipped by them. - lp.height = ViewGroup.LayoutParams.FILL_PARENT; + lp.height = ViewGroup.LayoutParams.MATCH_PARENT; lp.gravity = Gravity.TOP | Gravity.FILL_HORIZONTAL; lp.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE; theWindow.setAttributes(lp); diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java index 2f719f3..792b289 100644 --- a/core/java/android/appwidget/AppWidgetHostView.java +++ b/core/java/android/appwidget/AppWidgetHostView.java @@ -311,8 +311,8 @@ public class AppWidgetHostView extends FrameLayout { // Take requested dimensions from child, but apply default gravity. FrameLayout.LayoutParams requested = (FrameLayout.LayoutParams)view.getLayoutParams(); if (requested == null) { - requested = new FrameLayout.LayoutParams(LayoutParams.FILL_PARENT, - LayoutParams.FILL_PARENT); + requested = new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT, + LayoutParams.MATCH_PARENT); } requested.gravity = Gravity.CENTER; diff --git a/core/java/android/content/package.html b/core/java/android/content/package.html index dd5360f..eac679d 100644 --- a/core/java/android/content/package.html +++ b/core/java/android/content/package.html @@ -421,7 +421,7 @@ can supply them explicitly in the XML file:</p> <?xml version="1.0" encoding="utf-8"?> <root> <EditText id="text" - android:layout_width="fill_parent" android:layout_height="fill_parent" + android:layout_width="match_parent" android:layout_height="match_parent" <b>android:textSize="18" android:textColor="#008"</b> android:text="Hello, World!" /> </root> @@ -447,7 +447,7 @@ one of those resources:</p> <?xml version="1.0" encoding="utf-8"?> <root> <EditText id="text" - android:layout_width="fill_parent" android:layout_height="fill_parent" + android:layout_width="match_parent" android:layout_height="match_parent" <b>android:textColor="@color/opaque_red"</b> android:text="Hello, World!" /> </root> @@ -463,7 +463,7 @@ reference a system resource, you would need to write:</p> <?xml version="1.0" encoding="utf-8"?> <root> <EditText id="text" - android:layout_width="fill_parent" android:layout_height="fill_parent" + android:layout_width="match_parent" android:layout_height="match_parent" android:textColor="@<b>android:</b>color/opaque_red" android:text="Hello, World!" /> </root> @@ -476,7 +476,7 @@ strings in a layout file so that they can be localized:</p> <?xml version="1.0" encoding="utf-8"?> <root> <EditText id="text" - android:layout_width="fill_parent" android:layout_height="fill_parent" + android:layout_width="match_parent" android:layout_height="match_parent" android:textColor="@android:color/opaque_red" android:text="@string/hello_world" /> </root> @@ -509,7 +509,7 @@ one of the standard colors defined in the base system theme:</p> <?xml version="1.0" encoding="utf-8"?> <root> <EditText id="text" - android:layout_width="fill_parent" android:layout_height="fill_parent" + android:layout_width="match_parent" android:layout_height="match_parent" <b>android:textColor="?android:textDisabledColor"</b> android:text="@string/hello_world" /> </root> @@ -637,10 +637,10 @@ new style resource with the desired values:</p> <?xml version="1.0" encoding="utf-8"?> <root> <EditText id="text1" <b>style="@style/SpecialText"</b> - android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="Hello, World!" /> <EditText id="text2" <b>style="@style/SpecialText"</b> - android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="I love you all." /> </root></pre> <h4> </h4> diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 5499bba..b315932 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -16,7 +16,7 @@ package android.inputmethodservice; -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.app.Dialog; @@ -556,7 +556,7 @@ public class InputMethodService extends AbstractInputMethodService { Context.LAYOUT_INFLATER_SERVICE); mWindow = new SoftInputWindow(this, mTheme, mDispatcherState); initViews(); - mWindow.getWindow().setLayout(FILL_PARENT, WRAP_CONTENT); + mWindow.getWindow().setLayout(MATCH_PARENT, WRAP_CONTENT); } /** @@ -803,8 +803,8 @@ public class InputMethodService extends AbstractInputMethodService { * candidates only mode changes. * * <p>The default implementation makes the layout for the window - * FILL_PARENT x FILL_PARENT when in fullscreen mode, and - * FILL_PARENT x WRAP_CONTENT when in non-fullscreen mode. + * MATCH_PARENT x MATCH_PARENT when in fullscreen mode, and + * MATCH_PARENT x WRAP_CONTENT when in non-fullscreen mode. * * @param win The input method's window. * @param isFullscreen If true, the window is running in fullscreen mode @@ -816,9 +816,9 @@ public class InputMethodService extends AbstractInputMethodService { public void onConfigureWindow(Window win, boolean isFullscreen, boolean isCandidatesOnly) { if (isFullscreen) { - mWindow.getWindow().setLayout(FILL_PARENT, FILL_PARENT); + mWindow.getWindow().setLayout(MATCH_PARENT, MATCH_PARENT); } else { - mWindow.getWindow().setLayout(FILL_PARENT, WRAP_CONTENT); + mWindow.getWindow().setLayout(MATCH_PARENT, WRAP_CONTENT); } } @@ -1049,8 +1049,8 @@ public class InputMethodService extends AbstractInputMethodService { public void setExtractView(View view) { mExtractFrame.removeAllViews(); mExtractFrame.addView(view, new FrameLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mExtractView = view; if (view != null) { mExtractEditText = (ExtractEditText)view.findViewById( @@ -1079,7 +1079,7 @@ public class InputMethodService extends AbstractInputMethodService { public void setCandidatesView(View view) { mCandidatesFrame.removeAllViews(); mCandidatesFrame.addView(view, new FrameLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); } @@ -1092,7 +1092,7 @@ public class InputMethodService extends AbstractInputMethodService { public void setInputView(View view) { mInputFrame.removeAllViews(); mInputFrame.addView(view, new FrameLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); mInputView = view; } diff --git a/core/java/android/preference/EditTextPreference.java b/core/java/android/preference/EditTextPreference.java index 84ee950..aa27627 100644 --- a/core/java/android/preference/EditTextPreference.java +++ b/core/java/android/preference/EditTextPreference.java @@ -28,7 +28,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewParent; import android.widget.EditText; -import android.widget.LinearLayout; /** * A {@link Preference} that allows for string @@ -128,7 +127,7 @@ public class EditTextPreference extends DialogPreference { ViewGroup container = (ViewGroup) dialogView .findViewById(com.android.internal.R.id.edittext_container); if (container != null) { - container.addView(editText, ViewGroup.LayoutParams.FILL_PARENT, + container.addView(editText, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); } } diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index 45719e4..fe3b149 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -434,9 +434,9 @@ public abstract class WallpaperService extends Service { } int myWidth = mSurfaceHolder.getRequestedWidth(); - if (myWidth <= 0) myWidth = ViewGroup.LayoutParams.FILL_PARENT; + if (myWidth <= 0) myWidth = ViewGroup.LayoutParams.MATCH_PARENT; int myHeight = mSurfaceHolder.getRequestedHeight(); - if (myHeight <= 0) myHeight = ViewGroup.LayoutParams.FILL_PARENT; + if (myHeight <= 0) myHeight = ViewGroup.LayoutParams.MATCH_PARENT; final boolean creating = !mCreated; final boolean formatChanged = mFormat != mSurfaceHolder.getRequestedFormat(); diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 5bd45a66a..df4cab0 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -379,7 +379,7 @@ import java.util.WeakHashMap; * dimension, it can specify one of: * <ul> * <li> an exact number - * <li>FILL_PARENT, which means the view wants to be as big as its parent + * <li>MATCH_PARENT, which means the view wants to be as big as its parent * (minus padding) * <li> WRAP_CONTENT, which means that the view wants to be just big enough to * enclose its content (plus padding). diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 6646136..763f273 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -3070,7 +3070,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager if (childDimension >= 0) { resultSize = childDimension; resultMode = MeasureSpec.EXACTLY; - } else if (childDimension == LayoutParams.FILL_PARENT) { + } else if (childDimension == LayoutParams.MATCH_PARENT) { // Child wants to be our size. So be it. resultSize = size; resultMode = MeasureSpec.EXACTLY; @@ -3088,7 +3088,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager // Child wants a specific size... so be it resultSize = childDimension; resultMode = MeasureSpec.EXACTLY; - } else if (childDimension == LayoutParams.FILL_PARENT) { + } else if (childDimension == LayoutParams.MATCH_PARENT) { // Child wants to be our size, but our size is not fixed. // Constrain child to not be bigger than us. resultSize = size; @@ -3107,7 +3107,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager // Child wants a specific size... let him have it resultSize = childDimension; resultMode = MeasureSpec.EXACTLY; - } else if (childDimension == LayoutParams.FILL_PARENT) { + } else if (childDimension == LayoutParams.MATCH_PARENT) { // Child wants to be our size... find out how big it should // be resultSize = 0; @@ -3362,7 +3362,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * for both width and height. For each dimension, it can specify one of: * <ul> * <li> an exact number - * <li>FILL_PARENT, which means the view wants to be as big as its parent + * <li>MATCH_PARENT, which means the view wants to be as big as its parent * (minus padding) * <li> WRAP_CONTENT, which means that the view wants to be just big enough * to enclose its content (plus padding) @@ -3376,14 +3376,22 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager */ public static class LayoutParams { /** - * Special value for the height or width requested by a View. - * FILL_PARENT means that the view wants to fill the available space - * within the parent, taking the parent's padding into account. + * This value has the same meaning as {@link #MATCH_PARENT} but has + * been deprecated. */ + @SuppressWarnings({"UnusedDeclaration"}) + @Deprecated public static final int FILL_PARENT = -1; /** * Special value for the height or width requested by a View. + * MATCH_PARENT means that the view wants to be as bigas its parent, + * minus the parent's padding, if any. + */ + public static final int MATCH_PARENT = -1; + + /** + * Special value for the height or width requested by a View. * WRAP_CONTENT means that the view wants to be just large enough to fit * its own internal content, taking its own padding into account. */ @@ -3391,20 +3399,20 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager /** * Information about how wide the view wants to be. Can be an exact - * size, or one of the constants FILL_PARENT or WRAP_CONTENT. + * size, or one of the constants MATCH_PARENT or WRAP_CONTENT. */ @ViewDebug.ExportedProperty(mapping = { - @ViewDebug.IntToString(from = FILL_PARENT, to = "FILL_PARENT"), + @ViewDebug.IntToString(from = MATCH_PARENT, to = "MATCH_PARENT"), @ViewDebug.IntToString(from = WRAP_CONTENT, to = "WRAP_CONTENT") }) public int width; /** * Information about how tall the view wants to be. Can be an exact - * size, or one of the constants FILL_PARENT or WRAP_CONTENT. + * size, or one of the constants MATCH_PARENT or WRAP_CONTENT. */ @ViewDebug.ExportedProperty(mapping = { - @ViewDebug.IntToString(from = FILL_PARENT, to = "FILL_PARENT"), + @ViewDebug.IntToString(from = MATCH_PARENT, to = "MATCH_PARENT"), @ViewDebug.IntToString(from = WRAP_CONTENT, to = "WRAP_CONTENT") }) public int height; @@ -3421,9 +3429,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * * <ul> * <li><code>layout_width</code>: the width, either an exact value, - * {@link #WRAP_CONTENT} or {@link #FILL_PARENT}</li> + * {@link #WRAP_CONTENT} or {@link #MATCH_PARENT}</li> * <li><code>layout_height</code>: the height, either an exact value, - * {@link #WRAP_CONTENT} or {@link #FILL_PARENT}</li> + * {@link #WRAP_CONTENT} or {@link #MATCH_PARENT}</li> * </ul> * * @param c the application environment @@ -3442,9 +3450,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * Creates a new set of layout parameters with the specified width * and height. * - * @param width the width, either {@link #FILL_PARENT}, + * @param width the width, either {@link #MATCH_PARENT}, * {@link #WRAP_CONTENT} or a fixed size in pixels - * @param height the height, either {@link #FILL_PARENT}, + * @param height the height, either {@link #MATCH_PARENT}, * {@link #WRAP_CONTENT} or a fixed size in pixels */ public LayoutParams(int width, int height) { @@ -3507,8 +3515,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager if (size == WRAP_CONTENT) { return "wrap-content"; } - if (size == FILL_PARENT) { - return "fill-parent"; + if (size == MATCH_PARENT) { + return "match-parent"; } return String.valueOf(size); } diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index 47b976b..094b7dd 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -1167,7 +1167,7 @@ public final class ViewRoot extends Handler implements ViewParent, int measureSpec; switch (rootDimension) { - case ViewGroup.LayoutParams.FILL_PARENT: + case ViewGroup.LayoutParams.MATCH_PARENT: // Window can't resize. Force root view to be windowSize. measureSpec = MeasureSpec.makeMeasureSpec(windowSize, MeasureSpec.EXACTLY); break; diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java index 1932765..7dd5085 100644 --- a/core/java/android/view/Window.java +++ b/core/java/android/view/Window.java @@ -484,7 +484,7 @@ public abstract class Window { /** * Set the width and height layout parameters of the window. The default - * for both of these is FILL_PARENT; you can change them to WRAP_CONTENT to + * for both of these is MATCH_PARENT; you can change them to WRAP_CONTENT to * make a window that is not full-screen. * * @param width The desired layout width of the window. diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index fe329f2..8e15f89 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -771,26 +771,26 @@ public interface WindowManager extends ViewManager { public LayoutParams() { - super(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT); + super(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); type = TYPE_APPLICATION; format = PixelFormat.OPAQUE; } public LayoutParams(int _type) { - super(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT); + super(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); type = _type; format = PixelFormat.OPAQUE; } public LayoutParams(int _type, int _flags) { - super(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT); + super(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); type = _type; flags = _flags; format = PixelFormat.OPAQUE; } public LayoutParams(int _type, int _flags, int _format) { - super(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT); + super(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); type = _type; flags = _flags; format = _format; @@ -1036,9 +1036,9 @@ public interface WindowManager extends ViewManager { sb.append(','); sb.append(y); sb.append(")("); - sb.append((width==FILL_PARENT?"fill":(width==WRAP_CONTENT?"wrap":width))); + sb.append((width== MATCH_PARENT ?"fill":(width==WRAP_CONTENT?"wrap":width))); sb.append('x'); - sb.append((height==FILL_PARENT?"fill":(height==WRAP_CONTENT?"wrap":height))); + sb.append((height== MATCH_PARENT ?"fill":(height==WRAP_CONTENT?"wrap":height))); sb.append(")"); if (softInputMode != 0) { sb.append(" sim=#"); diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 821f2bf..9d658bd 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -25,11 +25,9 @@ import android.database.DataSetObserver; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; -import android.graphics.Paint; import android.graphics.Picture; import android.graphics.Point; import android.graphics.Rect; -import android.graphics.Region; import android.graphics.drawable.Drawable; import android.net.http.SslCertificate; import android.net.Uri; @@ -55,7 +53,6 @@ import android.view.VelocityTracker; import android.view.View; import android.view.ViewConfiguration; import android.view.ViewGroup; -import android.view.ViewParent; import android.view.ViewTreeObserver; import android.view.animation.AlphaAnimation; import android.view.inputmethod.InputMethodManager; @@ -1849,7 +1846,7 @@ public class WebView extends AbsoluteLayout } if (null != v) { addView(v, new AbsoluteLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0, 0)); if (mTitleShadow == null) { mTitleShadow = (Drawable) mContext.getResources().getDrawable( diff --git a/core/java/android/widget/AbsSpinner.java b/core/java/android/widget/AbsSpinner.java index 424a936..c939e3f 100644 --- a/core/java/android/widget/AbsSpinner.java +++ b/core/java/android/widget/AbsSpinner.java @@ -249,7 +249,7 @@ public abstract class AbsSpinner extends AdapterView<SpinnerAdapter> { @Override protected ViewGroup.LayoutParams generateDefaultLayoutParams() { return new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); } diff --git a/core/java/android/widget/AbsoluteLayout.java b/core/java/android/widget/AbsoluteLayout.java index c77f7ae..b829655 100644 --- a/core/java/android/widget/AbsoluteLayout.java +++ b/core/java/android/widget/AbsoluteLayout.java @@ -161,9 +161,9 @@ public class AbsoluteLayout extends ViewGroup { * Creates a new set of layout parameters with the specified width, * height and location. * - * @param width the width, either {@link #FILL_PARENT}, + * @param width the width, either {@link #MATCH_PARENT}, {@link #WRAP_CONTENT} or a fixed size in pixels - * @param height the height, either {@link #FILL_PARENT}, + * @param height the height, either {@link #MATCH_PARENT}, {@link #WRAP_CONTENT} or a fixed size in pixels * @param x the X location of the child * @param y the Y location of the child diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java index b455d47..bb9a672 100644 --- a/core/java/android/widget/AutoCompleteTextView.java +++ b/core/java/android/widget/AutoCompleteTextView.java @@ -172,7 +172,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe mDropDownAnchorId = a.getResourceId(R.styleable.AutoCompleteTextView_dropDownAnchor, View.NO_ID); - // For dropdown width, the developer can specify a specific width, or FILL_PARENT + // For dropdown width, the developer can specify a specific width, or MATCH_PARENT // (for full screen width) or WRAP_CONTENT (to match the width of the anchored view). mDropDownWidth = a.getLayoutDimension(R.styleable.AutoCompleteTextView_dropDownWidth, ViewGroup.LayoutParams.WRAP_CONTENT); @@ -240,7 +240,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe /** * <p>Returns the current width for the auto-complete drop down list. This can - * be a fixed width, or {@link ViewGroup.LayoutParams#FILL_PARENT} to fill the screen, or + * be a fixed width, or {@link ViewGroup.LayoutParams#MATCH_PARENT} to fill the screen, or * {@link ViewGroup.LayoutParams#WRAP_CONTENT} to fit the width of its anchor view.</p> * * @return the width for the drop down list @@ -253,7 +253,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe /** * <p>Sets the current width for the auto-complete drop down list. This can - * be a fixed width, or {@link ViewGroup.LayoutParams#FILL_PARENT} to fill the screen, or + * be a fixed width, or {@link ViewGroup.LayoutParams#MATCH_PARENT} to fill the screen, or * {@link ViewGroup.LayoutParams#WRAP_CONTENT} to fit the width of its anchor view.</p> * * @param width the width to use @@ -266,7 +266,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe /** * <p>Returns the current height for the auto-complete drop down list. This can - * be a fixed height, or {@link ViewGroup.LayoutParams#FILL_PARENT} to fill + * be a fixed height, or {@link ViewGroup.LayoutParams#MATCH_PARENT} to fill * the screen, or {@link ViewGroup.LayoutParams#WRAP_CONTENT} to fit the height * of the drop down's content.</p> * @@ -280,7 +280,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe /** * <p>Sets the current height for the auto-complete drop down list. This can - * be a fixed height, or {@link ViewGroup.LayoutParams#FILL_PARENT} to fill + * be a fixed height, or {@link ViewGroup.LayoutParams#MATCH_PARENT} to fill * the screen, or {@link ViewGroup.LayoutParams#WRAP_CONTENT} to fit the height * of the drop down's content.</p> * @@ -1129,7 +1129,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe boolean noInputMethod = isInputMethodNotNeeded(); if (mPopup.isShowing()) { - if (mDropDownWidth == ViewGroup.LayoutParams.FILL_PARENT) { + if (mDropDownWidth == ViewGroup.LayoutParams.MATCH_PARENT) { // The call to PopupWindow's update method below can accept -1 for any // value you do not want to update. widthSpec = -1; @@ -1139,19 +1139,19 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe widthSpec = mDropDownWidth; } - if (mDropDownHeight == ViewGroup.LayoutParams.FILL_PARENT) { + if (mDropDownHeight == ViewGroup.LayoutParams.MATCH_PARENT) { // The call to PopupWindow's update method below can accept -1 for any // value you do not want to update. - heightSpec = noInputMethod ? height : ViewGroup.LayoutParams.FILL_PARENT; + heightSpec = noInputMethod ? height : ViewGroup.LayoutParams.MATCH_PARENT; if (noInputMethod) { mPopup.setWindowLayoutMode( - mDropDownWidth == ViewGroup.LayoutParams.FILL_PARENT ? - ViewGroup.LayoutParams.FILL_PARENT : 0, 0); + mDropDownWidth == ViewGroup.LayoutParams.MATCH_PARENT ? + ViewGroup.LayoutParams.MATCH_PARENT : 0, 0); } else { mPopup.setWindowLayoutMode( - mDropDownWidth == ViewGroup.LayoutParams.FILL_PARENT ? - ViewGroup.LayoutParams.FILL_PARENT : 0, - ViewGroup.LayoutParams.FILL_PARENT); + mDropDownWidth == ViewGroup.LayoutParams.MATCH_PARENT ? + ViewGroup.LayoutParams.MATCH_PARENT : 0, + ViewGroup.LayoutParams.MATCH_PARENT); } } else if (mDropDownHeight == ViewGroup.LayoutParams.WRAP_CONTENT) { heightSpec = height; @@ -1164,8 +1164,8 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe mPopup.update(getDropDownAnchorView(), mDropDownHorizontalOffset, mDropDownVerticalOffset, widthSpec, heightSpec); } else { - if (mDropDownWidth == ViewGroup.LayoutParams.FILL_PARENT) { - widthSpec = ViewGroup.LayoutParams.FILL_PARENT; + if (mDropDownWidth == ViewGroup.LayoutParams.MATCH_PARENT) { + widthSpec = ViewGroup.LayoutParams.MATCH_PARENT; } else { if (mDropDownWidth == ViewGroup.LayoutParams.WRAP_CONTENT) { mPopup.setWidth(getDropDownAnchorView().getWidth()); @@ -1174,8 +1174,8 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe } } - if (mDropDownHeight == ViewGroup.LayoutParams.FILL_PARENT) { - heightSpec = ViewGroup.LayoutParams.FILL_PARENT; + if (mDropDownHeight == ViewGroup.LayoutParams.MATCH_PARENT) { + heightSpec = ViewGroup.LayoutParams.MATCH_PARENT; } else { if (mDropDownHeight == ViewGroup.LayoutParams.WRAP_CONTENT) { mPopup.setHeight(height); @@ -1295,7 +1295,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe hintContainer.setOrientation(LinearLayout.VERTICAL); LinearLayout.LayoutParams hintParams = new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, 0, 1.0f + ViewGroup.LayoutParams.MATCH_PARENT, 0, 1.0f ); hintContainer.addView(dropDownView, hintParams); hintContainer.addView(hintView); @@ -1331,7 +1331,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe final int maxHeight = mPopup.getMaxAvailableHeight( getDropDownAnchorView(), mDropDownVerticalOffset, ignoreBottomDecorations); - if (mDropDownAlwaysVisible || mDropDownHeight == ViewGroup.LayoutParams.FILL_PARENT) { + if (mDropDownAlwaysVisible || mDropDownHeight == ViewGroup.LayoutParams.MATCH_PARENT) { // getMaxAvailableHeight() subtracts the padding, so we put it back, // to get the available height for the whole window int padding = 0; diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java index 3afd5d4..65a4673 100644 --- a/core/java/android/widget/FrameLayout.java +++ b/core/java/android/widget/FrameLayout.java @@ -164,12 +164,12 @@ public class FrameLayout extends ViewGroup { /** * Returns a set of layout parameters with a width of - * {@link android.view.ViewGroup.LayoutParams#FILL_PARENT}, - * and a height of {@link android.view.ViewGroup.LayoutParams#FILL_PARENT}. + * {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT}, + * and a height of {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT}. */ @Override protected LayoutParams generateDefaultLayoutParams() { - return new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT); + return new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); } /** @@ -467,9 +467,9 @@ public class FrameLayout extends ViewGroup { * Creates a new set of layout parameters with the specified width, height * and weight. * - * @param width the width, either {@link #FILL_PARENT}, + * @param width the width, either {@link #MATCH_PARENT}, * {@link #WRAP_CONTENT} or a fixed size in pixels - * @param height the height, either {@link #FILL_PARENT}, + * @param height the height, either {@link #MATCH_PARENT}, * {@link #WRAP_CONTENT} or a fixed size in pixels * @param gravity the gravity * diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java index 2e91e52..30a38df 100644 --- a/core/java/android/widget/GridView.java +++ b/core/java/android/widget/GridView.java @@ -935,7 +935,7 @@ public class GridView extends AbsListView { AbsListView.LayoutParams p = (AbsListView.LayoutParams)child.getLayoutParams(); if (p == null) { - p = new AbsListView.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, + p = new AbsListView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0); child.setLayoutParams(p); } @@ -1254,7 +1254,7 @@ public class GridView extends AbsListView { // some up... AbsListView.LayoutParams p = (AbsListView.LayoutParams)child.getLayoutParams(); if (p == null) { - p = new AbsListView.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, + p = new AbsListView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0); } p.viewType = mAdapter.getItemViewType(position); diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index f49079c..37372c5 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -378,7 +378,7 @@ public class LinearLayout extends ViewGroup { } boolean matchWidthLocally = false; - if (widthMode != MeasureSpec.EXACTLY && lp.width == LayoutParams.FILL_PARENT) { + if (widthMode != MeasureSpec.EXACTLY && lp.width == LayoutParams.MATCH_PARENT) { // The width of the linear layout will scale, and at least one // child said it wanted to match our width. Set a flag // indicating that we need to remeasure at least that view when @@ -391,7 +391,7 @@ public class LinearLayout extends ViewGroup { final int measuredWidth = child.getMeasuredWidth() + margin; maxWidth = Math.max(maxWidth, measuredWidth); - allFillParent = allFillParent && lp.width == LayoutParams.FILL_PARENT; + allFillParent = allFillParent && lp.width == LayoutParams.MATCH_PARENT; if (lp.weight > 0) { /* * Widths of weighted Views are bogus if we end up @@ -472,12 +472,12 @@ public class LinearLayout extends ViewGroup { maxWidth = Math.max(maxWidth, measuredWidth); boolean matchWidthLocally = widthMode != MeasureSpec.EXACTLY && - lp.width == LayoutParams.FILL_PARENT; + lp.width == LayoutParams.MATCH_PARENT; alternativeMaxWidth = Math.max(alternativeMaxWidth, matchWidthLocally ? margin : measuredWidth); - allFillParent = allFillParent && lp.width == LayoutParams.FILL_PARENT; + allFillParent = allFillParent && lp.width == LayoutParams.MATCH_PARENT; mTotalLength += child.getMeasuredHeight() + lp.topMargin + lp.bottomMargin + getNextLocationOffset(child); @@ -515,7 +515,7 @@ public class LinearLayout extends ViewGroup { if (child.getVisibility() != GONE) { LinearLayout.LayoutParams lp = ((LinearLayout.LayoutParams)child.getLayoutParams()); - if (lp.width == LayoutParams.FILL_PARENT) { + if (lp.width == LayoutParams.MATCH_PARENT) { // Temporarily force children to reuse their old measured height // FIXME: this may not be right for something like wrapping text? int oldHeight = lp.height; @@ -629,7 +629,7 @@ public class LinearLayout extends ViewGroup { } boolean matchHeightLocally = false; - if (heightMode != MeasureSpec.EXACTLY && lp.height == LayoutParams.FILL_PARENT) { + if (heightMode != MeasureSpec.EXACTLY && lp.height == LayoutParams.MATCH_PARENT) { // The height of the linear layout will scale, and at least one // child said it wanted to match our height. Set a flag indicating that // we need to remeasure at least that view when we know our height. @@ -657,7 +657,7 @@ public class LinearLayout extends ViewGroup { maxHeight = Math.max(maxHeight, childHeight); - allFillParent = allFillParent && lp.height == LayoutParams.FILL_PARENT; + allFillParent = allFillParent && lp.height == LayoutParams.MATCH_PARENT; if (lp.weight > 0) { /* * Heights of weighted Views are bogus if we end up @@ -758,7 +758,7 @@ public class LinearLayout extends ViewGroup { lp.rightMargin + getNextLocationOffset(child); boolean matchHeightLocally = heightMode != MeasureSpec.EXACTLY && - lp.height == LayoutParams.FILL_PARENT; + lp.height == LayoutParams.MATCH_PARENT; final int margin = lp.topMargin + lp .bottomMargin; int childHeight = child.getMeasuredHeight() + margin; @@ -766,7 +766,7 @@ public class LinearLayout extends ViewGroup { alternativeMaxHeight = Math.max(alternativeMaxHeight, matchHeightLocally ? margin : childHeight); - allFillParent = allFillParent && lp.height == LayoutParams.FILL_PARENT; + allFillParent = allFillParent && lp.height == LayoutParams.MATCH_PARENT; if (baselineAligned) { final int childBaseline = child.getBaseline(); @@ -832,7 +832,7 @@ public class LinearLayout extends ViewGroup { if (child.getVisibility() != GONE) { LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) child.getLayoutParams(); - if (lp.height == LayoutParams.FILL_PARENT) { + if (lp.height == LayoutParams.MATCH_PARENT) { // Temporarily force children to reuse their old measured width // FIXME: this may not be right for something like wrapping text? int oldWidth = lp.width; @@ -1065,7 +1065,7 @@ public class LinearLayout extends ViewGroup { final LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) child.getLayoutParams(); - if (baselineAligned && lp.height != LayoutParams.FILL_PARENT) { + if (baselineAligned && lp.height != LayoutParams.MATCH_PARENT) { childBaseline = child.getBaseline(); } @@ -1199,7 +1199,7 @@ public class LinearLayout extends ViewGroup { /** * Returns a set of layout parameters with a width of - * {@link android.view.ViewGroup.LayoutParams#FILL_PARENT} + * {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT} * and a height of {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT} * when the layout's orientation is {@link #VERTICAL}. When the orientation is * {@link #HORIZONTAL}, the width is set to {@link LayoutParams#WRAP_CONTENT} @@ -1210,7 +1210,7 @@ public class LinearLayout extends ViewGroup { if (mOrientation == HORIZONTAL) { return new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); } else if (mOrientation == VERTICAL) { - return new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT); + return new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT); } return null; } @@ -1290,9 +1290,9 @@ public class LinearLayout extends ViewGroup { * Creates a new set of layout parameters with the specified width, height * and weight. * - * @param width the width, either {@link #FILL_PARENT}, + * @param width the width, either {@link #MATCH_PARENT}, * {@link #WRAP_CONTENT} or a fixed size in pixels - * @param height the height, either {@link #FILL_PARENT}, + * @param height the height, either {@link #MATCH_PARENT}, * {@link #WRAP_CONTENT} or a fixed size in pixels * @param weight the weight */ diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index f4008f9..c63774a 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -1067,7 +1067,7 @@ public class ListView extends AbsListView { private void measureScrapChild(View child, int position, int widthMeasureSpec) { LayoutParams p = (LayoutParams) child.getLayoutParams(); if (p == null) { - p = new LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, + p = new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0); child.setLayoutParams(p); } @@ -1702,7 +1702,7 @@ public class ListView extends AbsListView { // noinspection unchecked AbsListView.LayoutParams p = (AbsListView.LayoutParams) child.getLayoutParams(); if (p == null) { - p = new AbsListView.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, + p = new AbsListView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0); } p.viewType = mAdapter.getItemViewType(position); @@ -2388,7 +2388,7 @@ public class ListView extends AbsListView { ViewGroup.LayoutParams p = child.getLayoutParams(); if (p == null) { p = new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); } diff --git a/core/java/android/widget/MediaController.java b/core/java/android/widget/MediaController.java index 446a992..c246c247 100644 --- a/core/java/android/widget/MediaController.java +++ b/core/java/android/widget/MediaController.java @@ -167,8 +167,8 @@ public class MediaController extends FrameLayout { mAnchor = view; FrameLayout.LayoutParams frameParams = new FrameLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT ); removeAllViews(); diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index e4cc609..d20ab3b 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -569,7 +569,7 @@ public class PopupWindow { * the current width or height is requested as an explicit size from * the window manager. You can supply * {@link ViewGroup.LayoutParams#WRAP_CONTENT} or - * {@link ViewGroup.LayoutParams#FILL_PARENT} to have that measure + * {@link ViewGroup.LayoutParams#MATCH_PARENT} to have that measure * spec supplied instead, replacing the absolute width and height that * has been set in the popup.</p> * @@ -578,11 +578,11 @@ public class PopupWindow { * * @param widthSpec an explicit width measure spec mode, either * {@link ViewGroup.LayoutParams#WRAP_CONTENT}, - * {@link ViewGroup.LayoutParams#FILL_PARENT}, or 0 to use the absolute + * {@link ViewGroup.LayoutParams#MATCH_PARENT}, or 0 to use the absolute * width. * @param heightSpec an explicit height measure spec mode, either * {@link ViewGroup.LayoutParams#WRAP_CONTENT}, - * {@link ViewGroup.LayoutParams#FILL_PARENT}, or 0 to use the absolute + * {@link ViewGroup.LayoutParams#MATCH_PARENT}, or 0 to use the absolute * height. */ public void setWindowLayoutMode(int widthSpec, int heightSpec) { @@ -785,7 +785,7 @@ public class PopupWindow { if (mBackground != null) { final ViewGroup.LayoutParams layoutParams = mContentView.getLayoutParams(); - int height = ViewGroup.LayoutParams.FILL_PARENT; + int height = ViewGroup.LayoutParams.MATCH_PARENT; if (layoutParams != null && layoutParams.height == ViewGroup.LayoutParams.WRAP_CONTENT) { height = ViewGroup.LayoutParams.WRAP_CONTENT; @@ -795,7 +795,7 @@ public class PopupWindow { // within another view that owns the background drawable PopupViewContainer popupViewContainer = new PopupViewContainer(mContext); PopupViewContainer.LayoutParams listParams = new PopupViewContainer.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, height + ViewGroup.LayoutParams.MATCH_PARENT, height ); popupViewContainer.setBackgroundDrawable(mBackground); popupViewContainer.addView(mContentView, listParams); diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 533c607..fad994b 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -560,7 +560,7 @@ public class RelativeLayout extends ViewGroup { mPaddingLeft, mPaddingRight, myWidth); int childHeightMeasureSpec; - if (params.width == LayoutParams.FILL_PARENT) { + if (params.width == LayoutParams.MATCH_PARENT) { childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(myHeight, MeasureSpec.EXACTLY); } else { childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(myHeight, MeasureSpec.AT_MOST); @@ -622,7 +622,7 @@ public class RelativeLayout extends ViewGroup { // We can grow in this dimension. childSpecSize = childSize; } - } else if (childSize == LayoutParams.FILL_PARENT) { + } else if (childSize == LayoutParams.MATCH_PARENT) { // Child wanted to be as big as possible. Give all availble // space childSpecMode = MeasureSpec.EXACTLY; diff --git a/core/java/android/widget/SlidingDrawer.java b/core/java/android/widget/SlidingDrawer.java index f706744..11d72de 100644 --- a/core/java/android/widget/SlidingDrawer.java +++ b/core/java/android/widget/SlidingDrawer.java @@ -43,7 +43,7 @@ import android.view.accessibility.AccessibilityEvent; * SlidingDrawer should be used as an overlay inside layouts. This means SlidingDrawer * should only be used inside of a FrameLayout or a RelativeLayout for instance. The * size of the SlidingDrawer defines how much space the content will occupy once slid - * out so SlidingDrawer should usually use fill_parent for both its dimensions. + * out so SlidingDrawer should usually use match_parent for both its dimensions. * * Inside an XML layout, SlidingDrawer must define the id of the handle and of the * content: @@ -51,8 +51,8 @@ import android.view.accessibility.AccessibilityEvent; * <pre class="prettyprint"> * <SlidingDrawer * android:id="@+id/drawer" - * android:layout_width="fill_parent" - * android:layout_height="fill_parent" + * android:layout_width="match_parent" + * android:layout_height="match_parent" * * android:handle="@+id/handle" * android:content="@+id/content"> @@ -64,8 +64,8 @@ import android.view.accessibility.AccessibilityEvent; * * <GridView * android:id="@id/content" - * android:layout_width="fill_parent" - * android:layout_height="fill_parent" /> + * android:layout_width="match_parent" + * android:layout_height="match_parent" /> * * </SlidingDrawer> * </pre> diff --git a/core/java/android/widget/TabHost.java b/core/java/android/widget/TabHost.java index 412f817..78e2fee 100644 --- a/core/java/android/widget/TabHost.java +++ b/core/java/android/widget/TabHost.java @@ -327,8 +327,8 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1"); .addView( mCurrentView, new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); } if (!mTabWidget.hasFocus()) { diff --git a/core/java/android/widget/TabWidget.java b/core/java/android/widget/TabWidget.java index c12d098..aa47e6d 100644 --- a/core/java/android/widget/TabWidget.java +++ b/core/java/android/widget/TabWidget.java @@ -16,8 +16,6 @@ package android.widget; -import com.android.internal.R; - import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; @@ -26,7 +24,6 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.os.Build; import android.util.AttributeSet; -import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.view.View.OnFocusChangeListener; @@ -313,7 +310,7 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { if (child.getLayoutParams() == null) { final LinearLayout.LayoutParams lp = new LayoutParams( 0, - ViewGroup.LayoutParams.FILL_PARENT, 1.0f); + ViewGroup.LayoutParams.MATCH_PARENT, 1.0f); lp.setMargins(0, 0, 0, 0); child.setLayoutParams(lp); } @@ -328,7 +325,7 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { ImageView divider = new ImageView(mContext); final LinearLayout.LayoutParams lp = new LayoutParams( mDividerDrawable.getIntrinsicWidth(), - LayoutParams.FILL_PARENT); + LayoutParams.MATCH_PARENT); lp.setMargins(0, 0, 0, 0); divider.setLayoutParams(lp); divider.setBackgroundDrawable(mDividerDrawable); diff --git a/core/java/android/widget/TableLayout.java b/core/java/android/widget/TableLayout.java index afa2f3b..66500a3 100644 --- a/core/java/android/widget/TableLayout.java +++ b/core/java/android/widget/TableLayout.java @@ -52,7 +52,7 @@ import java.util.regex.Pattern; * {@link #setColumnCollapsed(int,boolean) setColumnCollapsed()}.</p> * * <p>The children of a TableLayout cannot specify the <code>layout_width</code> - * attribute. Width is always <code>FILL_PARENT</code>. However, the + * attribute. Width is always <code>MATCH_PARENT</code>. However, the * <code>layout_height</code> attribute can be defined by a child; default value * is {@link android.widget.TableLayout.LayoutParams#WRAP_CONTENT}. If the child * is a {@link android.widget.TableRow}, then the height is always @@ -621,7 +621,7 @@ public class TableLayout extends LinearLayout { /** * Returns a set of layout parameters with a width of - * {@link android.view.ViewGroup.LayoutParams#FILL_PARENT}, + * {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT}, * and a height of {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT}. */ @Override @@ -647,7 +647,7 @@ public class TableLayout extends LinearLayout { /** * <p>This set of layout parameters enforces the width of each child to be - * {@link #FILL_PARENT} and the height of each child to be + * {@link #MATCH_PARENT} and the height of each child to be * {@link #WRAP_CONTENT}, but only if the height is not specified.</p> */ @SuppressWarnings({"UnusedDeclaration"}) @@ -663,14 +663,14 @@ public class TableLayout extends LinearLayout { * {@inheritDoc} */ public LayoutParams(int w, int h) { - super(FILL_PARENT, h); + super(MATCH_PARENT, h); } /** * {@inheritDoc} */ public LayoutParams(int w, int h, float initWeight) { - super(FILL_PARENT, h, initWeight); + super(MATCH_PARENT, h, initWeight); } /** @@ -679,7 +679,7 @@ public class TableLayout extends LinearLayout { * {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT}.</p> */ public LayoutParams() { - super(FILL_PARENT, WRAP_CONTENT); + super(MATCH_PARENT, WRAP_CONTENT); } /** @@ -698,7 +698,7 @@ public class TableLayout extends LinearLayout { /** * <p>Fixes the row's width to - * {@link android.view.ViewGroup.LayoutParams#FILL_PARENT}; the row's + * {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT}; the row's * height is fixed to * {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT} if no layout * height is specified.</p> @@ -710,7 +710,7 @@ public class TableLayout extends LinearLayout { @Override protected void setBaseAttributes(TypedArray a, int widthAttr, int heightAttr) { - this.width = FILL_PARENT; + this.width = MATCH_PARENT; if (a.hasValue(heightAttr)) { this.height = a.getLayoutDimension(heightAttr, "layout_height"); } else { diff --git a/core/java/android/widget/TableRow.java b/core/java/android/widget/TableRow.java index 5628cab..abf08bf 100644 --- a/core/java/android/widget/TableRow.java +++ b/core/java/android/widget/TableRow.java @@ -35,7 +35,7 @@ import android.view.ViewDebug; * <p>The children of a TableRow do not need to specify the * <code>layout_width</code> and <code>layout_height</code> attributes in the * XML file. TableRow always enforces those values to be respectively - * {@link android.widget.TableLayout.LayoutParams#FILL_PARENT} and + * {@link android.widget.TableLayout.LayoutParams#MATCH_PARENT} and * {@link android.widget.TableLayout.LayoutParams#WRAP_CONTENT}.</p> * * <p> @@ -299,7 +299,7 @@ public class TableRow extends LinearLayout { case LayoutParams.WRAP_CONTENT: spec = getChildMeasureSpec(widthMeasureSpec, 0, LayoutParams.WRAP_CONTENT); break; - case LayoutParams.FILL_PARENT: + case LayoutParams.MATCH_PARENT: spec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); break; default: @@ -351,7 +351,7 @@ public class TableRow extends LinearLayout { /** * Returns a set of layout parameters with a width of - * {@link android.view.ViewGroup.LayoutParams#FILL_PARENT}, + * {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT}, * a height of {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT} and no spanning. */ @Override @@ -451,7 +451,7 @@ public class TableRow extends LinearLayout { * {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT}.</p> */ public LayoutParams() { - super(FILL_PARENT, WRAP_CONTENT); + super(MATCH_PARENT, WRAP_CONTENT); column = -1; span = 1; } @@ -459,7 +459,7 @@ public class TableRow extends LinearLayout { /** * <p>Puts the view in the specified column.</p> * - * <p>Sets the child width to {@link android.view.ViewGroup.LayoutParams#FILL_PARENT} + * <p>Sets the child width to {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT} * and the child height to * {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT}.</p> * @@ -490,7 +490,7 @@ public class TableRow extends LinearLayout { if (a.hasValue(widthAttr)) { width = a.getLayoutDimension(widthAttr, "layout_width"); } else { - width = FILL_PARENT; + width = MATCH_PARENT; } // We don't want to force users to specify a layout_height diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 455b593..12e8e29 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -4992,7 +4992,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener final int height = mLayoutParams.height; // If the size of the view does not depend on the size of the text, try to // start the marquee immediately - if (height != LayoutParams.WRAP_CONTENT && height != LayoutParams.FILL_PARENT) { + if (height != LayoutParams.WRAP_CONTENT && height != LayoutParams.MATCH_PARENT) { startMarquee(); } else { // Defer the start of the marquee until we know our width (see setFrame()) @@ -5307,7 +5307,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener if (desiredHeight != this.getHeight()) { sizeChanged = true; } - } else if (mLayoutParams.height == LayoutParams.FILL_PARENT) { + } else if (mLayoutParams.height == LayoutParams.MATCH_PARENT) { if (mDesiredHeightAtMeasure >= 0) { int desiredHeight = getDesiredHeight(); @@ -5354,7 +5354,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener if (mEllipsize != TextUtils.TruncateAt.MARQUEE) { // In a fixed-height view, so use our new text layout. if (mLayoutParams.height != LayoutParams.WRAP_CONTENT && - mLayoutParams.height != LayoutParams.FILL_PARENT) { + mLayoutParams.height != LayoutParams.MATCH_PARENT) { invalidate(); return; } diff --git a/core/java/android/widget/ViewSwitcher.java b/core/java/android/widget/ViewSwitcher.java index 0dcaf95..71ae624 100644 --- a/core/java/android/widget/ViewSwitcher.java +++ b/core/java/android/widget/ViewSwitcher.java @@ -80,7 +80,7 @@ public class ViewSwitcher extends ViewAnimator { View child = mFactory.makeView(); LayoutParams lp = (LayoutParams) child.getLayoutParams(); if (lp == null) { - lp = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT); + lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT); } addView(child, lp); return child; diff --git a/core/java/android/widget/ZoomButtonsController.java b/core/java/android/widget/ZoomButtonsController.java index e55fbb8..bea009c 100644 --- a/core/java/android/widget/ZoomButtonsController.java +++ b/core/java/android/widget/ZoomButtonsController.java @@ -247,7 +247,7 @@ public class ZoomButtonsController implements View.OnTouchListener { LayoutParams.FLAG_LAYOUT_NO_LIMITS | LayoutParams.FLAG_ALT_FOCUSABLE_IM; lp.height = LayoutParams.WRAP_CONTENT; - lp.width = LayoutParams.FILL_PARENT; + lp.width = LayoutParams.MATCH_PARENT; lp.type = LayoutParams.TYPE_APPLICATION_PANEL; lp.format = PixelFormat.TRANSLUCENT; lp.windowAnimations = com.android.internal.R.style.Animation_ZoomButtons; diff --git a/core/java/com/android/internal/app/AlertController.java b/core/java/com/android/internal/app/AlertController.java index 57dbb44..f56b15c 100644 --- a/core/java/com/android/internal/app/AlertController.java +++ b/core/java/com/android/internal/app/AlertController.java @@ -16,7 +16,7 @@ package com.android.internal.app; -import static android.view.ViewGroup.LayoutParams.FILL_PARENT; +import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; @@ -361,7 +361,7 @@ public class AlertController { if (mView != null) { customPanel = (FrameLayout) mWindow.findViewById(R.id.customPanel); FrameLayout custom = (FrameLayout) mWindow.findViewById(R.id.custom); - custom.addView(mView, new LayoutParams(FILL_PARENT, FILL_PARENT)); + custom.addView(mView, new LayoutParams(MATCH_PARENT, MATCH_PARENT)); if (mViewSpacingSpecified) { custom.setPadding(mViewSpacingLeft, mViewSpacingTop, mViewSpacingRight, mViewSpacingBottom); @@ -391,7 +391,7 @@ public class AlertController { if (mCustomTitleView != null) { // Add the custom title view directly to the topPanel layout LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.FILL_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT); + LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT); topPanel.addView(mCustomTitleView, lp); @@ -460,8 +460,8 @@ public class AlertController { if (mListView != null) { contentPanel.removeView(mWindow.findViewById(R.id.scrollView)); contentPanel.addView(mListView, - new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT)); - contentPanel.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, 0, 1.0f)); + new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT)); + contentPanel.setLayoutParams(new LinearLayout.LayoutParams(MATCH_PARENT, 0, 1.0f)); } else { contentPanel.setVisibility(View.GONE); } @@ -657,8 +657,8 @@ public class AlertController { ViewGroup parent = (ViewGroup) mWindow.findViewById(R.id.parentPanel); parent.removeView(buttonPanel); AbsListView.LayoutParams params = new AbsListView.LayoutParams( - AbsListView.LayoutParams.FILL_PARENT, - AbsListView.LayoutParams.FILL_PARENT); + AbsListView.LayoutParams.MATCH_PARENT, + AbsListView.LayoutParams.MATCH_PARENT); buttonPanel.setLayoutParams(params); mListView.addFooterView(buttonPanel); */ diff --git a/core/java/com/android/internal/view/menu/IconMenuItemView.java b/core/java/com/android/internal/view/menu/IconMenuItemView.java index 66e15c1..3c5b422 100644 --- a/core/java/com/android/internal/view/menu/IconMenuItemView.java +++ b/core/java/com/android/internal/view/menu/IconMenuItemView.java @@ -254,7 +254,7 @@ public final class IconMenuItemView extends TextView implements MenuView.ItemVie if (lp == null) { // Default layout parameters lp = new IconMenuView.LayoutParams( - IconMenuView.LayoutParams.FILL_PARENT, IconMenuView.LayoutParams.FILL_PARENT); + IconMenuView.LayoutParams.MATCH_PARENT, IconMenuView.LayoutParams.MATCH_PARENT); } // Set the desired width of item diff --git a/core/java/com/android/internal/widget/SlidingTab.java b/core/java/com/android/internal/widget/SlidingTab.java index f07b2f1..adafbb4 100644 --- a/core/java/com/android/internal/widget/SlidingTab.java +++ b/core/java/com/android/internal/widget/SlidingTab.java @@ -23,8 +23,6 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.os.Handler; -import android.os.Message; import android.os.Vibrator; import android.util.AttributeSet; import android.util.Log; @@ -34,7 +32,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.animation.AlphaAnimation; import android.view.animation.Animation; -import android.view.animation.AnimationSet; import android.view.animation.LinearInterpolator; import android.view.animation.TranslateAnimation; import android.view.animation.Animation.AnimationListener; @@ -214,7 +211,7 @@ public class SlidingTab extends ViewGroup { // Create hint TextView text = new TextView(parent.getContext()); text.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, - LayoutParams.FILL_PARENT)); + LayoutParams.MATCH_PARENT)); text.setBackgroundResource(barId); text.setTextAppearance(parent.getContext(), R.style.TextAppearance_SlidingTabNormal); // hint.setSingleLine(); // Hmm.. this causes the text to disappear off-screen diff --git a/core/res/res/layout-ja/contact_header_name.xml b/core/res/res/layout-ja/contact_header_name.xml index 7c0f63e..39d5593 100644 --- a/core/res/res/layout-ja/contact_header_name.xml +++ b/core/res/res/layout-ja/contact_header_name.xml @@ -20,11 +20,11 @@ android:orientation="vertical" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="fill_parent"> + android:layout_height="match_parent"> <TextView android:id="@+id/name" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:singleLine="true" android:ellipsize="end" android:textAppearance="?android:attr/textAppearanceMedium" diff --git a/core/res/res/layout-land/icon_menu_layout.xml b/core/res/res/layout-land/icon_menu_layout.xml index d1b25d9..58f7bfb 100644 --- a/core/res/res/layout-land/icon_menu_layout.xml +++ b/core/res/res/layout-land/icon_menu_layout.xml @@ -16,7 +16,7 @@ <com.android.internal.view.menu.IconMenuView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+android:id/icon_menu" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:rowHeight="65dip" android:maxItems="6" diff --git a/core/res/res/layout-port/icon_menu_layout.xml b/core/res/res/layout-port/icon_menu_layout.xml index 08edfcc..c84f7d2 100644 --- a/core/res/res/layout-port/icon_menu_layout.xml +++ b/core/res/res/layout-port/icon_menu_layout.xml @@ -16,7 +16,7 @@ <com.android.internal.view.menu.IconMenuView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+android:id/icon_menu" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:rowHeight="65dip" android:maxItems="6" diff --git a/core/res/res/layout/activity_list.xml b/core/res/res/layout/activity_list.xml index 2967f0f..f489ab7 100644 --- a/core/res/res/layout/activity_list.xml +++ b/core/res/res/layout/activity_list.xml @@ -15,20 +15,20 @@ --> <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:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" /> <TextView android:id="@android: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:text="@string/activity_list_empty" android:visibility="gone" diff --git a/core/res/res/layout/activity_list_item.xml b/core/res/res/layout/activity_list_item.xml index 7a2a0e2..25d95fd 100644 --- a/core/res/res/layout/activity_list_item.xml +++ b/core/res/res/layout/activity_list_item.xml @@ -18,7 +18,7 @@ */ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="1dip" android:paddingBottom="1dip" diff --git a/core/res/res/layout/activity_list_item_2.xml b/core/res/res/layout/activity_list_item_2.xml index 78eca02..e937d7b 100644 --- a/core/res/res/layout/activity_list_item_2.xml +++ b/core/res/res/layout/activity_list_item_2.xml @@ -15,7 +15,7 @@ --> <TextView 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:minHeight="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" diff --git a/core/res/res/layout/alert_dialog.xml b/core/res/res/layout/alert_dialog.xml index 40e3f42..409dcd3 100644 --- a/core/res/res/layout/alert_dialog.xml +++ b/core/res/res/layout/alert_dialog.xml @@ -20,7 +20,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/parentPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:paddingTop="9dip" @@ -30,12 +30,12 @@ > <LinearLayout android:id="@+id/topPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="54dip" android:orientation="vertical"> <LinearLayout android:id="@+id/title_template" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" @@ -54,11 +54,11 @@ style="?android:attr/textAppearanceLarge" android:singleLine="true" android:ellipsize="end" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> <ImageView android:id="@+id/titleDivider" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:visibility="gone" android:scaleType="fitXY" @@ -68,12 +68,12 @@ </LinearLayout> <LinearLayout android:id="@+id/contentPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical"> <ScrollView android:id="@+id/scrollView" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="2dip" android:paddingBottom="12dip" @@ -81,30 +81,30 @@ android:paddingRight="10dip"> <TextView android:id="@+id/message" style="?android:attr/textAppearanceMedium" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="5dip" /> </ScrollView> </LinearLayout> <FrameLayout android:id="@+id/customPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1"> <FrameLayout android:id="@+android:id/custom" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="5dip" android:paddingBottom="5dip" /> </FrameLayout> <LinearLayout android:id="@+id/buttonPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="54dip" android:orientation="vertical" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingTop="4dip" diff --git a/core/res/res/layout/alert_dialog_progress.xml b/core/res/res/layout/alert_dialog_progress.xml index d2bb691..c519692 100644 --- a/core/res/res/layout/alert_dialog_progress.xml +++ b/core/res/res/layout/alert_dialog_progress.xml @@ -15,10 +15,10 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" android:layout_height="fill_parent"> + android:layout_width="wrap_content" android:layout_height="match_parent"> <ProgressBar android:id="@+id/progress" style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dip" android:layout_marginBottom="1dip" diff --git a/core/res/res/layout/always_use_checkbox.xml b/core/res/res/layout/always_use_checkbox.xml index 1f8d256..baa4bee 100644 --- a/core/res/res/layout/always_use_checkbox.xml +++ b/core/res/res/layout/always_use_checkbox.xml @@ -18,7 +18,7 @@ to make their selection the preferred activity. --> <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:paddingLeft="14dip" android:paddingRight="15dip" diff --git a/core/res/res/layout/app_permission_item.xml b/core/res/res/layout/app_permission_item.xml index 8db4dd7..1bd267f 100644 --- a/core/res/res/layout/app_permission_item.xml +++ b/core/res/res/layout/app_permission_item.xml @@ -21,7 +21,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <ImageView diff --git a/core/res/res/layout/app_perms_summary.xml b/core/res/res/layout/app_perms_summary.xml index 009eb8f..7160743 100755 --- a/core/res/res/layout/app_perms_summary.xml +++ b/core/res/res/layout/app_perms_summary.xml @@ -18,8 +18,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical"> <TextView @@ -36,7 +36,7 @@ <LinearLayout android:id="@+id/dangerous_perms_list" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:paddingLeft="16dip" android:paddingRight="12dip" android:layout_height="wrap_content" /> @@ -45,20 +45,20 @@ <LinearLayout android:id="@+id/show_more" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone" android:layout_marginTop="12dip" android:layout_marginBottom="16dip"> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:background="?android:attr/listDivider" /> <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dip" android:layout_marginBottom="12dip" @@ -77,13 +77,13 @@ android:layout_alignTop="@id/show_more_icon" android:layout_gravity="center_vertical" android:paddingLeft="6dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:background="?android:attr/listDivider" /> @@ -95,7 +95,7 @@ android:orientation="vertical" android:paddingLeft="16dip" android:paddingRight="12dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> diff --git a/core/res/res/layout/auto_complete_list.xml b/core/res/res/layout/auto_complete_list.xml index addda11..8ad5dbb 100644 --- a/core/res/res/layout/auto_complete_list.xml +++ b/core/res/res/layout/auto_complete_list.xml @@ -17,7 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:drawable/edit_text" android:divider="@android:drawable/divider_horizontal_textfield" @@ -25,14 +25,14 @@ <LinearLayout android:id="@+id/container" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingRight="0dip" /> <AutoCompleteTextView android:id="@+id/edit" android:completionThreshold="1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" android:layout_gravity="center_vertical" diff --git a/core/res/res/layout/battery_low.xml b/core/res/res/layout/battery_low.xml index 116eae7..3b62fb0 100644 --- a/core/res/res/layout/battery_low.xml +++ b/core/res/res/layout/battery_low.xml @@ -25,7 +25,7 @@ > <TextView android:id="@+id/subtitle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18dp" android:paddingLeft="19dp" @@ -35,7 +35,7 @@ /> <TextView android:id="@+id/level_percent" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18dp" android:textColor="#ffffffff" diff --git a/core/res/res/layout/battery_status.xml b/core/res/res/layout/battery_status.xml index 8b9828c..7cfec05 100644 --- a/core/res/res/layout/battery_status.xml +++ b/core/res/res/layout/battery_status.xml @@ -32,13 +32,13 @@ <LinearLayout android:id="@+id/meter" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" > <ImageView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="15dip" /> <ImageView @@ -55,8 +55,8 @@ </LinearLayout> <TextView android:id="@+id/level_percent" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:textStyle="bold" android:textSize="48dp" android:textColor="#ffffffff" diff --git a/core/res/res/layout/character_picker.xml b/core/res/res/layout/character_picker.xml index 70867d0..2508f72 100644 --- a/core/res/res/layout/character_picker.xml +++ b/core/res/res/layout/character_picker.xml @@ -17,7 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:layout_width="304dp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:background="@drawable/keyboard_popup_panel_trans_background"> <GridView diff --git a/core/res/res/layout/contact_header.xml b/core/res/res/layout/contact_header.xml index d551a26..128adc5 100644 --- a/core/res/res/layout/contact_header.xml +++ b/core/res/res/layout/contact_header.xml @@ -16,8 +16,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/banner" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="horizontal" android:background="@drawable/title_bar_medium" android:paddingRight="5dip"> @@ -37,7 +37,7 @@ android:layout_gravity="center_vertical" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> @@ -56,7 +56,7 @@ </LinearLayout> <TextView android:id="@+id/status" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceSmall" android:singleLine="true" @@ -65,7 +65,7 @@ /> <TextView android:id="@+id/status_date" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:textAppearance="?android:attr/textAppearanceSmall" diff --git a/core/res/res/layout/contact_header_name.xml b/core/res/res/layout/contact_header_name.xml index 4a53252..24db2f2 100644 --- a/core/res/res/layout/contact_header_name.xml +++ b/core/res/res/layout/contact_header_name.xml @@ -17,7 +17,7 @@ <!-- In the default locale, the "Name" field is a single TextView --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/name" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold" diff --git a/core/res/res/layout/dialog_custom_title.xml b/core/res/res/layout/dialog_custom_title.xml index 68578f5..e52fba6 100644 --- a/core/res/res/layout/dialog_custom_title.xml +++ b/core/res/res/layout/dialog_custom_title.xml @@ -22,19 +22,19 @@ This is an custom layout for a dialog. android:orientation="vertical" android:fitsSystemWindows="true"> <FrameLayout android:id="@android:id/title_container" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="24dip" android:layout_weight="0" style="?android:attr/windowTitleBackgroundStyle"> </FrameLayout> <FrameLayout - android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:foreground="?android:attr/windowContentOverlay"> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:paddingTop="6dip" android:paddingBottom="10dip" android:paddingLeft="10dip" diff --git a/core/res/res/layout/dialog_title.xml b/core/res/res/layout/dialog_title.xml index 8cfc716..949f86e 100644 --- a/core/res/res/layout/dialog_title.xml +++ b/core/res/res/layout/dialog_title.xml @@ -25,7 +25,7 @@ enabled. android:orientation="vertical" android:fitsSystemWindows="true"> <TextView android:id="@android:id/title" style="?android:attr/windowTitleStyle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="53dip" android:paddingTop="9dip" @@ -33,13 +33,13 @@ enabled. android:paddingLeft="10dip" android:paddingRight="10dip" /> <FrameLayout - android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:foreground="?android:attr/windowContentOverlay"> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> + android:layout_width="match_parent" + android:layout_height="match_parent" /> </FrameLayout> </LinearLayout> diff --git a/core/res/res/layout/dialog_title_icons.xml b/core/res/res/layout/dialog_title_icons.xml index 7c3f274..0ca6706 100644 --- a/core/res/res/layout/dialog_title_icons.xml +++ b/core/res/res/layout/dialog_title_icons.xml @@ -24,7 +24,7 @@ enabled. android:fitsSystemWindows="true"> <LinearLayout android:id="@+id/title_container" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" @@ -57,13 +57,13 @@ enabled. </LinearLayout> <FrameLayout - android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:foreground="?android:attr/windowContentOverlay"> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> + android:layout_width="match_parent" + android:layout_height="match_parent" /> </FrameLayout> </LinearLayout> diff --git a/core/res/res/layout/expandable_list_content.xml b/core/res/res/layout/expandable_list_content.xml index 05d74a6..4ed905c 100644 --- a/core/res/res/layout/expandable_list_content.xml +++ b/core/res/res/layout/expandable_list_content.xml @@ -19,6 +19,6 @@ --> <ExpandableListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:drawSelectorOnTop="false" /> diff --git a/core/res/res/layout/global_actions_item.xml b/core/res/res/layout/global_actions_item.xml index 63bb0f4..68fe960 100644 --- a/core/res/res/layout/global_actions_item.xml +++ b/core/res/res/layout/global_actions_item.xml @@ -15,7 +15,7 @@ --> <RelativeLayout 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:paddingLeft="11dip" @@ -25,7 +25,7 @@ <ImageView android:id="@+id/icon" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_alignParentTop="true" android:layout_alignParentBottom="true" android:layout_marginRight="9dip" @@ -33,7 +33,7 @@ <TextView android:id="@+id/status" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="26dip" android:layout_toRightOf="@id/icon" @@ -45,7 +45,7 @@ <TextView android:id="@+id/message" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_toRightOf="@id/icon" diff --git a/core/res/res/layout/google_web_content_helper_layout.xml b/core/res/res/layout/google_web_content_helper_layout.xml index 546c458..f16ffc9 100644 --- a/core/res/res/layout/google_web_content_helper_layout.xml +++ b/core/res/res/layout/google_web_content_helper_layout.xml @@ -43,8 +43,8 @@ <WebView android:id="@+id/web" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:visibility="invisible" /> diff --git a/core/res/res/layout/grant_credentials_permission.xml b/core/res/res/layout/grant_credentials_permission.xml index 84b6623..4133ea9 100644 --- a/core/res/res/layout/grant_credentials_permission.xml +++ b/core/res/res/layout/grant_credentials_permission.xml @@ -20,13 +20,13 @@ <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"> <!-- The header --> <TextView android:id="@+id/header_text" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/white" @@ -43,7 +43,7 @@ <!-- The list of packages that correspond to the requesting UID and the account/authtokenType that is being requested --> <ScrollView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:fillViewport="true" android:layout_weight="1" @@ -51,8 +51,8 @@ android:foreground="@drawable/title_bar_shadow"> <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:paddingTop="14dip" android:orientation="vertical"> @@ -70,13 +70,13 @@ android:orientation="vertical" android:paddingLeft="16dip" android:paddingRight="12dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <RelativeLayout android:paddingLeft="16dip" android:paddingRight="12dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <ImageView @@ -137,7 +137,7 @@ <!-- The buttons to allow or deny --> <LinearLayout android:id="@+id/buttons" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="52dip" android:background="@drawable/bottom_bar" android:paddingTop="4dip" diff --git a/core/res/res/layout/icon_menu_item_layout.xml b/core/res/res/layout/icon_menu_item_layout.xml index c6d9496..a73dccc 100644 --- a/core/res/res/layout/icon_menu_item_layout.xml +++ b/core/res/res/layout/icon_menu_item_layout.xml @@ -16,8 +16,8 @@ <com.android.internal.view.menu.IconMenuItemView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/title" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:paddingBottom="1dip" android:paddingLeft="3dip" android:paddingRight="3dip" diff --git a/core/res/res/layout/input_method.xml b/core/res/res/layout/input_method.xml index 1a701e9..f80d628 100644 --- a/core/res/res/layout/input_method.xml +++ b/core/res/res/layout/input_method.xml @@ -20,27 +20,27 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/parentPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <LinearLayout android:id="@+id/fullscreenArea" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <FrameLayout android:id="@android:id/extractArea" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="1" android:visibility="gone"> </FrameLayout> <FrameLayout android:id="@android:id/candidatesArea" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="invisible"> </FrameLayout> @@ -48,7 +48,7 @@ </LinearLayout> <FrameLayout android:id="@android:id/inputArea" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone"> </FrameLayout> diff --git a/core/res/res/layout/input_method_extract_view.xml b/core/res/res/layout/input_method_extract_view.xml index 1244c1d..689ba7b 100644 --- a/core/res/res/layout/input_method_extract_view.xml +++ b/core/res/res/layout/input_method_extract_view.xml @@ -25,7 +25,7 @@ <android.inputmethodservice.ExtractEditText android:id="@+id/inputExtractEditText" android:layout_width="0px" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:scrollbars="vertical" android:gravity="top" @@ -38,7 +38,7 @@ <FrameLayout android:id="@+id/inputExtractAccessories" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:paddingLeft="10dip" android:paddingRight="10dip" android:background="@android:drawable/keyboard_accessory_bg_landscape" diff --git a/core/res/res/layout/js_prompt.xml b/core/res/res/layout/js_prompt.xml index 86974ba..d80fbc8 100644 --- a/core/res/res/layout/js_prompt.xml +++ b/core/res/res/layout/js_prompt.xml @@ -16,18 +16,18 @@ <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" android:gravity="center_horizontal" > <TextView android:id="@+id/message" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <EditText android:id="@+id/value" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textStyle="bold" android:inputType="text" diff --git a/core/res/res/layout/keyboard_popup_keyboard.xml b/core/res/res/layout/keyboard_popup_keyboard.xml index 1092cc0..5eb2732 100644 --- a/core/res/res/layout/keyboard_popup_keyboard.xml +++ b/core/res/res/layout/keyboard_popup_keyboard.xml @@ -19,7 +19,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:background="@android:drawable/keyboard_popup_panel_background" @@ -29,7 +29,7 @@ android:id="@android:id/keyboardView" android:background="@android:color/transparent" android:layout_alignParentBottom="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:keyPreviewLayout="@layout/keyboard_key_preview" android:popupLayout="@layout/keyboard_popup_keyboard" diff --git a/core/res/res/layout/keyguard_screen_glogin_unlock.xml b/core/res/res/layout/keyguard_screen_glogin_unlock.xml index 6e00d11..8a46546 100644 --- a/core/res/res/layout/keyguard_screen_glogin_unlock.xml +++ b/core/res/res/layout/keyguard_screen_glogin_unlock.xml @@ -17,24 +17,24 @@ */ --> <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" android:background="@android:color/background_dark" > <ScrollView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="1" android:layout_above="@+id/emergencyCall"> <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" > <TextView android:id="@+id/topHeader" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64dip" android:layout_alignParentTop="true" android:layout_marginLeft="4dip" @@ -47,14 +47,14 @@ <!-- spacer below header --> <View android:id="@+id/spacerTop" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_below="@id/topHeader" android:background="@drawable/divider_horizontal_dark"/> <TextView android:id="@+id/instructions" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/spacerTop" android:layout_marginTop="8dip" @@ -65,7 +65,7 @@ <EditText android:id="@+id/login" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/instructions" android:layout_marginTop="8dip" @@ -77,7 +77,7 @@ <EditText android:id="@+id/password" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/login" android:layout_marginTop="15dip" @@ -106,7 +106,7 @@ <!-- spacer above emergency call --> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginBottom="4dip" diff --git a/core/res/res/layout/keyguard_screen_lock.xml b/core/res/res/layout/keyguard_screen_lock.xml index b5fbace..6e4fa7d 100644 --- a/core/res/res/layout/keyguard_screen_lock.xml +++ b/core/res/res/layout/keyguard_screen_lock.xml @@ -24,13 +24,13 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:gravity="bottom" - 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" android:layout_gravity="center" android:layout_marginBottom="15dip" @@ -43,25 +43,25 @@ <!-- when sim is present --> <TextView android:id="@+id/headerSimOk1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:textSize="34sp"/> <TextView android:id="@+id/headerSimOk2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:textSize="34sp"/> <!-- when sim is missing / locked --> <TextView android:id="@+id/headerSimBad1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:text="@android:string/lockscreen_missing_sim_message" android:textAppearance="?android:attr/textAppearanceLarge"/> <TextView android:id="@+id/headerSimBad2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="7dip" android:layout_marginBottom="7dip" @@ -71,27 +71,27 @@ <!-- spacer after carrier info / sim messages --> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="8dip" android:background="@android:drawable/divider_horizontal_dark"/> <!-- time and date --> <TextView android:id="@+id/time" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:textSize="34sp"/> <TextView android:id="@+id/date" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:textSize="18sp"/> <!-- spacer after time and date --> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginBottom="8dip" android:background="@android:drawable/divider_horizontal_dark" @@ -100,7 +100,7 @@ <!-- battery info --> <LinearLayout android:id="@+id/batteryInfo" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" > @@ -124,7 +124,7 @@ <!-- spacer after battery info --> <View android:id="@+id/batteryInfoSpacer" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="8dip" android:layout_marginBottom="8dip" @@ -135,7 +135,7 @@ <LinearLayout android:id="@+id/nextAlarmInfo" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" > @@ -159,7 +159,7 @@ <!-- spacer after alarm info --> <View android:id="@+id/nextAlarmSpacer" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="8dip" android:layout_marginBottom="8dip" @@ -169,7 +169,7 @@ (shown when SIM card is present) --> <LinearLayout android:id="@+id/screenLockedInfo" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" > @@ -195,7 +195,7 @@ <!-- message about how to unlock (shown when SIM card is present) --> <TextView android:id="@+id/lockInstructions" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="5dip" android:gravity="center" diff --git a/core/res/res/layout/keyguard_screen_rotary_unlock.xml b/core/res/res/layout/keyguard_screen_rotary_unlock.xml index 59b69cd..8a7553c 100644 --- a/core/res/res/layout/keyguard_screen_rotary_unlock.xml +++ b/core/res/res/layout/keyguard_screen_rotary_unlock.xml @@ -22,14 +22,14 @@ depending on the state of the device. It is the same for landscape and portrait.--> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:id="@+id/root" > <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="#70000000" > @@ -67,7 +67,7 @@ <View android:id="@+id/divider" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="10dip" android:layout_below="@id/date" @@ -114,7 +114,7 @@ robust for different screen sizes. On hvga, the widget should be flush with the bottom.--> <com.android.internal.widget.RotarySelector android:id="@+id/rotary" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerHorizontal="true" android:layout_alignParentTop="true" diff --git a/core/res/res/layout/keyguard_screen_rotary_unlock_land.xml b/core/res/res/layout/keyguard_screen_rotary_unlock_land.xml index c503455..898aea6 100644 --- a/core/res/res/layout/keyguard_screen_rotary_unlock_land.xml +++ b/core/res/res/layout/keyguard_screen_rotary_unlock_land.xml @@ -22,14 +22,14 @@ depending on the state of the device.--> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:rotaryunlock="http://schemas.android.com/apk/res/com.android.rotaryunlock" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:id="@+id/root" > <LinearLayout 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="#70000000" > @@ -37,7 +37,7 @@ <RelativeLayout android:orientation="vertical" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1.0" android:gravity="center_horizontal" > @@ -76,7 +76,7 @@ <View android:id="@+id/divider" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="10dip" android:layout_below="@id/date" @@ -136,7 +136,7 @@ <com.android.internal.widget.RotarySelector android:id="@+id/rotary" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:orientation="vertical" /> diff --git a/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml b/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml index 4c583d8..2fa7aaa 100644 --- a/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml +++ b/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml @@ -18,8 +18,8 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="@android:color/background_dark" > @@ -27,7 +27,7 @@ <LinearLayout android:id="@+id/pinDisplayGroup" android:orientation="horizontal" android:layout_centerInParent="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:addStatesFromChildren="true" android:gravity="center_vertical" @@ -41,7 +41,7 @@ <EditText android:id="@+id/pinDisplay" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:maxLines="1" android:background="@null" android:textSize="32sp" @@ -51,7 +51,7 @@ <ImageButton android:id="@+id/backspace" android:src="@android:drawable/ic_input_delete" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_marginTop="2dip" android:layout_marginRight="2dip" android:layout_marginBottom="2dip" @@ -73,7 +73,7 @@ <LinearLayout android:orientation="horizontal" android:layout_alignParentBottom="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dip" android:layout_marginLeft="8dip" diff --git a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml index 2a23ada..dad994f 100644 --- a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml +++ b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml @@ -17,20 +17,20 @@ */ --> <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" android:background="@android:color/background_dark" android:gravity="center_horizontal"> <LinearLayout android:id="@+id/topDisplayGroup" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> <!-- header text ('Enter Pin Code') --> <TextView android:id="@+id/headerText" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:lines="2" @@ -38,7 +38,7 @@ <!-- password entry --> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:layout_marginRight="6dip" @@ -70,14 +70,14 @@ <!-- Keypad section --> <LinearLayout android:id="@+id/keyPad" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/topDisplayGroup" android:layout_marginTop="10dip" android:orientation="vertical"> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64dip" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -85,7 +85,7 @@ <Button android:id="@+id/one" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -95,7 +95,7 @@ <Button android:id="@+id/two" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -105,7 +105,7 @@ <Button android:id="@+id/three" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -115,7 +115,7 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64dip" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -123,7 +123,7 @@ <Button android:id="@+id/four" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -133,7 +133,7 @@ <Button android:id="@+id/five" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -143,7 +143,7 @@ <Button android:id="@+id/six" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -153,7 +153,7 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64dip" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -161,7 +161,7 @@ <Button android:id="@+id/seven" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -171,7 +171,7 @@ <Button android:id="@+id/eight" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -181,7 +181,7 @@ <Button android:id="@+id/nine" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -191,7 +191,7 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64dip" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -199,7 +199,7 @@ <Button android:id="@+id/ok" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -210,7 +210,7 @@ <Button android:id="@+id/zero" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -220,7 +220,7 @@ <Button android:id="@+id/cancel" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -236,7 +236,7 @@ <!-- spacer below keypad --> <View android:id="@+id/spacerBottom" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="6dip" android:layout_above="@id/emergencyCall" @@ -245,7 +245,7 @@ <!-- The emergency button should take the rest of the space and be centered vertically --> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:gravity="center" diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml index 7e365fc..f9566d8 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock.xml @@ -23,8 +23,8 @@ and portrait.--> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tabunlock="http://schemas.android.com/apk/res/com.android.tabunlock" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="#70000000" android:gravity="center_horizontal" android:id="@+id/root"> @@ -81,7 +81,7 @@ <TextView android:id="@+id/am_pm" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="bottom" android:singleLine="true" android:ellipsize="none" @@ -141,7 +141,7 @@ <com.android.internal.widget.SlidingTab android:id="@+id/tab_selector" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_marginBottom="80dip" diff --git a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml index 33afe93..9965554 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml @@ -22,8 +22,8 @@ depending on the state of the device.--> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tabunlock="http://schemas.android.com/apk/res/com.android.tabunlock" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="horizontal" android:background="#70000000" android:id="@+id/root"> @@ -31,7 +31,7 @@ <!-- left side --> <RelativeLayout android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1.0" android:layout_marginLeft="24dip" android:gravity="left"> @@ -82,7 +82,7 @@ <TextView android:id="@+id/am_pm" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="bottom" android:singleLine="true" android:ellipsize="none" @@ -144,7 +144,7 @@ android:id="@+id/tab_selector" android:orientation="vertical" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_marginRight="80dip" /> diff --git a/core/res/res/layout/keyguard_screen_unlock_landscape.xml b/core/res/res/layout/keyguard_screen_unlock_landscape.xml index f8f326a..58f36ed 100644 --- a/core/res/res/layout/keyguard_screen_unlock_landscape.xml +++ b/core/res/res/layout/keyguard_screen_unlock_landscape.xml @@ -24,8 +24,8 @@ <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient 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="#70000000" > @@ -33,7 +33,7 @@ <LinearLayout android:orientation="vertical" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1.0" android:layout_marginLeft="24dip" android:gravity="left" @@ -81,7 +81,7 @@ <TextView android:id="@+id/am_pm" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="bottom" android:singleLine="true" android:ellipsize="none" @@ -136,20 +136,20 @@ <!-- fill space between header and button below --> <View android:layout_weight="1.0" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" /> <!-- footer --> <FrameLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dip" > <!-- option 1: a single emergency call button --> <RelativeLayout android:id="@+id/footerNormal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="left" > @@ -166,18 +166,18 @@ <!-- option 2: an emergency call button, and a 'forgot pattern?' button --> <LinearLayout android:id="@+id/footerForgotPattern" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="left" > <Button android:id="@+id/forgotPattern" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/Widget.Button.Transparent" android:visibility="invisible" /> <Button android:id="@+id/emergencyCallTogether" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/lockscreen_emergency_call" style="@style/Widget.Button.Transparent" diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml index d7c4aae..ac6cf19 100644 --- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml +++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml @@ -23,14 +23,14 @@ <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:gravity="center_horizontal" android:background="#70000000" > <RelativeLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" > <TextView @@ -70,7 +70,7 @@ <TextView android:id="@+id/am_pm" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="bottom" android:singleLine="true" android:ellipsize="none" @@ -98,7 +98,7 @@ <View android:id="@+id/divider" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="8dip" android:layout_marginBottom="8dip" @@ -109,7 +109,7 @@ status. --> <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="0dip" android:layout_marginLeft="12dip" @@ -145,7 +145,7 @@ <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:layout_marginTop="2dip" @@ -153,14 +153,14 @@ <!-- footer --> <FrameLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" > <!-- option 1: a single emergency call button --> <RelativeLayout android:id="@+id/footerNormal" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" > <Button android:id="@+id/emergencyCallAlone" android:layout_width="wrap_content" @@ -177,13 +177,13 @@ <!-- option 2: an emergency call button, and a 'forgot pattern?' button --> <LinearLayout android:id="@+id/footerForgotPattern" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:gravity="center" > <Button android:id="@+id/emergencyCallTogether" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1.0" android:layout_marginTop="4dip" android:layout_marginBottom="4dip" @@ -196,7 +196,7 @@ /> <Button android:id="@+id/forgotPattern" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1.0" android:layout_marginTop="4dip" android:layout_marginBottom="4dip" diff --git a/core/res/res/layout/list_content.xml b/core/res/res/layout/list_content.xml index a7f3e2d..6f9f1e0 100644 --- a/core/res/res/layout/list_content.xml +++ b/core/res/res/layout/list_content.xml @@ -18,7 +18,7 @@ */ --> <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:drawSelectorOnTop="false" /> diff --git a/core/res/res/layout/list_gestures_overlay.xml b/core/res/res/layout/list_gestures_overlay.xml index 54d72c8..5ebf092 100644 --- a/core/res/res/layout/list_gestures_overlay.xml +++ b/core/res/res/layout/list_gestures_overlay.xml @@ -15,5 +15,5 @@ --> <android.gesture.GestureOverlayView 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" /> diff --git a/core/res/res/layout/list_menu_item_layout.xml b/core/res/res/layout/list_menu_item_layout.xml index df4958f..39c8872 100644 --- a/core/res/res/layout/list_menu_item_layout.xml +++ b/core/res/res/layout/list_menu_item_layout.xml @@ -15,7 +15,7 @@ --> <com.android.internal.view.menu.ListMenuItemView 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"> <!-- Icon will be inserted here. --> @@ -32,7 +32,7 @@ <TextView android:id="@+id/title" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_alignParentLeft="true" diff --git a/core/res/res/layout/media_controller.xml b/core/res/res/layout/media_controller.xml index 32db60a..f4a701e 100644 --- a/core/res/res/layout/media_controller.xml +++ b/core/res/res/layout/media_controller.xml @@ -15,17 +15,17 @@ --> <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:background="#CC666666" android:orientation="vertical"> - <ImageView android:layout_width="fill_parent" + <ImageView android:layout_width="match_parent" android:layout_height="1px" android:background="@android:drawable/divider_horizontal_dark" /> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:paddingTop="4dip" @@ -40,7 +40,7 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> diff --git a/core/res/res/layout/number_picker.xml b/core/res/res/layout/number_picker.xml index 6380d25..44dca33 100644 --- a/core/res/res/layout/number_picker.xml +++ b/core/res/res/layout/number_picker.xml @@ -20,12 +20,12 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android"> <com.android.common.widget.NumberPickerButton android:id="@+id/increment" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/timepicker_up_btn" /> <EditText android:id="@+id/timepicker_input" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:singleLine="true" @@ -35,7 +35,7 @@ android:background="@drawable/timepicker_input" /> <com.android.common.widget.NumberPickerButton android:id="@+id/decrement" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/timepicker_down_btn" /> diff --git a/core/res/res/layout/permissions_account_and_authtokentype.xml b/core/res/res/layout/permissions_account_and_authtokentype.xml index 4494a2c..8335726 100644 --- a/core/res/res/layout/permissions_account_and_authtokentype.xml +++ b/core/res/res/layout/permissions_account_and_authtokentype.xml @@ -21,7 +21,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <ImageView diff --git a/core/res/res/layout/permissions_package_list_item.xml b/core/res/res/layout/permissions_package_list_item.xml index 1bffe51..3c9570e 100644 --- a/core/res/res/layout/permissions_package_list_item.xml +++ b/core/res/res/layout/permissions_package_list_item.xml @@ -21,7 +21,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <ImageView diff --git a/core/res/res/layout/power_dialog.xml b/core/res/res/layout/power_dialog.xml index 7c59ab4..60298d2 100644 --- a/core/res/res/layout/power_dialog.xml +++ b/core/res/res/layout/power_dialog.xml @@ -18,30 +18,30 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> <Button android:id="@+id/keyguard" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <Button android:id="@+id/off" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/power_off" /> <Button android:id="@+id/silent" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <Button android:id="@+id/radio_power" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> diff --git a/core/res/res/layout/preference.xml b/core/res/res/layout/preference.xml index 00745b4..e1fa230 100644 --- a/core/res/res/layout/preference.xml +++ b/core/res/res/layout/preference.xml @@ -18,7 +18,7 @@ Preference is able to place a specific widget for its particular type in the "widget_frame" layout. --> <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:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" @@ -54,7 +54,7 @@ <!-- Preference should place its actual preference widget here. --> <LinearLayout android:id="@+android:id/widget_frame" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="center_vertical" android:orientation="vertical" /> diff --git a/core/res/res/layout/preference_child.xml b/core/res/res/layout/preference_child.xml index 5f8ddd4..8975ed6 100644 --- a/core/res/res/layout/preference_child.xml +++ b/core/res/res/layout/preference_child.xml @@ -16,7 +16,7 @@ <!-- Layout for a visually child-like Preference in a PreferenceActivity. --> <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:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" @@ -53,7 +53,7 @@ <!-- Preference should place its actual preference widget here. --> <LinearLayout android:id="@+android:id/widget_frame" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="center_vertical" android:orientation="vertical" /> diff --git a/core/res/res/layout/preference_dialog_edittext.xml b/core/res/res/layout/preference_dialog_edittext.xml index 7d1faac..5cc1ea2 100644 --- a/core/res/res/layout/preference_dialog_edittext.xml +++ b/core/res/res/layout/preference_dialog_edittext.xml @@ -24,7 +24,7 @@ <TextView android:id="@+android:id/message" style="?android:attr/textAppearanceSmall" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?android:attr/textColorSecondary" /> diff --git a/core/res/res/layout/preference_information.xml b/core/res/res/layout/preference_information.xml index 8f05a8e..a5cf31a 100644 --- a/core/res/res/layout/preference_information.xml +++ b/core/res/res/layout/preference_information.xml @@ -18,7 +18,7 @@ Preference is able to place a specific widget for its particular type in the "widget_frame" layout. --> <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:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" @@ -54,7 +54,7 @@ <!-- Preference should place its actual preference widget here. --> <LinearLayout android:id="@+android:id/widget_frame" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="center_vertical" android:orientation="vertical" /> diff --git a/core/res/res/layout/preference_list_content.xml b/core/res/res/layout/preference_list_content.xml index 31113e1..8f86981 100644 --- a/core/res/res/layout/preference_list_content.xml +++ b/core/res/res/layout/preference_list_content.xml @@ -18,8 +18,8 @@ */ --> <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:drawSelectorOnTop="false" android:scrollbarAlwaysDrawVerticalTrack="true" /> diff --git a/core/res/res/layout/progress_dialog.xml b/core/res/res/layout/progress_dialog.xml index 8f66451..298173a 100644 --- a/core/res/res/layout/progress_dialog.xml +++ b/core/res/res/layout/progress_dialog.xml @@ -19,13 +19,13 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <LinearLayout android:id="@+id/body" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:baselineAligned="false" android:paddingLeft="8dip" android:paddingTop="10dip" @@ -40,7 +40,7 @@ android:layout_marginRight="12dip" /> <TextView android:id="@+id/message" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_vertical" /> </LinearLayout> diff --git a/core/res/res/layout/recent_apps_dialog.xml b/core/res/res/layout/recent_apps_dialog.xml index c4ee95d..4e416e1 100644 --- a/core/res/res/layout/recent_apps_dialog.xml +++ b/core/res/res/layout/recent_apps_dialog.xml @@ -19,7 +19,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="3dip" android:orientation="vertical"> diff --git a/core/res/res/layout/resolve_list_item.xml b/core/res/res/layout/resolve_list_item.xml index 4c5c456..6ed43de 100644 --- a/core/res/res/layout/resolve_list_item.xml +++ b/core/res/res/layout/resolve_list_item.xml @@ -22,7 +22,7 @@ android:orientation="horizontal" android:minHeight="?android:attr/listPreferredItemHeight" android:layout_height="wrap_content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:paddingLeft="10dip" android:paddingRight="15dip"> diff --git a/core/res/res/layout/screen.xml b/core/res/res/layout/screen.xml index ded97e2..dfa9731 100644 --- a/core/res/res/layout/screen.xml +++ b/core/res/res/layout/screen.xml @@ -22,13 +22,13 @@ This is the basic layout for a screen, with all of its features enabled. <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:fitsSystemWindows="true" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" > <!-- Title bar --> <RelativeLayout android:id="@android:id/title_container" style="?android:attr/windowTitleBackgroundStyle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/windowTitleSize" > <ImageView android:id="@android:id/left_icon" @@ -66,7 +66,7 @@ This is the basic layout for a screen, with all of its features enabled. </LinearLayout> <ProgressBar android:id="@+id/progress_horizontal" style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="2dip" android:layout_toLeftOf="@android:id/right_container" @@ -77,8 +77,8 @@ This is the basic layout for a screen, with all of its features enabled. /> <TextView android:id="@android:id/title" style="?android:attr/windowTitleStyle" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="@null" android:fadingEdge="horizontal" android:scrollHorizontally="true" @@ -90,7 +90,7 @@ This is the basic layout for a screen, with all of its features enabled. <!-- Content --> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:foregroundGravity="fill_horizontal|top" diff --git a/core/res/res/layout/screen_custom_title.xml b/core/res/res/layout/screen_custom_title.xml index 12ed1d0..34c9de0 100644 --- a/core/res/res/layout/screen_custom_title.xml +++ b/core/res/res/layout/screen_custom_title.xml @@ -22,12 +22,12 @@ This is an custom layout for a screen. android:orientation="vertical" android:fitsSystemWindows="true"> <FrameLayout android:id="@android:id/title_container" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/windowTitleSize" style="?android:attr/windowTitleBackgroundStyle"> </FrameLayout> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:foregroundGravity="fill_horizontal|top" diff --git a/core/res/res/layout/screen_progress.xml b/core/res/res/layout/screen_progress.xml index 477cadb..6e694c1 100644 --- a/core/res/res/layout/screen_progress.xml +++ b/core/res/res/layout/screen_progress.xml @@ -23,12 +23,12 @@ This is the basic layout for a screen, with all of its features enabled. <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:fitsSystemWindows="true" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" > <RelativeLayout android:id="@android:id/title_container" style="?android:attr/windowTitleBackgroundStyle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/windowTitleSize" > <ProgressBar android:id="@+android:id/progress_circular" @@ -43,7 +43,7 @@ This is the basic layout for a screen, with all of its features enabled. /> <ProgressBar android:id="@+android:id/progress_horizontal" style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="2dip" android:layout_alignParentLeft="true" @@ -54,8 +54,8 @@ This is the basic layout for a screen, with all of its features enabled. /> <TextView android:id="@android:id/title" style="?android:attr/windowTitleStyle" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:layout_alignParentLeft="true" android:layout_toLeftOf="@android:id/progress_circular" android:background="@null" @@ -65,7 +65,7 @@ This is the basic layout for a screen, with all of its features enabled. /> </RelativeLayout> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:foregroundGravity="fill_horizontal|top" diff --git a/core/res/res/layout/screen_title.xml b/core/res/res/layout/screen_title.xml index 5fcd2dd..39ea131 100644 --- a/core/res/res/layout/screen_title.xml +++ b/core/res/res/layout/screen_title.xml @@ -23,7 +23,7 @@ enabled. android:orientation="vertical" android:fitsSystemWindows="true"> <FrameLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/windowTitleSize" style="?android:attr/windowTitleBackgroundStyle"> <TextView android:id="@android:id/title" @@ -31,11 +31,11 @@ enabled. android:background="@null" android:fadingEdge="horizontal" android:gravity="center_vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> + android:layout_width="match_parent" + android:layout_height="match_parent" /> </FrameLayout> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:foregroundGravity="fill_horizontal|top" diff --git a/core/res/res/layout/screen_title_icons.xml b/core/res/res/layout/screen_title_icons.xml index 5415909..62a0228 100644 --- a/core/res/res/layout/screen_title_icons.xml +++ b/core/res/res/layout/screen_title_icons.xml @@ -21,11 +21,11 @@ This is the basic layout for a screen, with all of its features enabled. <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:fitsSystemWindows="true" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <RelativeLayout android:id="@android:id/title_container" style="?android:attr/windowTitleBackgroundStyle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/windowTitleSize"> <!-- The title background has 9px left padding. --> <ImageView android:id="@android:id/left_icon" @@ -51,7 +51,7 @@ This is the basic layout for a screen, with all of its features enabled. the left of the title text left edge. --> <ProgressBar android:id="@+id/progress_horizontal" style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="-3dip" android:layout_toLeftOf="@android:id/progress_circular" @@ -60,8 +60,8 @@ This is the basic layout for a screen, with all of its features enabled. android:visibility="gone" android:max="10000" /> <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="horizontal" android:layout_toLeftOf="@id/progress_circular" android:layout_toRightOf="@android:id/left_icon" @@ -69,7 +69,7 @@ This is the basic layout for a screen, with all of its features enabled. <TextView android:id="@android:id/title" style="?android:attr/windowTitleStyle" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:background="@null" android:fadingEdge="horizontal" @@ -89,7 +89,7 @@ This is the basic layout for a screen, with all of its features enabled. </LinearLayout> </RelativeLayout> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:foregroundGravity="fill_horizontal|top" diff --git a/core/res/res/layout/search_bar.xml b/core/res/res/layout/search_bar.xml index 964af9b..cf246ba 100644 --- a/core/res/res/layout/search_bar.xml +++ b/core/res/res/layout/search_bar.xml @@ -21,7 +21,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" class="android.app.SearchDialog$SearchBar" android:id="@+id/search_bar" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:focusable="true" @@ -30,7 +30,7 @@ <!-- Outer layout defines the entire search bar at the top of the screen --> <LinearLayout android:id="@+id/search_plate" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:paddingLeft="12dip" @@ -52,7 +52,7 @@ <!-- Inner layout contains the app icon, button(s) and EditText --> <LinearLayout android:id="@+id/search_edit_frame" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> @@ -76,8 +76,8 @@ android:singleLine="true" android:ellipsize="end" android:inputType="text|textAutoComplete" - android:dropDownWidth="fill_parent" - android:dropDownHeight="fill_parent" + android:dropDownWidth="match_parent" + android:dropDownHeight="match_parent" android:dropDownAnchor="@id/search_plate" android:dropDownVerticalOffset="-9dip" android:popupBackground="@android:drawable/search_dropdown_background" @@ -88,13 +88,13 @@ android:id="@+id/search_go_btn" android:background="@drawable/btn_search_dialog" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" /> <ImageButton android:id="@+id/search_voice_btn" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_marginLeft="8dip" android:background="@drawable/btn_search_dialog_voice" android:src="@android:drawable/ic_btn_speak_now" diff --git a/core/res/res/layout/search_dropdown_item_1line.xml b/core/res/res/layout/search_dropdown_item_1line.xml index bf3dd48..eed8b7d 100644 --- a/core/res/res/layout/search_dropdown_item_1line.xml +++ b/core/res/res/layout/search_dropdown_item_1line.xml @@ -22,5 +22,5 @@ style="?android:attr/dropDownItemStyle" android:textAppearance="?android:attr/textAppearanceSearchResultTitle" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/searchResultListItemHeight" />
\ No newline at end of file diff --git a/core/res/res/layout/search_dropdown_item_icons_2line.xml b/core/res/res/layout/search_dropdown_item_icons_2line.xml index 2710b3b..d71b4f7 100644 --- a/core/res/res/layout/search_dropdown_item_icons_2line.xml +++ b/core/res/res/layout/search_dropdown_item_icons_2line.xml @@ -21,7 +21,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:paddingLeft="4dip" android:paddingRight="2dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/searchResultListItemHeight" > <!-- Icons come first in the layout, since their placement doesn't depend on @@ -50,7 +50,7 @@ style="?android:attr/dropDownItemStyle" android:textAppearance="?android:attr/textAppearanceSearchResultSubtitle" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="29dip" android:paddingBottom="4dip" android:gravity="top" @@ -66,7 +66,7 @@ style="?android:attr/dropDownItemStyle" android:textAppearance="?android:attr/textAppearanceSearchResultTitle" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_toRightOf="@android:id/icon1" diff --git a/core/res/res/layout/seekbar_dialog.xml b/core/res/res/layout/seekbar_dialog.xml index f61f435..84352a5 100644 --- a/core/res/res/layout/seekbar_dialog.xml +++ b/core/res/res/layout/seekbar_dialog.xml @@ -15,8 +15,8 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" android:gravity="center_horizontal"> @@ -26,7 +26,7 @@ android:paddingTop="20dip" /> <SeekBar android:id="@+id/seekbar" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="20dip" /> diff --git a/core/res/res/layout/select_dialog.xml b/core/res/res/layout/select_dialog.xml index 249b527..c665f7a 100644 --- a/core/res/res/layout/select_dialog.xml +++ b/core/res/res/layout/select_dialog.xml @@ -26,8 +26,8 @@ <view class="com.android.internal.app.AlertController$RecycleListView" xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+android:id/select_dialog_listview" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:layout_marginTop="5px" android:cacheColorHint="@null" android:divider="@android:drawable/divider_horizontal_bright" diff --git a/core/res/res/layout/select_dialog_item.xml b/core/res/res/layout/select_dialog_item.xml index 60a74a4..30fe02e 100644 --- a/core/res/res/layout/select_dialog_item.xml +++ b/core/res/res/layout/select_dialog_item.xml @@ -25,7 +25,7 @@ --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" diff --git a/core/res/res/layout/select_dialog_multichoice.xml b/core/res/res/layout/select_dialog_multichoice.xml index 55fc39b..5785d3b 100644 --- a/core/res/res/layout/select_dialog_multichoice.xml +++ b/core/res/res/layout/select_dialog_multichoice.xml @@ -16,7 +16,7 @@ <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" diff --git a/core/res/res/layout/select_dialog_singlechoice.xml b/core/res/res/layout/select_dialog_singlechoice.xml index 220af64..3560fee 100644 --- a/core/res/res/layout/select_dialog_singlechoice.xml +++ b/core/res/res/layout/select_dialog_singlechoice.xml @@ -16,7 +16,7 @@ <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" diff --git a/core/res/res/layout/simple_dropdown_hint.xml b/core/res/res/layout/simple_dropdown_hint.xml index 44be46d..df9d720 100644 --- a/core/res/res/layout/simple_dropdown_hint.xml +++ b/core/res/res/layout/simple_dropdown_hint.xml @@ -25,5 +25,5 @@ android:layout_marginTop="3dip" android:layout_marginRight="3dip" android:layout_marginBottom="3dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/core/res/res/layout/simple_dropdown_item_1line.xml b/core/res/res/layout/simple_dropdown_item_1line.xml index 5745d15..18e7b88 100644 --- a/core/res/res/layout/simple_dropdown_item_1line.xml +++ b/core/res/res/layout/simple_dropdown_item_1line.xml @@ -22,6 +22,6 @@ style="?android:attr/dropDownItemStyle" android:textAppearance="?android:attr/textAppearanceLargeInverse" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:ellipsize="marquee" /> diff --git a/core/res/res/layout/simple_dropdown_item_2line.xml b/core/res/res/layout/simple_dropdown_item_2line.xml index a04c849..903adb0 100644 --- a/core/res/res/layout/simple_dropdown_item_2line.xml +++ b/core/res/res/layout/simple_dropdown_item_2line.xml @@ -19,7 +19,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:gravity="center_vertical" @@ -39,7 +39,7 @@ style="?android:attr/dropDownItemStyle" android:textAppearance="?android:attr/textAppearanceLargeInverse" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <TextView @@ -48,7 +48,7 @@ android:textAppearance="?android:attr/textAppearanceSmallInverse" android:textColor="#323232" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@android:id/text1" android:layout_alignLeft="@android:id/text1" /> diff --git a/core/res/res/layout/simple_expandable_list_item_1.xml b/core/res/res/layout/simple_expandable_list_item_1.xml index 052b353..dc3e58e 100644 --- a/core/res/res/layout/simple_expandable_list_item_1.xml +++ b/core/res/res/layout/simple_expandable_list_item_1.xml @@ -16,7 +16,7 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:paddingLeft="?android:attr/expandableListPreferredItemPaddingLeft" android:textAppearance="?android:attr/textAppearanceLarge" diff --git a/core/res/res/layout/simple_expandable_list_item_2.xml b/core/res/res/layout/simple_expandable_list_item_2.xml index 741f1db..b48b444 100644 --- a/core/res/res/layout/simple_expandable_list_item_2.xml +++ b/core/res/res/layout/simple_expandable_list_item_2.xml @@ -15,7 +15,7 @@ --> <TwoLineListItem 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:paddingTop="2dip" android:paddingBottom="2dip" @@ -24,14 +24,14 @@ > <TextView android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="6dip" android:textAppearance="?android:attr/textAppearanceLarge" /> <TextView android:id="@android:id/text2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@android:id/text1" android:layout_alignLeft="@android:id/text1" diff --git a/core/res/res/layout/simple_list_item_1.xml b/core/res/res/layout/simple_list_item_1.xml index fe617ac..c9c77a5 100644 --- a/core/res/res/layout/simple_list_item_1.xml +++ b/core/res/res/layout/simple_list_item_1.xml @@ -16,7 +16,7 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center_vertical" diff --git a/core/res/res/layout/simple_list_item_2.xml b/core/res/res/layout/simple_list_item_2.xml index b5e2385..5eab54e 100644 --- a/core/res/res/layout/simple_list_item_2.xml +++ b/core/res/res/layout/simple_list_item_2.xml @@ -17,14 +17,14 @@ <TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android" android:paddingTop="2dip" android:paddingBottom="2dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:mode="twoLine" > <TextView android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="6dip" android:layout_marginTop="6dip" @@ -32,7 +32,7 @@ /> <TextView android:id="@android:id/text2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@android:id/text1" android:layout_alignLeft="@android:id/text1" diff --git a/core/res/res/layout/simple_list_item_checked.xml b/core/res/res/layout/simple_list_item_checked.xml index 95612f6..5f99044 100644 --- a/core/res/res/layout/simple_list_item_checked.xml +++ b/core/res/res/layout/simple_list_item_checked.xml @@ -16,7 +16,7 @@ <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center_vertical" diff --git a/core/res/res/layout/simple_list_item_multiple_choice.xml b/core/res/res/layout/simple_list_item_multiple_choice.xml index 102e5fc..05c66f3 100644 --- a/core/res/res/layout/simple_list_item_multiple_choice.xml +++ b/core/res/res/layout/simple_list_item_multiple_choice.xml @@ -16,7 +16,7 @@ <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center_vertical" diff --git a/core/res/res/layout/simple_list_item_single_choice.xml b/core/res/res/layout/simple_list_item_single_choice.xml index 326de1d..27afd1d 100644 --- a/core/res/res/layout/simple_list_item_single_choice.xml +++ b/core/res/res/layout/simple_list_item_single_choice.xml @@ -16,7 +16,7 @@ <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center_vertical" diff --git a/core/res/res/layout/simple_spinner_dropdown_item.xml b/core/res/res/layout/simple_spinner_dropdown_item.xml index 7006b09..5fd7a09 100644 --- a/core/res/res/layout/simple_spinner_dropdown_item.xml +++ b/core/res/res/layout/simple_spinner_dropdown_item.xml @@ -21,6 +21,6 @@ android:id="@android:id/text1" style="?android:attr/spinnerDropDownItemStyle" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:ellipsize="marquee" /> diff --git a/core/res/res/layout/simple_spinner_item.xml b/core/res/res/layout/simple_spinner_item.xml index 4dd739f..77929ee 100644 --- a/core/res/res/layout/simple_spinner_item.xml +++ b/core/res/res/layout/simple_spinner_item.xml @@ -21,6 +21,6 @@ android:id="@android:id/text1" style="?android:attr/spinnerItemStyle" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:ellipsize="marquee" /> diff --git a/core/res/res/layout/status_bar.xml b/core/res/res/layout/status_bar.xml index 0bc0dac..e8d8866 100644 --- a/core/res/res/layout/status_bar.xml +++ b/core/res/res/layout/status_bar.xml @@ -27,14 +27,14 @@ > <LinearLayout android:id="@+id/icons" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="horizontal"> <com.android.server.status.IconMerger android:id="@+id/notificationIcons" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_alignParentLeft="true" android:paddingLeft="6dip" android:gravity="center_vertical" @@ -42,7 +42,7 @@ <LinearLayout android:id="@+id/statusIcons" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_alignParentRight="true" android:paddingRight="6dip" android:gravity="center_vertical" @@ -50,14 +50,14 @@ </LinearLayout> <LinearLayout android:id="@+id/ticker" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:paddingLeft="6dip" android:animationCache="false" android:orientation="horizontal" > <ImageSwitcher android:id="@+id/tickerIcon" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_marginRight="8dip" > <com.android.server.status.AnimatedImageView @@ -76,12 +76,12 @@ android:paddingTop="2dip" android:paddingRight="10dip"> <TextView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" android:textColor="#ff000000" /> <TextView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" android:textColor="#ff000000" /> @@ -90,7 +90,7 @@ <com.android.server.status.DateView android:id="@+id/date" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:singleLine="true" android:textSize="16sp" android:textStyle="bold" diff --git a/core/res/res/layout/status_bar_expanded.xml b/core/res/res/layout/status_bar_expanded.xml index fd9d26e..a0cd11d 100644 --- a/core/res/res/layout/status_bar_expanded.xml +++ b/core/res/res/layout/status_bar_expanded.xml @@ -25,7 +25,7 @@ android:descendantFocusability="afterDescendants"> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingTop="3dp" @@ -77,26 +77,26 @@ </LinearLayout> <FrameLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" > <ScrollView android:id="@+id/scroll" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:fadingEdge="none" > <com.android.server.status.NotificationLinearLayout android:id="@+id/notificationLinearLayout" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" > <TextView android:id="@+id/noNotificationsTitle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/title_bar_portrait" android:paddingLeft="5dp" @@ -105,7 +105,7 @@ /> <TextView android:id="@+id/ongoingTitle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/title_bar_portrait" android:paddingLeft="5dp" @@ -113,13 +113,13 @@ android:text="@string/status_bar_ongoing_events_title" /> <LinearLayout android:id="@+id/ongoingItems" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" /> <TextView android:id="@+id/latestTitle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/title_bar_portrait" android:paddingLeft="5dp" @@ -127,7 +127,7 @@ android:text="@string/status_bar_latest_events_title" /> <LinearLayout android:id="@+id/latestItems" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" /> @@ -135,7 +135,7 @@ </ScrollView> <ImageView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:src="@drawable/title_bar_shadow" android:scaleType="fitXY" diff --git a/core/res/res/layout/status_bar_icon.xml b/core/res/res/layout/status_bar_icon.xml index 1516036..0536792 100644 --- a/core/res/res/layout/status_bar_icon.xml +++ b/core/res/res/layout/status_bar_icon.xml @@ -26,8 +26,8 @@ > <com.android.server.status.AnimatedImageView android:id="@+id/image" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" /> <TextView android:id="@+id/number" diff --git a/core/res/res/layout/status_bar_latest_event.xml b/core/res/res/layout/status_bar_latest_event.xml index d524bb6..59cc90d 100644 --- a/core/res/res/layout/status_bar_latest_event.xml +++ b/core/res/res/layout/status_bar_latest_event.xml @@ -1,11 +1,11 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="65sp" android:orientation="vertical" > <com.android.server.status.LatestItemView android:id="@+id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64sp" android:background="@drawable/status_bar_item_background" android:focusable="true" @@ -15,7 +15,7 @@ </com.android.server.status.LatestItemView> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1sp" android:background="@drawable/divider_horizontal_bright" /> diff --git a/core/res/res/layout/status_bar_latest_event_content.xml b/core/res/res/layout/status_bar_latest_event_content.xml index eeb9d9d..2f7036f 100644 --- a/core/res/res/layout/status_bar_latest_event_content.xml +++ b/core/res/res/layout/status_bar_latest_event_content.xml @@ -1,13 +1,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" android:paddingTop="7dp" android:paddingLeft="5dp" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingTop="3dp" @@ -18,7 +18,7 @@ android:scaleType="fitCenter" android:src="@drawable/arrow_down_float"/> <TextView android:id="@+id/title" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:singleLine="true" @@ -30,7 +30,7 @@ android:textColor="#ff000000" /> </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > diff --git a/core/res/res/layout/status_bar_tracking.xml b/core/res/res/layout/status_bar_tracking.xml index aa3b733..c0a7a97 100644 --- a/core/res/res/layout/status_bar_tracking.xml +++ b/core/res/res/layout/status_bar_tracking.xml @@ -26,18 +26,18 @@ > <com.android.server.status.TrackingPatternView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" /> <com.android.server.status.CloseDragHandle android:id="@+id/close" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <ImageView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" android:scaleType="fitXY" diff --git a/core/res/res/layout/tab_content.xml b/core/res/res/layout/tab_content.xml index 8f67af0..0ee87ce 100644 --- a/core/res/res/layout/tab_content.xml +++ b/core/res/res/layout/tab_content.xml @@ -19,13 +19,13 @@ --> <TabHost xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/tabhost" - 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_height="fill_parent"> - <TabWidget android:id="@android:id/tabs" android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="match_parent"> + <TabWidget android:id="@android:id/tabs" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="0" /> <FrameLayout android:id="@android:id/tabcontent" - android:layout_width="fill_parent" android:layout_height="0dip" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1"/> </LinearLayout> </TabHost> diff --git a/core/res/res/layout/test_list_item.xml b/core/res/res/layout/test_list_item.xml index f4e0d3c..ede32e8 100644 --- a/core/res/res/layout/test_list_item.xml +++ b/core/res/res/layout/test_list_item.xml @@ -19,6 +19,6 @@ android:textAppearance="?android:attr/textAppearanceSmall" android:paddingTop="2dip" android:paddingBottom="3dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/core/res/res/layout/textview_hint.xml b/core/res/res/layout/textview_hint.xml index d69a2f6..4978be5 100644 --- a/core/res/res/layout/textview_hint.xml +++ b/core/res/res/layout/textview_hint.xml @@ -15,8 +15,8 @@ --> <TextView 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:background="@drawable/popup_inline_error" android:textAppearance="?android:attr/textAppearanceSmallInverse" /> diff --git a/core/res/res/layout/transient_notification.xml b/core/res/res/layout/transient_notification.xml index 1d3be14..12b67f1 100644 --- a/core/res/res/layout/transient_notification.xml +++ b/core/res/res/layout/transient_notification.xml @@ -19,8 +19,8 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" android:background="@drawable/toast_frame"> diff --git a/core/res/res/layout/two_line_list_item.xml b/core/res/res/layout/two_line_list_item.xml index 2a2e759..24ba47a 100644 --- a/core/res/res/layout/two_line_list_item.xml +++ b/core/res/res/layout/two_line_list_item.xml @@ -18,19 +18,19 @@ */ --> <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="@android:id/text1" android:textSize="16sp" android:textStyle="bold" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"/> <TextView android:id="@android:id/text2" android:textSize="16sp" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"/> </LinearLayout> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 0b605ed..8dadd88 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1394,8 +1394,10 @@ be a dimension (such as "12dip") for a constant width or one of the special constants. --> <attr name="layout_width" format="dimension"> - <!-- The view should be as big as its parent (minus padding). --> + <!-- {@deprecated Use match_parent instead.} --> <enum name="fill_parent" value="-1" /> + <!-- The view should be as big as its parent (minus padding). --> + <enum name="match_parent" value="-1" /> <!-- The view should be only big enough to enclose its content (plus padding). --> <enum name="wrap_content" value="-2" /> </attr> @@ -1405,8 +1407,10 @@ be a dimension (such as "12dip") for a constant height or one of the special constants. --> <attr name="layout_height" format="dimension"> - <!-- The view should be as big as its parent (minus padding). --> + <!-- {@deprecated Use match_parent instead.} --> <enum name="fill_parent" value="-1" /> + <!-- The view should be as big as its parent (minus padding). --> + <enum name="match_parent" value="-1" /> <!-- The view should be only big enough to enclose its content (plus padding). --> <enum name="wrap_content" value="-2" /> </attr> @@ -2110,22 +2114,26 @@ is used. --> <attr name="dropDownAnchor" format="reference" /> <!-- Specifies the basic width of the dropdown. Its value may - be a dimension (such as "12dip") for a constant width, fill_parent - to fill the width of the screen, or wrap_content to match the width + be a dimension (such as "12dip") for a constant width, match_parent + to match the width of the screen, or wrap_content to match the width of the anchored view. --> <attr name="dropDownWidth" format="dimension"> - <!-- The dropdown should fill the width of the screen. --> + <!-- {@deprecated Use match_parent instead.} --> <enum name="fill_parent" value="-1" /> + <!-- The dropdown should fit the width of the screen. --> + <enum name="match_parent" value="-1" /> <!-- The dropdown should fit the width of its anchor. --> <enum name="wrap_content" value="-2" /> </attr> <!-- Specifies the basic width of the dropdown. Its value may - be a dimension (such as "12dip") for a constant width, fill_parent + be a dimension (such as "12dip") for a constant width, match_parent to fill the width of the screen, or wrap_content to match the height of the content of the drop down. --> <attr name="dropDownHeight" format="dimension"> - <!-- The dropdown should fill the width of the screen. --> + <!-- {@deprecated Use match_parent instead.} --> <enum name="fill_parent" value="-1" /> + <!-- The dropdown should fill the width of the screen. --> + <enum name="match_parent" value="-1" /> <!-- The dropdown should fit the width of its anchor. --> <enum name="wrap_content" value="-2" /> </attr> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index f2b52d9..58e9f45 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -371,7 +371,7 @@ <style name="Widget.TextView.ListSeparator"> <item name="android:background">@android:drawable/dark_header_dither</item> - <item name="android:layout_width">fill_parent</item> + <item name="android:layout_width">match_parent</item> <item name="android:layout_height">25dip</item> <item name="android:textStyle">bold</item> <item name="android:textColor">?textColorSecondary</item> diff --git a/libs/rs/java/ImageProcessing/res/layout/main.xml b/libs/rs/java/ImageProcessing/res/layout/main.xml index 0872cf2a..6770c18 100644 --- a/libs/rs/java/ImageProcessing/res/layout/main.xml +++ b/libs/rs/java/ImageProcessing/res/layout/main.xml @@ -31,7 +31,7 @@ android:layout_marginBottom="10dip" android:layout_marginLeft="10dip" android:layout_marginRight="10dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" /> diff --git a/media/tests/MediaFrameworkTest/res/layout/movie_view.xml b/media/tests/MediaFrameworkTest/res/layout/movie_view.xml index 35fedfa..cfd86bb 100644 --- a/media/tests/MediaFrameworkTest/res/layout/movie_view.xml +++ b/media/tests/MediaFrameworkTest/res/layout/movie_view.xml @@ -15,12 +15,12 @@ --> <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"> <FrameLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="1"> @@ -32,12 +32,12 @@ </FrameLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> <EditText android:id="@+id/url" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="0" android:singleLine="true" diff --git a/media/tests/MediaFrameworkTest/res/layout/surface_view.xml b/media/tests/MediaFrameworkTest/res/layout/surface_view.xml index cbd1ff8..a72c283 100644 --- a/media/tests/MediaFrameworkTest/res/layout/surface_view.xml +++ b/media/tests/MediaFrameworkTest/res/layout/surface_view.xml @@ -15,18 +15,18 @@ --> <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"> <FrameLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <SurfaceView android:id="@+id/surface_view" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:layout_centerInParent="true" /> diff --git a/opengl/tests/gldual/res/layout/gldual_activity.xml b/opengl/tests/gldual/res/layout/gldual_activity.xml index f2d59c7..d75acbc 100644 --- a/opengl/tests/gldual/res/layout/gldual_activity.xml +++ b/opengl/tests/gldual/res/layout/gldual_activity.xml @@ -17,14 +17,14 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <android.opengl.GLSurfaceView android:id="@+id/gl1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" /> <com.android.gldual.GLDualGL2View android:id="@+id/gl2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" /> </LinearLayout> diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java index 9270a82..1d14e5e 100644 --- a/services/java/com/android/server/WindowManagerService.java +++ b/services/java/com/android/server/WindowManagerService.java @@ -7095,8 +7095,8 @@ public class WindowManagerService extends IWindowManager.Stub w = mAttrs.width < 0 ? pw : mAttrs.width; h = mAttrs.height< 0 ? ph : mAttrs.height; } else { - w = mAttrs.width == mAttrs.FILL_PARENT ? pw : mRequestedWidth; - h = mAttrs.height== mAttrs.FILL_PARENT ? ph : mRequestedHeight; + w = mAttrs.width == mAttrs.MATCH_PARENT ? pw : mRequestedWidth; + h = mAttrs.height== mAttrs.MATCH_PARENT ? ph : mRequestedHeight; } final Rect content = mContentFrame; @@ -10136,8 +10136,8 @@ public class WindowManagerService extends IWindowManager.Stub if (displayed) { if (!covered) { - if (attrs.width == LayoutParams.FILL_PARENT - && attrs.height == LayoutParams.FILL_PARENT) { + if (attrs.width == LayoutParams.MATCH_PARENT + && attrs.height == LayoutParams.MATCH_PARENT) { covered = true; } } diff --git a/services/java/com/android/server/status/StatusBarIcon.java b/services/java/com/android/server/status/StatusBarIcon.java index 857784b..b20d3f6 100644 --- a/services/java/com/android/server/status/StatusBarIcon.java +++ b/services/java/com/android/server/status/StatusBarIcon.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.pm.PackageManager; import android.content.res.Resources; import android.graphics.Typeface; -import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.Drawable; import android.text.TextUtils; import android.util.Log; @@ -12,7 +11,6 @@ import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -41,7 +39,7 @@ class StatusBarIcon { mTextView = t; LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT, - LinearLayout.LayoutParams.FILL_PARENT); + LinearLayout.LayoutParams.MATCH_PARENT); t.setTextSize(16); t.setTextColor(0xff000000); t.setTypeface(Typeface.DEFAULT_BOLD); diff --git a/services/java/com/android/server/status/StatusBarService.java b/services/java/com/android/server/status/StatusBarService.java index 34921d6..0a731a8 100644 --- a/services/java/com/android/server/status/StatusBarService.java +++ b/services/java/com/android/server/status/StatusBarService.java @@ -329,7 +329,7 @@ public class StatusBarService extends IStatusBar.Stub public void systemReady() { final StatusBarView view = mStatusBarView; WindowManager.LayoutParams lp = new WindowManager.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, view.getContext().getResources().getDimensionPixelSize( com.android.internal.R.dimen.status_bar_height), WindowManager.LayoutParams.TYPE_STATUS_BAR, @@ -1486,8 +1486,8 @@ public class StatusBarService extends IStatusBar.Stub } lp = new WindowManager.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL, WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS @@ -1520,7 +1520,7 @@ public class StatusBarService extends IStatusBar.Stub final int disph = mDisplay.getHeight(); lp = mExpandedDialog.getWindow().getAttributes(); - lp.width = ViewGroup.LayoutParams.FILL_PARENT; + lp.width = ViewGroup.LayoutParams.MATCH_PARENT; lp.height = ViewGroup.LayoutParams.WRAP_CONTENT; lp.x = 0; mTrackingPosition = lp.y = -disph; // sufficiently large negative @@ -1539,7 +1539,7 @@ public class StatusBarService extends IStatusBar.Stub mExpandedDialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE); mExpandedDialog.setContentView(mExpandedView, - new ViewGroup.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, + new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); mExpandedDialog.show(); FrameLayout hack = (FrameLayout)mExpandedView.getParent(); 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); diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java index b5b7ceb..573af1e 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java @@ -60,6 +60,7 @@ public class BridgeConstants { public final static String REFERENCE_STYLE = RES_STYLE + "/"; public final static String REFERENCE_NULL = "@null"; - public final static String FILL_PARENT = "fill_parent"; + public final static String MATCH_PARENT = "match_parent"; + public final static String FILL_PARENT = "match_parent"; public final static String WRAP_CONTENT = "wrap_content"; } diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeResources.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeResources.java index 1fafef4..6358abb 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeResources.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeResources.java @@ -239,8 +239,9 @@ public final class BridgeResources extends Resources { String v = value.getValue(); if (v != null) { - if (v.equals(BridgeConstants.FILL_PARENT)) { - return LayoutParams.FILL_PARENT; + if (v.equals(BridgeConstants.MATCH_PARENT) || + v.equals(BridgeConstants.FILL_PARENT)) { + return LayoutParams.MATCH_PARENT; } else if (v.equals(BridgeConstants.WRAP_CONTENT)) { return LayoutParams.WRAP_CONTENT; } diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java index 6f203ba..efd222e 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java @@ -392,8 +392,8 @@ public final class BridgeTypedArray extends TypedArray { if (s == null) { return defValue; - } else if (s.equals(BridgeConstants.FILL_PARENT)) { - return LayoutParams.FILL_PARENT; + } else if (s.equals(BridgeConstants.MATCH_PARENT)) { + return LayoutParams.MATCH_PARENT; } else if (s.equals(BridgeConstants.WRAP_CONTENT)) { return LayoutParams.WRAP_CONTENT; } @@ -460,8 +460,8 @@ public final class BridgeTypedArray extends TypedArray { if (s == null) { return defValue; - } else if (s.equals(BridgeConstants.FILL_PARENT)) { - return LayoutParams.FILL_PARENT; + } else if (s.equals(BridgeConstants.MATCH_PARENT)) { + return LayoutParams.MATCH_PARENT; } else if (s.equals(BridgeConstants.WRAP_CONTENT)) { return LayoutParams.WRAP_CONTENT; } diff --git a/tools/layoutlib/bridge/tests/com/android/layoutlib/testdata/layout1.xml b/tools/layoutlib/bridge/tests/com/android/layoutlib/testdata/layout1.xml index 554f541..b8fc947 100644 --- a/tools/layoutlib/bridge/tests/com/android/layoutlib/testdata/layout1.xml +++ b/tools/layoutlib/bridge/tests/com/android/layoutlib/testdata/layout1.xml @@ -17,8 +17,8 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" > <Button @@ -31,8 +31,8 @@ </Button> <View android:id="@+id/surface" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:layout_weight="2" /> <TextView @@ -40,7 +40,7 @@ android:paddingLeft="2dip" android:layout_weight="0" android:background="@drawable/black" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:lines="1" android:gravity="center_vertical|center_horizontal" |