diff --git a/xwords4/android/app/src/main/res/layout/chat.xml b/xwords4/android/app/src/main/res/layout/chat.xml
index cdaa787cd..b0ac5d6eb 100644
--- a/xwords4/android/app/src/main/res/layout/chat.xml
+++ b/xwords4/android/app/src/main/res/layout/chat.xml
@@ -30,7 +30,6 @@
     <EditText android:id="@+id/chat_edit"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:singleLine="false"
               android:inputType="textCapSentences|textMultiLine"
               android:layout_weight="1"
               android:scrollHorizontally="false"
diff --git a/xwords4/android/app/src/main/res/layout/dflt_name.xml b/xwords4/android/app/src/main/res/layout/dflt_name.xml
index dc1425dfb..ea9261cc6 100644
--- a/xwords4/android/app/src/main/res/layout/dflt_name.xml
+++ b/xwords4/android/app/src/main/res/layout/dflt_name.xml
@@ -12,7 +12,7 @@
             android:layout_marginRight="30dip"
             android:autoText="false"
             android:capitalize="words"
-            android:singleLine="true"
+            android:maxLines="1"
             android:selectAllOnFocus="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
             />
diff --git a/xwords4/android/app/src/main/res/layout/dict_browser.xml b/xwords4/android/app/src/main/res/layout/dict_browser.xml
index 15ea2f71c..6e34e698b 100644
--- a/xwords4/android/app/src/main/res/layout/dict_browser.xml
+++ b/xwords4/android/app/src/main/res/layout/dict_browser.xml
@@ -26,7 +26,7 @@
     <EditText android:id="@+id/word_edit" 
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:singleLine="true"
+              android:maxLines="1"
               android:layout_weight="1"
               android:hint="@string/word_search_hint"
               android:capitalize="characters"
diff --git a/xwords4/android/app/src/main/res/layout/game_config.xml b/xwords4/android/app/src/main/res/layout/game_config.xml
index d65e76933..b58d9cbad 100644
--- a/xwords4/android/app/src/main/res/layout/game_config.xml
+++ b/xwords4/android/app/src/main/res/layout/game_config.xml
@@ -140,7 +140,7 @@
                       android:scrollHorizontally="false"
                       android:autoText="false"
                       android:capitalize="none"
-                      android:singleLine="true"
+                      android:maxLines="1"
                       android:selectAllOnFocus="true"
                       android:windowSoftInputMode="stateHidden"
                       android:maxLength="31"
diff --git a/xwords4/android/app/src/main/res/layout/game_list_item.xml b/xwords4/android/app/src/main/res/layout/game_list_item.xml
index f1665fec4..f55934df2 100644
--- a/xwords4/android/app/src/main/res/layout/game_list_item.xml
+++ b/xwords4/android/app/src/main/res/layout/game_list_item.xml
@@ -66,7 +66,7 @@
                      android:layout_height="wrap_content"
                      android:gravity="center"
                      android:layout_weight="1"
-                     android:singleLine="true"
+                     android:maxLines="1"
                      android:textAppearance="?android:attr/textAppearanceMedium"
                      />
 
diff --git a/xwords4/android/app/src/main/res/layout/get_relay.xml b/xwords4/android/app/src/main/res/layout/get_relay.xml
index 186f92600..d1350131e 100644
--- a/xwords4/android/app/src/main/res/layout/get_relay.xml
+++ b/xwords4/android/app/src/main/res/layout/get_relay.xml
@@ -19,7 +19,7 @@
             android:layout_marginLeft="30dip"
             android:layout_marginRight="30dip"
             android:autoText="false"
-            android:singleLine="true"
+            android:maxLines="1"
             android:selectAllOnFocus="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
             />
@@ -37,7 +37,7 @@
             android:layout_marginLeft="30dip"
             android:layout_marginRight="30dip"
             android:autoText="false"
-            android:singleLine="true"
+            android:maxLines="1"
             android:selectAllOnFocus="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
             />
diff --git a/xwords4/android/app/src/main/res/layout/get_sms.xml b/xwords4/android/app/src/main/res/layout/get_sms.xml
index 118fddcf4..65dd5910e 100644
--- a/xwords4/android/app/src/main/res/layout/get_sms.xml
+++ b/xwords4/android/app/src/main/res/layout/get_sms.xml
@@ -19,7 +19,7 @@
             android:layout_marginLeft="30dip"
             android:layout_marginRight="30dip"
             android:autoText="false"
-            android:singleLine="true"
+            android:maxLines="1"
             android:selectAllOnFocus="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
             />
@@ -37,7 +37,7 @@
             android:layout_marginLeft="30dip"
             android:layout_marginRight="30dip"
             android:autoText="false"
-            android:singleLine="true"
+            android:maxLines="1"
             android:selectAllOnFocus="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
             />
diff --git a/xwords4/android/app/src/main/res/layout/list_item.xml b/xwords4/android/app/src/main/res/layout/list_item.xml
index 5b8b1f555..4aa520d2b 100644
--- a/xwords4/android/app/src/main/res/layout/list_item.xml
+++ b/xwords4/android/app/src/main/res/layout/list_item.xml
@@ -31,7 +31,7 @@
 	              android:layout_height="wrap_content"
                   android:layout_weight="1"
    	              android:textAppearance="?android:attr/textAppearanceMedium"
-                  android:singleLine="true"
+                  android:maxLines="1"
                   />
 
         <TextView android:id="@+id/text_item2"
@@ -39,7 +39,7 @@
 	              android:layout_height="wrap_content"
                   android:layout_weight="1"
                   android:gravity="right"
-                  android:singleLine="true"
+                  android:maxLines="1"
                   android:visibility="gone"
                   />
 
diff --git a/xwords4/android/app/src/main/res/layout/loc_list_item.xml b/xwords4/android/app/src/main/res/layout/loc_list_item.xml
index e3d1d9f8b..48326a1a6 100644
--- a/xwords4/android/app/src/main/res/layout/loc_list_item.xml
+++ b/xwords4/android/app/src/main/res/layout/loc_list_item.xml
@@ -9,11 +9,11 @@
 
     <TextView android:id="@+id/english_view"
               style="@style/evenly_spaced_horizontal"
-              android:singleLine="true"
+              android:maxLines="1"
               />
     <TextView android:id="@+id/xlated_view"
               style="@style/evenly_spaced_horizontal"
-              android:singleLine="true"
+              android:maxLines="1"
               />
 
 </org.eehouse.android.xw4.loc.LocListItem>
diff --git a/xwords4/android/app/src/main/res/layout/loc_main.xml b/xwords4/android/app/src/main/res/layout/loc_main.xml
index 8fad9f96a..f45901867 100644
--- a/xwords4/android/app/src/main/res/layout/loc_main.xml
+++ b/xwords4/android/app/src/main/res/layout/loc_main.xml
@@ -37,7 +37,7 @@
       <EditText android:id="@+id/loc_search_field"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:layout_weight="1"
                 />
 
diff --git a/xwords4/android/app/src/main/res/layout/player_edit.xml b/xwords4/android/app/src/main/res/layout/player_edit.xml
index cf5427b14..ac5dd25e8 100644
--- a/xwords4/android/app/src/main/res/layout/player_edit.xml
+++ b/xwords4/android/app/src/main/res/layout/player_edit.xml
@@ -55,7 +55,7 @@
                 android:capitalize="words"
                 android:selectAllOnFocus="true"
                 android:gravity="fill_horizontal"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:textAppearance="?android:attr/textAppearanceMedium" 
                 />
 
@@ -105,7 +105,7 @@
                   android:capitalize="none"
                   android:gravity="fill_horizontal"
                   android:password="true"
-                  android:singleLine="true"
+                  android:maxLines="1"
                   android:textAppearance="?android:attr/textAppearanceMedium"
                   />
       </LinearLayout>
diff --git a/xwords4/android/app/src/main/res/layout/player_list_elem.xml b/xwords4/android/app/src/main/res/layout/player_list_elem.xml
index f8c865a1d..81c3c090e 100644
--- a/xwords4/android/app/src/main/res/layout/player_list_elem.xml
+++ b/xwords4/android/app/src/main/res/layout/player_list_elem.xml
@@ -9,13 +9,13 @@
   <TextView android:id="@+id/item_name"
             android:layout_width="wrap_content" 
 	        android:layout_height="wrap_content"
-            android:singleLine="true"
+            android:maxLines="1"
 	        android:gravity="left"
             />
   <TextView android:id="@+id/item_score"
             android:layout_width="fill_parent" 
 	        android:layout_height="wrap_content"
-            android:singleLine="true"
+            android:maxLines="1"
 	        android:gravity="right"
             />
 </org.eehouse.android.xw4.ExpiringLinearLayout>
diff --git a/xwords4/android/app/src/main/res/layout/rename_game.xml b/xwords4/android/app/src/main/res/layout/rename_game.xml
index f6dca767b..84bcb62fe 100644
--- a/xwords4/android/app/src/main/res/layout/rename_game.xml
+++ b/xwords4/android/app/src/main/res/layout/rename_game.xml
@@ -20,7 +20,7 @@
             android:layout_marginLeft="30dip"
             android:layout_marginRight="30dip"
             android:autoText="false"
-            android:singleLine="true"
+            android:maxLines="1"
             android:selectAllOnFocus="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
             />