Merge "Remove suggestion_word and suggestion_info layout files" (005d2454) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/layout/suggestion_info.xml

deleted100644 → 0

+0 −27

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		**
		** Copyright 2011, 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.
		*/
		-->

		<TextView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textSize="6dp"
		android:textColor="@android:color/white"
		style="?attr/suggestionWordStyle" />

deleted100644 → 0

+0 −39

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		**
		** Copyright 2011, 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.
		*/
		-->

		<!-- Provide a haptic feedback by ourselves based on the keyboard settings.
		We just need to ignore the system's haptic feedback settings. -->
		<TextView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:minWidth="@dimen/config_suggestion_min_width"
		android:textSize="@dimen/config_suggestion_text_size"
		android:gravity="center"
		android:paddingLeft="@dimen/config_suggestion_text_horizontal_padding"
		android:paddingTop="0dp"
		android:paddingRight="@dimen/config_suggestion_text_horizontal_padding"
		android:paddingBottom="0dp"
		android:hapticFeedbackEnabled="false"
		android:focusable="false"
		android:clickable="false"
		android:singleLine="true"
		android:ellipsize="none"
		style="?attr/suggestionWordStyle" />

+10 −6

Original line number	Diff line number	Diff line
		@@ -31,13 +31,17 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="invisible">
		<include
		layout="@layout/suggestion_word"
		android:id="@+id/word_to_save" />
		<TextView
		android:id="@+id/word_to_save"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		style="?attr/suggestionWordStyle" />
		<include
		layout="@layout/suggestion_divider" />
		<include
		layout="@layout/suggestion_word"
		android:id="@+id/hint_add_to_dictionary" />
		<TextView
		android:id="@+id/hint_add_to_dictionary"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		style="?attr/suggestionWordStyle" />
		</LinearLayout>
		</merge>

+16 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,22 @@
		<item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
		<item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
		</style>
		<style name="SuggestionWord" />
		<style name="SuggestionWord">
		<item name="android:minWidth">@dimen/config_suggestion_min_width</item>
		<item name="android:textSize">@dimen/config_suggestion_text_size</item>
		<item name="android:gravity">center</item>
		<item name="android:paddingLeft">@dimen/config_suggestion_text_horizontal_padding</item>
		<item name="android:paddingTop">0dp</item>
		<item name="android:paddingRight">@dimen/config_suggestion_text_horizontal_padding</item>
		<item name="android:paddingBottom">0dp</item>
		<!-- Provide a haptic feedback by ourselves based on the keyboard settings.
		We just need to ignore the system's haptic feedback settings. -->
		<item name="android:hapticFeedbackEnabled">false</item>
		<item name="android:focusable">false</item>
		<item name="android:clickable">false</item>
		<item name="android:singleLine">true</item>
		<item name="android:ellipsize">none</item>
		</style>
		<style name="MoreKeysKeyboardAnimation">
		<item name="android:windowEnterAnimation">@anim/more_keys_keyboard_fadein</item>
		<item name="android:windowExitAnimation">@anim/more_keys_keyboard_fadeout</item>

+5 −1

Original line number	Diff line number	Diff line
		@@ -140,7 +140,11 @@
		<item name="colorSuggested">@color/highlight_color_gb</item>
		<item name="alphaObsoleted">50%</item>
		</style>
		<style name="SuggestionWord.GB">
		<style
		name="SuggestionWord.GB"
		parent="SuggestionWord"
		>
		<item name="android:background">@drawable/btn_suggestion_gb</item>
		<item name="android:textColor">@color/highlight_color_gb</item>
		</style>
		</resources>