nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Cleanup FrameLayoutCompatUtils to ViewLayoutUtils"

main
Tadashi G. Takaoka 2012-04-03 00:47:32 -07:00 committed by Android (Google) Code Review
parent 13d6ecc4c2 c8461d1ae2
commit 7a0779a441
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/src/com/android/inputmethod/keyboard/KeyboardView.java
View File

@ -37,7 +37,6 @@ import android.view.ViewGroup;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.android.inputmethod.compat.FrameLayoutCompatUtils;
import com.android.inputmethod.latin.LatinImeLogger; import com.android.inputmethod.latin.LatinImeLogger;
import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.R;
import com.android.inputmethod.latin.StaticInnerHandlerWrapper; import com.android.inputmethod.latin.StaticInnerHandlerWrapper;
@ -853,7 +852,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
windowContentView.addView(mPreviewPlacer); windowContentView.addView(mPreviewPlacer);
} }
mPreviewPlacer.addView( mPreviewPlacer.addView(
keyPreview, FrameLayoutCompatUtils.newLayoutParam(mPreviewPlacer, 0, 0)); keyPreview, ViewLayoutUtils.newLayoutParam(mPreviewPlacer, 0, 0));
} }
private void showKey(PointerTracker tracker) { private void showKey(PointerTracker tracker) {
@ -919,7 +918,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
previewText.getBackground().setState( previewText.getBackground().setState(
key.mMoreKeys != null ? LONG_PRESSABLE_STATE_SET : EMPTY_STATE_SET); key.mMoreKeys != null ? LONG_PRESSABLE_STATE_SET : EMPTY_STATE_SET);
previewText.setTextColor(params.mPreviewTextColor); previewText.setTextColor(params.mPreviewTextColor);
FrameLayoutCompatUtils.placeViewAt( ViewLayoutUtils.placeViewAt(
previewText, previewX, previewY, previewWidth, previewHeight); previewText, previewX, previewY, previewWidth, previewHeight);
previewText.setVisibility(VISIBLE); previewText.setVisibility(VISIBLE);
} }

19
java/src/com/android/inputmethod/compat/FrameLayoutCompatUtils.java → java/src/com/android/inputmethod/keyboard/ViewLayoutUtils.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.inputmethod.compat; package com.android.inputmethod.keyboard;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -22,20 +22,9 @@ import android.view.ViewGroup.MarginLayoutParams;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
public class FrameLayoutCompatUtils { public class ViewLayoutUtils {
private static final boolean NEEDS_FRAME_LAYOUT_HACK = ( private ViewLayoutUtils() {
android.os.Build.VERSION.SDK_INT < 11 /* Honeycomb */); // This utility class is not publicly instantiable.
public static ViewGroup getPlacer(ViewGroup container) {
if (NEEDS_FRAME_LAYOUT_HACK) {
// Insert RelativeLayout to be able to setMargin because pre-Honeycomb FrameLayout
// could not handle setMargin properly.
final ViewGroup placer = new RelativeLayout(container.getContext());
container.addView(placer);
return placer;
} else {
return container;
}
} }
public static MarginLayoutParams newLayoutParam(ViewGroup placer, int width, int height) { public static MarginLayoutParams newLayoutParam(ViewGroup placer, int width, int height) {

4
java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java
View File

@ -52,11 +52,11 @@ import android.widget.PopupWindow;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.android.inputmethod.compat.FrameLayoutCompatUtils;
import com.android.inputmethod.keyboard.KeyboardActionListener; import com.android.inputmethod.keyboard.KeyboardActionListener;
import com.android.inputmethod.keyboard.KeyboardView; import com.android.inputmethod.keyboard.KeyboardView;
import com.android.inputmethod.keyboard.MoreKeysPanel; import com.android.inputmethod.keyboard.MoreKeysPanel;
import com.android.inputmethod.keyboard.PointerTracker; import com.android.inputmethod.keyboard.PointerTracker;
import com.android.inputmethod.keyboard.ViewLayoutUtils;
import com.android.inputmethod.latin.LatinImeLogger; import com.android.inputmethod.latin.LatinImeLogger;
import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.R;
import com.android.inputmethod.latin.StaticInnerHandlerWrapper; import com.android.inputmethod.latin.StaticInnerHandlerWrapper;
@ -416,7 +416,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
ViewGroup.LayoutParams.WRAP_CONTENT); ViewGroup.LayoutParams.WRAP_CONTENT);
final int infoWidth = info.getMeasuredWidth(); final int infoWidth = info.getMeasuredWidth();
final int y = info.getMeasuredHeight(); final int y = info.getMeasuredHeight();
FrameLayoutCompatUtils.placeViewAt( ViewLayoutUtils.placeViewAt(
info, x - infoWidth, y, infoWidth, info.getMeasuredHeight()); info, x - infoWidth, y, infoWidth, info.getMeasuredHeight());
} }
} }