Projects >> AnySoftKeyboard >>2c90114d12be778370d1c1146a11d2ebd3ee11df

Chunk
Conflicting content
		int popupWidth = 0;
		int popupHeight = 0;
		// Should not draw hint icon in key preview
<<<<<<< HEAD
		CharSequence label = tracker.getPreviewText(key, mKeyboard.isShifted());
		if (TextUtils.isEmpty(label)) {
			Drawable iconToDraw = getIconToDrawForKey(key, true);
			// Here's an annoying bug for you (explanation at the end of the
			// hack)
=======
		Drawable iconToDraw = getIconToDrawForKey(key, true);
		if (iconToDraw != null) {
			//Here's an annoying bug for you (explaination at the end of the hack)
>>>>>>> 908fd871a8d76044066f86b5d87f0b0c0d07b020
			mPreviewIcon.setImageState(iconToDraw.getState(), false);
			// end of hack. You see, the drawable comes with a state, this state
			// is overridden by the ImageView. No more.
Solution content
		int popupWidth = 0;
		int popupHeight = 0;
		// Should not draw hint icon in key preview
		Drawable iconToDraw = getIconToDrawForKey(key, true);
		if (iconToDraw != null) {
			// Here's an annoying bug for you (explaination at the end of the
			// hack)
			mPreviewIcon.setImageState(iconToDraw.getState(), false);
			// end of hack. You see, the drawable comes with a state, this state
			// is overridden by the ImageView. No more.
File
AnyKeyboardBaseView.java
Developer's decision
Manual
Kind of conflict
Comment
If statement
Method invocation
Variable