Deprecate fill_parent and introduce match_parent.

Bug: #2361749.

2 files changed, 7 insertions, 19 deletions

diff --git a/mid/com/android/internal/policy/impl/MidWindow.java b/mid/com/android/internal/policy/impl/MidWindow.java
index b2e9ebd..d94dd62 100644
--- a/mid/com/android/internal/policy/impl/MidWindow.java
+++ b/mid/com/android/internal/policy/impl/MidWindow.java
@@ -58,7 +58,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.ViewGroup;
-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.view.ViewManager;
 import android.view.VolumePanel;
@@ -68,7 +68,6 @@ import static android.view.WindowManager.LayoutParams.FLAG_FULLSCREEN;
 import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
 import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR;
 
-import android.view.Window.Callback;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.FrameLayout;
@@ -238,7 +237,7 @@ public class MidWindow extends Window implements MenuBuilder.Callback {
 
     @Override
     public void setContentView(View view) {
-        setContentView(view, new ViewGroup.LayoutParams(FILL_PARENT, FILL_PARENT));
+        setContentView(view, new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
     }
 
     @Override
@@ -458,7 +457,7 @@ public class MidWindow extends Window implements MenuBuilder.Callback {
             }
 
             int backgroundResId; 
-            if (lp.width == ViewGroup.LayoutParams.FILL_PARENT) {
+            if (lp.width == ViewGroup.LayoutParams.MATCH_PARENT) {
                 // If the contents is fill parent for the width, set the
                 // corresponding background
                 backgroundResId = st.fullBackground;
@@ -1722,7 +1721,7 @@ public class MidWindow extends Window implements MenuBuilder.Callback {
                 if (SWEEP_OPEN_MENU) {
                     if (mMenuBackground == null && mFeatureId < 0
                             && getAttributes().height
-                            == WindowManager.LayoutParams.FILL_PARENT) {
+                            == WindowManager.LayoutParams.MATCH_PARENT) {
                         mMenuBackground = getContext().getResources().getDrawable(
                                 com.android.internal.R.drawable.menu_background);
                     }
@@ -2042,7 +2041,7 @@ public class MidWindow extends Window implements MenuBuilder.Callback {
         mDecor.startChanging();
 
         View in = mLayoutInflater.inflate(layoutResource, null);
-        decor.addView(in, new ViewGroup.LayoutParams(FILL_PARENT, FILL_PARENT));
+        decor.addView(in, new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
 
         ViewGroup contentParent = (ViewGroup)findViewById(ID_ANDROID_CONTENT);
         if (contentParent == null) {
diff --git a/mid/com/android/internal/policy/impl/MidWindowManager.java b/mid/com/android/internal/policy/impl/MidWindowManager.java
index 2b52308..3b8ce93 100644
--- a/mid/com/android/internal/policy/impl/MidWindowManager.java
+++ b/mid/com/android/internal/policy/impl/MidWindowManager.java
@@ -21,16 +21,13 @@ import android.app.ActivityManagerNative;
 import android.app.IActivityManager;
 import android.app.IStatusBar;
 import android.content.BroadcastReceiver;
-import android.content.ContentQueryMap;
 import android.content.ContentResolver;
-import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.database.Cursor;
 import android.graphics.Rect;
 import android.os.Handler;
 import android.os.IBinder;
@@ -40,18 +37,14 @@ import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemClock;
 import android.provider.Settings;
-import static android.provider.Settings.System.END_BUTTON_BEHAVIOR;
 
 import com.android.internal.policy.PolicyManager;
-import com.android.internal.telephony.ITelephony;
 import android.util.Config;
 import android.util.EventLog;
 import android.util.Log;
-import android.view.HapticFeedbackConstants;
 import android.view.IWindowManager;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
-import android.view.OrientationListener;
 import android.view.RawInputEvent;
 import android.view.Surface;
 import android.view.View;
@@ -82,14 +75,10 @@ import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY;
 import static android.view.WindowManager.LayoutParams.TYPE_TOAST;
 import android.view.WindowManagerImpl;
 import android.view.WindowManagerPolicy;
-import android.view.WindowManagerPolicy.WindowState;
 import android.view.animation.Animation;
 import android.media.IAudioService;
 import android.media.AudioManager;
 
-import java.util.Observable;
-import java.util.Observer;
-
 /**
  * WindowManagerPolicy implementation for the Android MID UI.
  */
@@ -409,8 +398,8 @@ public class MidWindowManager implements WindowManagerPolicy {
             WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE|
             WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE);
 
-        win.setLayout(WindowManager.LayoutParams.FILL_PARENT,
-                            WindowManager.LayoutParams.FILL_PARENT);
+        win.setLayout(WindowManager.LayoutParams.MATCH_PARENT,
+                            WindowManager.LayoutParams.MATCH_PARENT);
 
         final WindowManager.LayoutParams params = win.getAttributes();
         params.token = appToken;