Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
diff --git a/res/layout/candidate_scale_up.xml b/res/layout/candidate_scale_up.xml
index 506144f..e1d52a1 100644
--- a/res/layout/candidate_scale_up.xml
+++ b/res/layout/candidate_scale_up.xml
@@ -19,12 +19,12 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:background="@color/candidate_back"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<TextView
android:id="@+id/candidate_scale_up_text"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/candidate_back"
android:textSize="@dimen/candidate_delete_word_size"
@@ -33,26 +33,26 @@
/>
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
>
<jp.co.omronsoft.openwnn.CandidateViewButton
android:id="@+id/candidate_select"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_width="wrap_content"
android:text="@string/button_candidate_select"
/>
<jp.co.omronsoft.openwnn.CandidateViewButton
android:id="@+id/candidate_delete"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_width="wrap_content"
android:text="@string/button_candidate_delete"
android:visibility="gone"
/>
<jp.co.omronsoft.openwnn.CandidateViewButton
android:id="@+id/candidate_cancel"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_width="wrap_content"
android:text="@string/button_candidate_cancel"
/>
diff --git a/res/layout/candidates.xml b/res/layout/candidates.xml
index d5009df..dc26030 100644
--- a/res/layout/candidates.xml
+++ b/res/layout/candidates.xml
@@ -18,12 +18,12 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<ScrollView
android:id="@+id/candview_scroll"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fadingEdgeLength="0dip"
android:scrollbars="vertical"
@@ -31,25 +31,25 @@
<LinearLayout
android:id="@+id/candview_base"
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/candidate_back"
>
<!--View
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:background="@drawable/candidate_top"
/-->
<LinearLayout
android:id="@+id/candidates_1st_view"
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/candidate_back"
/>
<AbsoluteLayout
android:id="@+id/candidates_2nd_view"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/candidate_back"
/>
@@ -58,7 +58,7 @@
<LinearLayout
android:id="@+id/read_more"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fadingEdgeLength="0dip"
android:orientation="vertical"
diff --git a/res/layout/keyboard_android_default.xml b/res/layout/keyboard_android_default.xml
index c49308e..3fd8738 100644
--- a/res/layout/keyboard_android_default.xml
+++ b/res/layout/keyboard_android_default.xml
@@ -18,7 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/keyboard"
android:layout_alignParentBottom="true"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
diff --git a/res/layout/keyboard_default_main.xml b/res/layout/keyboard_default_main.xml
index b1cc5c9..f93b7e8 100644
--- a/res/layout/keyboard_default_main.xml
+++ b/res/layout/keyboard_default_main.xml
@@ -16,7 +16,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fadingEdge="vertical"
android:fadingEdgeLength="5dip"
diff --git a/res/layout/keyboard_default_sub.xml b/res/layout/keyboard_default_sub.xml
index ab9dec3..2be1552 100644
--- a/res/layout/keyboard_default_sub.xml
+++ b/res/layout/keyboard_default_sub.xml
@@ -16,7 +16,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/subview"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/indicator_textbackground_default"
android:paddingLeft="2dip"
diff --git a/res/layout/keyboard_metal.xml b/res/layout/keyboard_metal.xml
index 3154862..9acfa2c 100644
--- a/res/layout/keyboard_metal.xml
+++ b/res/layout/keyboard_metal.xml
@@ -18,7 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/keyboard"
android:layout_alignParentBottom="true"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:keyBackground="@drawable/keybg_metal_def"
/>
diff --git a/res/layout/keyboard_simple.xml b/res/layout/keyboard_simple.xml
index d0c4845..befe34f 100644
--- a/res/layout/keyboard_simple.xml
+++ b/res/layout/keyboard_simple.xml
@@ -18,7 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/keyboard"
android:layout_alignParentBottom="true"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:keyBackground="@drawable/keybg_simple_def"
android:background="@drawable/keybg_simple_bg"
diff --git a/res/layout/user_dictionary_tools_edit.xml b/res/layout/user_dictionary_tools_edit.xml
index 8df045b..5886857 100644
--- a/res/layout/user_dictionary_tools_edit.xml
+++ b/res/layout/user_dictionary_tools_edit.xml
@@ -16,33 +16,33 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dip"
android:text="@string/user_dictionary_title_read"
android:textAppearance="?android:attr/textAppearanceLarge"/>
<EditText android:id="@+id/editRead"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLength="20"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dip"
android:text="@string/user_dictionary_title_candidate"
android:textAppearance="?android:attr/textAppearanceLarge"/>
<EditText android:id="@+id/editCandidate"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLength="20"/>
<RelativeLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:layout_marginTop="1dip"
android:background="@android:drawable/bottom_bar">
diff --git a/res/layout/user_dictionary_tools_edit_header.xml b/res/layout/user_dictionary_tools_edit_header.xml
index 1d71b63..5e4c5d6 100644
--- a/res/layout/user_dictionary_tools_edit_header.xml
+++ b/res/layout/user_dictionary_tools_edit_header.xml
@@ -15,8 +15,8 @@
limitations under the License.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
diff --git a/res/layout/user_dictionary_tools_list.xml b/res/layout/user_dictionary_tools_list.xml
index 22a99fb..4ebfbd8 100644
--- a/res/layout/user_dictionary_tools_list.xml
+++ b/res/layout/user_dictionary_tools_list.xml
@@ -17,12 +17,12 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:paddingTop="5sp"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:orientation="horizontal"
android:gravity="center"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
android:id="@+id/user_dictionary_left_button"
@@ -42,7 +42,7 @@
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="1dip"
android:layout_gravity="left">
@@ -75,11 +75,11 @@
</LinearLayout>
<ScrollView
android:id="@+id/user_dictionary_tools_scroll"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TableLayout
android:id="@+id/user_dictionary_tools_table"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="1dip">
</TableLayout>
diff --git a/res/layout/user_dictionary_tools_list_header.xml b/res/layout/user_dictionary_tools_list_header.xml
index cab5c08..3e5159c 100644
--- a/res/layout/user_dictionary_tools_list_header.xml
+++ b/res/layout/user_dictionary_tools_list_header.xml
@@ -15,8 +15,8 @@
limitations under the License.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
diff --git a/res/layout/user_dictionary_tools_list_header_ja.xml b/res/layout/user_dictionary_tools_list_header_ja.xml
index 3ddf937..0db6f27 100644
--- a/res/layout/user_dictionary_tools_list_header_ja.xml
+++ b/res/layout/user_dictionary_tools_list_header_ja.xml
@@ -15,8 +15,8 @@
limitations under the License.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
diff --git a/src/jp/co/omronsoft/openwnn/TextCandidatesViewManager.java b/src/jp/co/omronsoft/openwnn/TextCandidatesViewManager.java
index 360d49c..c84e845 100644
--- a/src/jp/co/omronsoft/openwnn/TextCandidatesViewManager.java
+++ b/src/jp/co/omronsoft/openwnn/TextCandidatesViewManager.java
@@ -45,7 +45,6 @@
import android.widget.ScrollView;
import android.widget.TextView;
import android.widget.EditText;
-import android.widget.RelativeLayout;
import android.widget.AbsoluteLayout;
import android.widget.ImageView;
import android.graphics.drawable.Drawable;
@@ -369,7 +368,7 @@
LinearLayout lineView = new LinearLayout(mViewBodyScroll.getContext());
lineView.setOrientation(LinearLayout.HORIZONTAL);
LinearLayout.LayoutParams layoutParams =
- new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT,
+ new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT);
lineView.setLayoutParams(layoutParams);
for (int j = 0; j < (width / getCandidateMinimumWidth()); j++) {
diff --git a/src/jp/co/omronsoft/openwnn/UserDictionaryToolsList.java b/src/jp/co/omronsoft/openwnn/UserDictionaryToolsList.java
index 962a7ae..15d1f4a 100644
--- a/src/jp/co/omronsoft/openwnn/UserDictionaryToolsList.java
+++ b/src/jp/co/omronsoft/openwnn/UserDictionaryToolsList.java
@@ -675,7 +675,7 @@
row.addView(stroke);
row.addView(candidate);
- mTableLayout.addView(row, tableCreateParam(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+ mTableLayout.addView(row, tableCreateParam(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
}
}
