resolved conflicts for merge of b9e2f68b to master (678d344b) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewAncestor.java

+21 −7

Original line number	Diff line number	Diff line
		@@ -765,10 +765,17 @@ public final class ViewAncestor extends Handler implements ViewParent,
		fullRedrawNeeded = true;
		mLayoutRequested = true;

		if (lp.type == WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL) {
		// NOTE -- system code, won't try to do compat mode.
		Display disp = WindowManagerImpl.getDefault().getDefaultDisplay();
		desiredWindowWidth = disp.getRealWidth();
		desiredWindowHeight = disp.getRealHeight();
		} else {
		DisplayMetrics packageMetrics =
		mView.getContext().getResources().getDisplayMetrics();
		desiredWindowWidth = packageMetrics.widthPixels;
		desiredWindowHeight = packageMetrics.heightPixels;
		}

		// For the very first time, tell the view hierarchy that it
		// is attached to the window. Note that at this point the surface
		@@ -912,11 +919,18 @@ public final class ViewAncestor extends Handler implements ViewParent,
		\|\| lp.height == ViewGroup.LayoutParams.WRAP_CONTENT) {
		windowSizeMayChange = true;

		if (lp.type == WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL) {
		// NOTE -- system code, won't try to do compat mode.
		Display disp = WindowManagerImpl.getDefault().getDefaultDisplay();
		desiredWindowWidth = disp.getRealWidth();
		desiredWindowHeight = disp.getRealHeight();
		} else {
		DisplayMetrics packageMetrics = res.getDisplayMetrics();
		desiredWindowWidth = packageMetrics.widthPixels;
		desiredWindowHeight = packageMetrics.heightPixels;
		}
		}
		}

		// Ask host how big it wants to be
		if (DEBUG_ORIENTATION \|\| DEBUG_LAYOUT) Log.v(TAG,

+1 −1

Original line number	Diff line number	Diff line
		@@ -309,7 +309,7 @@ public class TabletStatusBar extends StatusBar implements
		final Resources res = mContext.getResources();
		final Display d = WindowManagerImpl.getDefault().getDefaultDisplay();
		return Math.max(res.getDimensionPixelSize(R.dimen.notification_panel_min_height),
		d.getHeight());
		d.getRealHeight());
		}

		@Override

+34 −21

Original line number	Diff line number	Diff line
		@@ -1953,6 +1953,18 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		Log.v(TAG, "layoutWindowLw(" + attrs.getTitle() + "): normal window");
		// Otherwise, a normal window must be placed inside the content
		// of all screen decorations.
		if (attrs.type == TYPE_STATUS_BAR_PANEL) {
		// Status bar panels are the only windows who can go on top of
		// the status bar. They are protected by the STATUS_BAR_SERVICE
		// permission, so they have the same privileges as the status
		// bar itself.
		pf.left = df.left = cf.left = vf.left = mUnrestrictedScreenLeft;
		pf.top = df.top = cf.top = vf.top = mUnrestrictedScreenTop;
		pf.right = df.right = cf.right = vf.right
		= mUnrestrictedScreenLeft+mUnrestrictedScreenWidth;
		pf.bottom = df.bottom = cf.bottom = vf.bottom
		= mUnrestrictedScreenTop+mUnrestrictedScreenHeight;
		} else {
		pf.left = mContentLeft;
		pf.top = mContentTop;
		pf.right = mContentRight;
		@@ -1978,6 +1990,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		}
		}
		}

		if ((fl & FLAG_LAYOUT_NO_LIMITS) != 0) {
		df.left = df.top = cf.left = cf.top = vf.left = vf.top = -10000;