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

am 005d2454: Merge "Remove suggestion_word and suggestion_info layout files" 

* commit '005d2454c97400bef3da7961267fe6b943da5833':
  Remove suggestion_word and suggestion_info layout files
main
Tadashi G. Takaoka 2014-01-28 17:07:51 -08:00 committed by Android Git Automerger
parent dfcc8b9443 005d2454c9
commit 937bd8a541
8 changed files with 49 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
java/res/layout/suggestion_info.xml
View File

@ -1,27 +0,0 @@
<?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" />

39
java/res/layout/suggestion_word.xml
View File

@ -1,39 +0,0 @@
<?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" />

16
java/res/layout/suggestions_strip.xml
View File

@ -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>

17
java/res/values/themes-common.xml
View File

@ -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>

6
java/res/values/themes-gb.xml
View File

@ -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>

6
java/res/values/themes-ics.xml
View File

@ -119,7 +119,11 @@
<item name="colorSuggested">@color/suggested_word_color_ics</item>
<item name="alphaObsoleted">70%</item>
</style>
<style name="SuggestionWord.ICS">
<style
name="SuggestionWord.ICS"
parent="SuggestionWord"
>
<item name="android:background">@drawable/btn_suggestion_ics</item>
<item name="android:textColor">@color/highlight_color_ics</item>
</style>
</resources>

6
java/res/values/themes-klp.xml
View File

@ -119,7 +119,11 @@
<item name="colorSuggested">@color/suggested_word_color_klp</item>
<item name="alphaObsoleted">70%</item>
</style>
<style name="SuggestionWord.KLP">
<style
name="SuggestionWord.KLP"
parent="SuggestionWord"
>
<item name="android:background">@drawable/btn_suggestion_klp</item>
<item name="android:textColor">@color/highlight_color_klp</item>
</style>
</resources>

10
java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
View File

@ -18,8 +18,10 @@ package com.android.inputmethod.latin.suggestions;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Color;
import android.support.v4.view.ViewCompat;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.GestureDetector;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@ -56,6 +58,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
}
static final boolean DBG = LatinImeLogger.sDBG;
private static final float DEBUG_INFO_TEXT_SIZE_IN_DIP = 6.0f;
private final ViewGroup mSuggestionsStrip;
private final ViewGroup mAddToDictionaryStrip;
@ -128,14 +131,17 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
mStripVisibilityGroup = new StripVisibilityGroup(mSuggestionsStrip, mAddToDictionaryStrip);
for (int pos = 0; pos < SuggestedWords.MAX_SUGGESTIONS; pos++) {
final TextView word = (TextView)inflater.inflate(R.layout.suggestion_word, null);
final TextView word = new TextView(context, null, R.attr.suggestionWordStyle);
word.setOnClickListener(this);
word.setOnLongClickListener(this);
mWordViews.add(word);
final View divider = inflater.inflate(R.layout.suggestion_divider, null);
divider.setOnClickListener(this);
mDividerViews.add(divider);
mDebugInfoViews.add((TextView)inflater.inflate(R.layout.suggestion_info, null));
final TextView info = new TextView(context, null, R.attr.suggestionWordStyle);
info.setTextColor(Color.WHITE);
info.setTextSize(TypedValue.COMPLEX_UNIT_DIP, DEBUG_INFO_TEXT_SIZE_IN_DIP);
mDebugInfoViews.add(info);
}
mLayoutHelper = new SuggestionStripLayoutHelper(