Merge "Deprecate fill_parent and introduce match_parent. Bug: #2361749." (9b0b155e) · Commits · e / os / android_frameworks_base

api/current.xml

+15 −4

Original line number	Diff line number	Diff line
		@@ -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>
		@@ -173997,6 +173997,17 @@
		</parameter>
		</method>
		<field name="FILL_PARENT"
		type="int"
		transient="false"
		volatile="false"
		value="-1"
		static="true"
		final="true"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		<field name="MATCH_PARENT"
		type="int"
		transient="false"
		volatile="false"

core/java/android/app/Activity.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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();

core/java/android/app/AlertDialog.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

core/java/android/app/Dialog.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

core/java/android/app/ExpandableListActivity.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -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>