From f4315c29db9e9f38d3c84998c159c1b246290c70 Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Mon, 23 May 2016 22:36:17 -0700
Subject: [PATCH] Update EditText input options.

---
 .../res/layout/create_home_screen_shortcut_dialog.xml  |  6 +++---
 app/src/main/res/layout/url_bar.xml                    |  5 +++--
 app/src/main/res/xml/preferences.xml                   | 10 +++++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/create_home_screen_shortcut_dialog.xml b/app/src/main/res/layout/create_home_screen_shortcut_dialog.xml
index 2391e8f6..6cf50f00 100644
--- a/app/src/main/res/layout/create_home_screen_shortcut_dialog.xml
+++ b/app/src/main/res/layout/create_home_screen_shortcut_dialog.xml
@@ -25,8 +25,8 @@
     android:layout_height="wrap_content" >
 
     <!-- android:imeOptions="actionGo" sets the keyboard to have a "go" key instead of a "new line" key. -->
-    <!-- android:inputType="textUri" disables spell check in the EditText and changes the "go" key from a check mark to an arrow. -->
-    <!-- android:imeOptions="actionGo" sets the keyboard to have a "go" key instead of a "new line" key. -->
+    <!-- android:imeOptions=flagNoExtractUi" doesn't cover up the entire UI when typing in landscape orientation. -->
+    <!-- android:inputType="textUri" disables spell check in the EditText. -->
     <EditText
         android:id="@+id/shortcutNameEditText"
         android:layout_width="match_parent"
@@ -35,7 +35,7 @@
         android:layout_marginLeft="4dp"
         android:layout_marginRight="4dp"
         android:layout_marginBottom="16dp"
-        android:imeOptions="actionGo"
+        android:imeOptions="actionGo|flagNoExtractUi"
         android:inputType="textUri" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/url_bar.xml b/app/src/main/res/layout/url_bar.xml
index 27288be8..8b6e3761 100644
--- a/app/src/main/res/layout/url_bar.xml
+++ b/app/src/main/res/layout/url_bar.xml
@@ -42,7 +42,8 @@
             android:contentDescription="@string/favorite_icon"/>
 
         <!-- android:imeOptions="actionGo" sets the keyboard to have a "go" key instead of a "new line" key. -->
-        <!-- android:inputType="textUri" disables spell check in the EditText and changes the "go" key from a check mark to an arrow. -->
+        <!-- android:imeOptions=flagNoExtractUi" doesn't cover up the entire UI when typing in landscape orientation. -->
+        <!-- android:inputType="textUri" disables spell check in the EditText. -->
         <!-- android:layout_toEndOf requires API >= 17, but is compatible with right-to-left layouts.  android:layout_toRightOf is required for previous APIs. -->
         <EditText
             android:id="@+id/urlTextBox"
@@ -50,7 +51,7 @@
             android:layout_height="wrap_content"
             android:layout_toEndOf="@id/favoriteIcon"
             android:layout_toRightOf="@id/favoriteIcon"
-            android:imeOptions="actionGo"
+            android:imeOptions="actionGo|flagNoExtractUi"
             android:inputType="textUri" />
     </RelativeLayout>
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 5124481b..03b835e0 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -54,13 +54,14 @@
             android:entryValues="@array/user_agent_entry_values"
             android:defaultValue="Default user agent" />
 
-        // Android doesn't let EditTextPreferences have more than one line, but singleLine="false" is included in case they ever wisen up.
+        <!-- android:inputType="textVisiblePassword" sets the keyboard to have a dedicated number row. -->
+        <!-- android:imeOptions="flagNoExtractUi" is not set because with the dedicated number row there often isn't room to see the EditText in landscape orientation. -->
         <EditTextPreference
             android:key="custom_user_agent"
             android:title="@string/custom_user_agent"
             android:defaultValue="PrivacyBrowser/1.0"
-            android:inputType="textUri"
-            android:singleLine="false"/>
+            android:inputType="textVisiblePassword|textMultiLine" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -74,6 +75,7 @@
             android:entryValues="@array/javascript_disabled_search_entry_values"
             android:defaultValue="https://duckduckgo.com/html/?q=" />
 
+        <!-- android:imeOptions="flagNoExtractUi" is not set because with the the length of the title of the dialog box there often isn't enough space to see the EditText in landscape orientation. -->
         <EditTextPreference
             android:key="javascript_disabled_search_custom_url"
             android:title="@string/javascript_disabled_search_custom_url"
@@ -88,6 +90,7 @@
             android:entryValues="@array/javascript_enabled_search_entry_values"
             android:defaultValue="https://duckduckgo.com/?q=" />
 
+        <!-- android:imeOptions="flagNoExtractUi" is not set because with the the length of the title of the dialog box there often isn't enough space to see the EditText in landscape orientation. -->
         <EditTextPreference
             android:key="javascript_enabled_search_custom_url"
             android:title="@string/javascript_enabled_search_custom_url"
@@ -100,6 +103,7 @@
         android:key="general"
         android:title="@string/general" >
 
+        <!-- android:imeOptions="flagNoExtractUi" is not set because in special character mode there often isn't enough space to see the EditText in landscape orientation. -->
         <EditTextPreference
             android:key="homepage"
             android:title="@string/homepage_preference"
-- 
2.43.0