Get rid of MeasureSpec.UNSPECIFIED (b8dc6746) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/KeyboardView.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import android.util.TypedValue;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;
		import android.view.ViewGroup.LayoutParams;
		import android.widget.RelativeLayout;
		import android.widget.TextView;

		@@ -122,9 +123,6 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
		new HashMap<Integer, Float>();
		private static final String KEY_LABEL_REFERENCE_CHAR = "M";

		private static final int MEASURESPEC_UNSPECIFIED = MeasureSpec.makeMeasureSpec(
		0, MeasureSpec.UNSPECIFIED);

		private final DrawingHandler mDrawingHandler = new DrawingHandler(this);

		public static class DrawingHandler extends StaticInnerHandlerWrapper<KeyboardView> {
		@@ -859,7 +857,8 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
		}
		previewText.setBackgroundDrawable(params.mPreviewBackground);

		previewText.measure(MEASURESPEC_UNSPECIFIED, MEASURESPEC_UNSPECIFIED);
		previewText.measure(
		ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
		final int previewWidth = Math.max(previewText.getMeasuredWidth(), keyDrawWidth
		+ previewText.getPaddingLeft() + previewText.getPaddingRight());
		final int previewHeight = params.mPreviewHeight;

java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.view.LayoutInflater;
		import android.view.MotionEvent;
		import android.view.View;
		import android.view.ViewConfiguration;
		import android.view.ViewGroup;
		import android.view.accessibility.AccessibilityEvent;
		import android.widget.PopupWindow;

		@@ -379,9 +380,7 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
		final Keyboard miniKeyboard = new MiniKeyboard.Builder(
		this, parentKeyboard.mPopupKeyboardResId, parentKey, parentKeyboard).build();
		miniKeyboardView.setKeyboard(miniKeyboard);

		container.measure(MeasureSpec.makeMeasureSpec(getWidth(), MeasureSpec.AT_MOST),
		MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
		container.measure(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);

		return miniKeyboardView;
		}

java/src/com/android/inputmethod/latin/CandidateView.java

+16 −12

Original line number	Diff line number	Diff line
		@@ -59,8 +59,6 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo

		// The maximum number of suggestions available. See {@link Suggest#mPrefMaxSuggestions}.
		private static final int MAX_SUGGESTIONS = 18;
		private static final int WRAP_CONTENT = ViewGroup.LayoutParams.WRAP_CONTENT;
		private static final int MATCH_PARENT = ViewGroup.LayoutParams.MATCH_PARENT;

		private static final boolean DBG = LatinImeLogger.sDBG;

		@@ -155,7 +153,8 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
		final TextView word = words.get(0);
		final View divider = dividers.get(0);
		mPadding = word.getCompoundPaddingLeft() + word.getCompoundPaddingRight();
		divider.measure(WRAP_CONTENT, MATCH_PARENT);
		divider.measure(
		ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
		mDividerWidth = divider.getMeasuredWidth();
		mDividerHeight = divider.getMeasuredHeight();

		@@ -224,7 +223,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
		lastView = word;
		if (x == 0)
		centeringFrom = word;
		word.measure(WRAP_CONTENT,
		word.measure(ViewGroup.LayoutParams.WRAP_CONTENT,
		MeasureSpec.makeMeasureSpec(mCandidateStripHeight, MeasureSpec.EXACTLY));
		final int width = word.getMeasuredWidth();
		final int height = word.getMeasuredHeight();
		@@ -234,7 +233,8 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
		if (info != null) {
		paneView.addView(info);
		lastView = info;
		info.measure(WRAP_CONTENT, WRAP_CONTENT);
		info.measure(ViewGroup.LayoutParams.WRAP_CONTENT,
		ViewGroup.LayoutParams.WRAP_CONTENT);
		final int infoWidth = info.getMeasuredWidth();
		FrameLayoutCompatUtils.placeViewAt(
		info, x - infoWidth, y, infoWidth, info.getMeasuredHeight());
		@@ -430,7 +430,8 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
		word.setText(text); // TextView.setText() resets text scale x to 1.0.
		word.setTextScaleX(scaleX);
		stripView.addView(word);
		setLayoutWeight(word, getCandidateWeight(index), MATCH_PARENT);
		setLayoutWeight(
		word, getCandidateWeight(index), ViewGroup.LayoutParams.MATCH_PARENT);
		x += word.getMeasuredWidth();

		if (DBG) {
		@@ -439,7 +440,8 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
		final TextView info = mInfos.get(pos);
		info.setText(debugInfo);
		placer.addView(info);
		info.measure(WRAP_CONTENT, WRAP_CONTENT);
		info.measure(ViewGroup.LayoutParams.WRAP_CONTENT,
		ViewGroup.LayoutParams.WRAP_CONTENT);
		final int infoWidth = info.getMeasuredWidth();
		final int y = info.getMeasuredHeight();
		FrameLayoutCompatUtils.placeViewAt(
		@@ -515,7 +517,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
		wordView.setText(text);
		wordView.setTextScaleX(wordScaleX);
		stripView.addView(wordView);
		setLayoutWeight(wordView, mCenterCandidateWeight, MATCH_PARENT);
		setLayoutWeight(wordView, mCenterCandidateWeight, ViewGroup.LayoutParams.MATCH_PARENT);

		stripView.addView(mDividers.get(0));

		@@ -526,7 +528,8 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
		hintView.setText(mHintToSaveText);
		hintView.setTextScaleX(hintScaleX);
		stripView.addView(hintView);
		setLayoutWeight(hintView, 1.0f - mCenterCandidateWeight, MATCH_PARENT);
		setLayoutWeight(
		hintView, 1.0f - mCenterCandidateWeight, ViewGroup.LayoutParams.MATCH_PARENT);
		}
		}

		@@ -558,7 +561,8 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo

		mPreviewPopup = new PopupWindow(context);
		mPreviewText = (TextView) inflater.inflate(R.layout.candidate_preview, null);
		mPreviewPopup.setWindowLayoutMode(WRAP_CONTENT, WRAP_CONTENT);
		mPreviewPopup.setWindowLayoutMode(
		ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
		mPreviewPopup.setContentView(mPreviewText);
		mPreviewPopup.setBackgroundDrawable(null);

		@@ -796,8 +800,8 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
		final TextView previewText = mPreviewText;
		previewText.setTextColor(mStripParams.mColorTypedWord);
		previewText.setText(word);
		previewText.measure(MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
		MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
		previewText.measure(
		ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
		final int[] offsetInWindow = new int[2];
		view.getLocationInWindow(offsetInWindow);
		final int posX = offsetInWindow[0];