Rename CandidateView to SuggestionsView
Change-Id: I6480cdf025f065130e1969899b259a243e7a11be
diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml
index 821082f..3284695 100644
--- a/java/res/layout/input_view.xml
+++ b/java/res/layout/input_view.xml
@@ -25,55 +25,34 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
- <!-- On tablets, the candidate strip is centered with horizontal paddings on both sides because
- width of the landscape mode is too long for the candidate strip. This LinearLayout is
- required to hold the paddings. -->
+ <!-- On tablets, the suggestions strip is centered with horizontal paddings on both sides
+ because width of the landscape mode is too long for the suggestions strip. This
+ LinearLayout is required to hold the paddings. -->
<LinearLayout
- android:id="@+id/candidates_container"
+ android:id="@+id/suggestions_container"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="@dimen/candidate_strip_minimum_height"
+ android:minHeight="@dimen/suggestions_strip_minimum_height"
android:gravity="bottom"
>
<View
- android:layout_width="@dimen/candidate_strip_padding"
- android:layout_height="@dimen/candidate_strip_height"
+ android:layout_width="@dimen/suggestions_strip_padding"
+ android:layout_height="@dimen/suggestions_strip_height"
style="?attr/suggestionsStripBackgroundStyle" />
- <com.android.inputmethod.latin.CandidateView
- android:id="@+id/candidates"
+ <com.android.inputmethod.latin.SuggestionsView
+ android:id="@+id/suggestions_view"
android:layout_weight="1.0"
android:layout_width="0dp"
- android:layout_height="@dimen/candidate_strip_height"
+ android:layout_height="@dimen/suggestions_strip_height"
android:gravity="center_vertical"
- style="?attr/candidateViewStyle" />
+ style="?attr/suggestionsViewStyle" />
<View
- android:layout_width="@dimen/candidate_strip_padding"
- android:layout_height="@dimen/candidate_strip_height"
+ android:layout_width="@dimen/suggestions_strip_padding"
+ android:layout_height="@dimen/suggestions_strip_height"
style="?attr/suggestionsStripBackgroundStyle" />
</LinearLayout>
- <LinearLayout
- android:id="@+id/candidates_pane_container"
- android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:visibility="gone"
- style="?attr/suggestionsStripBackgroundStyle"
- >
- <View
- android:layout_width="@dimen/candidate_strip_padding"
- android:layout_height="@dimen/candidate_strip_height" />
- <FrameLayout
- android:id="@+id/candidates_pane"
- android:layout_weight="1.0"
- android:layout_width="0dp"
- android:layout_height="match_parent" />
- <View
- android:layout_width="@dimen/candidate_strip_padding"
- android:layout_height="@dimen/candidate_strip_height" />
- </LinearLayout>
-
<com.android.inputmethod.keyboard.LatinKeyboardView
android:id="@+id/keyboard_view"
android:layout_alignParentBottom="true"
diff --git a/java/res/layout/more_suggestions.xml b/java/res/layout/more_suggestions.xml
index d387a15..6aa82e1 100644
--- a/java/res/layout/more_suggestions.xml
+++ b/java/res/layout/more_suggestions.xml
@@ -30,7 +30,7 @@
android:layout_alignParentBottom="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- latin:keyLabelSize="@dimen/candidate_text_size"
+ latin:keyLabelSize="@dimen/suggestion_text_size"
latin:keyHintLetterRatio="@fraction/more_suggestions_info_ratio"
latin:keyHintLetterColor="@android:color/white"
/>
diff --git a/java/res/layout/candidate_divider.xml b/java/res/layout/suggestion_divider.xml
similarity index 94%
rename from java/res/layout/candidate_divider.xml
rename to java/res/layout/suggestion_divider.xml
index dc5e779..e38a725 100644
--- a/java/res/layout/candidate_divider.xml
+++ b/java/res/layout/suggestion_divider.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2010, The Android Open Source Project
+** 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.
diff --git a/java/res/layout/candidate_info.xml b/java/res/layout/suggestion_info.xml
similarity index 100%
rename from java/res/layout/candidate_info.xml
rename to java/res/layout/suggestion_info.xml
diff --git a/java/res/layout/candidate_preview.xml b/java/res/layout/suggestion_preview.xml
similarity index 81%
rename from java/res/layout/candidate_preview.xml
rename to java/res/layout/suggestion_preview.xml
index 32705c9..3c026ae 100644
--- a/java/res/layout/candidate_preview.xml
+++ b/java/res/layout/suggestion_preview.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/*
+/*
**
-** Copyright 2008, The Android Open Source Project
+** 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
+** 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
+** 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
+** 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.
*/
-->
diff --git a/java/res/layout/candidate_word.xml b/java/res/layout/suggestion_word.xml
similarity index 79%
rename from java/res/layout/candidate_word.xml
rename to java/res/layout/suggestion_word.xml
index b711e8f..d64cacf 100644
--- a/java/res/layout/candidate_word.xml
+++ b/java/res/layout/suggestion_word.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2010, The Android Open Source Project
+** 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.
@@ -22,12 +22,12 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:minWidth="@dimen/candidate_min_width"
- android:textSize="@dimen/candidate_text_size"
+ android:minWidth="@dimen/suggestion_min_width"
+ android:textSize="@dimen/suggestion_text_size"
android:gravity="center"
- android:paddingLeft="@dimen/candidate_padding"
+ android:paddingLeft="@dimen/suggestion_padding"
android:paddingTop="0dp"
- android:paddingRight="@dimen/candidate_padding"
+ android:paddingRight="@dimen/suggestion_padding"
android:paddingBottom="0dp"
android:focusable="false"
android:clickable="false"
diff --git a/java/res/layout/candidates_strip.xml b/java/res/layout/suggestions_strip.xml
similarity index 92%
rename from java/res/layout/candidates_strip.xml
rename to java/res/layout/suggestions_strip.xml
index fdb13f7..9252017 100644
--- a/java/res/layout/candidates_strip.xml
+++ b/java/res/layout/suggestions_strip.xml
@@ -24,12 +24,12 @@
>
<!-- Placer for debug information -->
<RelativeLayout
- android:id="@+id/candidates_placer"
+ android:id="@+id/suggestions_placer"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<LinearLayout
- android:id="@+id/candidates_strip"
+ android:id="@+id/suggestions_strip"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent" />