am 68a2a69a: am 37beaf15: Simplify onComputeInsets of LatinIME (8b5788d7) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/layout/emoji_palettes_view.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,10 +20,10 @@

		<com.android.inputmethod.keyboard.emoji.EmojiPalettesView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/emoji_keyboard_view"
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom"
		android:orientation="vertical"
		style="?attr/emojiPalettesViewStyle"
		>
		<LinearLayout

java/res/layout/input_view.xml

+4 −31

Original line number	Diff line number	Diff line
		@@ -21,38 +21,11 @@
		<com.android.inputmethod.latin.InputView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="bottom\|center_horizontal"
		android:orientation="vertical" >
		<!-- The height of key_preview_backing view will automatically be determined by code. -->
		<FrameLayout
		android:id="@+id/key_preview_backing"
		android:layout_width="match_parent"
		android:layout_height="0dp" />
		<LinearLayout
		android:layout_height="wrap_content">
		<include
		android:id="@+id/main_keyboard_frame"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="vertical" >

		<!-- To ensure that key preview popup is correctly placed when the current system locale is
		one of RTL locales, layoutDirection="ltr" is needed in the SDK version 17+. -->
		<com.android.inputmethod.latin.suggestions.SuggestionStripView
		android:id="@+id/suggestion_strip_view"
		android:layoutDirection="ltr"
		android:layout_width="match_parent"
		android:layout_height="@dimen/config_suggestions_strip_height"
		android:gravity="center_vertical"
		style="?attr/suggestionStripViewStyle" />

		<!-- To ensure that key preview popup is correctly placed when the current system locale is
		one of RTL locales, layoutDirection="ltr" is needed in the SDK version 17+. -->
		<com.android.inputmethod.keyboard.MainKeyboardView
		android:id="@+id/keyboard_view"
		android:layoutDirection="ltr"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />
		</LinearLayout>
		layout="@layout/main_keyboard_frame" />
		<include
		android:id="@+id/emoji_palettes_view"
		layout="@layout/emoji_palettes_view" />
		</com.android.inputmethod.latin.InputView>

java/res/layout/main_keyboard_frame.xml

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		**
		** Copyright 2014, The Android Open Source Project
		**
		** Licensed under the Apache License, Version 2.0 (the "License");
		** you may not use this file except in compliance with the License.
		** You may obtain a copy of the License at
		**
		** http://www.apache.org/licenses/LICENSE-2.0
		**
		** Unless required by applicable law or agreed to in writing, software
		** distributed under the License is distributed on an "AS IS" BASIS,
		** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		** See the License for the specific language governing permissions and
		** limitations under the License.
		*/
		-->

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom"
		android:orientation="vertical" >

		<!-- To ensure that key preview popup is correctly placed when the current system locale is
		one of RTL locales, layoutDirection="ltr" is needed in the SDK version 17+. -->
		<com.android.inputmethod.latin.suggestions.SuggestionStripView
		android:id="@+id/suggestion_strip_view"
		android:layoutDirection="ltr"
		android:layout_width="match_parent"
		android:layout_height="@dimen/config_suggestions_strip_height"
		android:gravity="center_vertical"
		style="?attr/suggestionStripViewStyle" />

		<!-- To ensure that key preview popup is correctly placed when the current system locale is
		one of RTL locales, layoutDirection="ltr" is needed in the SDK version 17+. -->
		<com.android.inputmethod.keyboard.MainKeyboardView
		android:id="@+id/keyboard_view"
		android:layoutDirection="ltr"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />
		</LinearLayout>

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -360,7 +360,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
		R.layout.input_view, null);
		mMainKeyboardFrame = mCurrentInputView.findViewById(R.id.main_keyboard_frame);
		mEmojiPalettesView = (EmojiPalettesView)mCurrentInputView.findViewById(
		R.id.emoji_keyboard_view);
		R.id.emoji_palettes_view);

		mKeyboardView = (MainKeyboardView) mCurrentInputView.findViewById(R.id.keyboard_view);
		mKeyboardView.setHardwareAcceleratedDrawingEnabled(isHardwareAcceleratedDrawingEnabled);

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,14 +21,14 @@ import android.graphics.Rect;
		import android.util.AttributeSet;
		import android.view.MotionEvent;
		import android.view.View;
		import android.widget.LinearLayout;
		import android.widget.FrameLayout;

		import com.android.inputmethod.accessibility.AccessibilityUtils;
		import com.android.inputmethod.keyboard.MainKeyboardView;
		import com.android.inputmethod.latin.suggestions.MoreSuggestionsView;
		import com.android.inputmethod.latin.suggestions.SuggestionStripView;

		public final class InputView extends LinearLayout {
		public final class InputView extends FrameLayout {
		private final Rect mInputViewRect = new Rect();
		private MainKeyboardView mMainKeyboardView;
		private KeyboardTopPaddingForwarder mKeyboardTopPaddingForwarder;