Merge "Remove the menu title from the screen for GET INPUT and DISPLAY TEXT" am: 41b8b6f6eb am: a605d75628

am: dad8944256

Change-Id: I8043cbdb84886a3cf6da4ad7c16291faf9a2ca9a

2 files changed, 113 insertions, 79 deletions

diff --git a/res/layout/stk_input.xml b/res/layout/stk_input.xml
index fdc554d..40c8b77 100755
--- a/res/layout/stk_input.xml
+++ b/res/layout/stk_input.xml
@@ -14,99 +14,113 @@
      limitations under the License.
 -->
 
-<ScrollView
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    <LinearLayout
-        android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <ImageButton
+        style="@android:style/Widget.Material.ActionButton.Overflow"
+        android:id="@+id/more"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="20dip"
-        android:layout_gravity="center_horizontal">
-        <ImageView
-            android:id="@+id/icon"
-            android:visibility="gone"
-            android:layout_width="@android:dimen/notification_large_icon_width"
-            android:layout_height="@android:dimen/notification_large_icon_height"
-            android:adjustViewBounds="true"
-            android:layout_gravity="center"
-            android:scaleType="fitCenter"/>
-        <TextView
-            android:id="@+id/prompt"
-            android:visibility="gone"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="?android:attr/textColorPrimary"
-            android:gravity="center_horizontal"
-            android:paddingBottom="30dip" />
+        android:gravity="center_horizontal"
+        android:layout_gravity="end"
+        android:visibility="gone" />
+    <ScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="20dip"
+            android:layout_gravity="center_horizontal">
+            <ImageView
+                android:id="@+id/icon"
+                android:visibility="gone"
+                android:layout_width="@android:dimen/notification_large_icon_width"
+                android:layout_height="@android:dimen/notification_large_icon_height"
+                android:adjustViewBounds="true"
+                android:layout_gravity="center"
+                android:scaleType="fitCenter"/>
+            <TextView
+                android:id="@+id/prompt"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="?android:attr/textColorPrimary"
+                android:gravity="center_horizontal"
+                android:paddingBottom="30dip" />
             <LinearLayout
-                android:id="@+id/normal_layout"
-                android:visibility="visible"
-                android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
                 android:layout_height="wrap_content">
                 <LinearLayout
-                    android:id="@+id/input_restriction_info"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="4dip"
-                    android:orientation="horizontal">
-                    <TextView
-                        android:id="@+id/input_type"
-                        android:gravity="left"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textColor="?android:attr/textColorSecondary"
+                    android:id="@+id/normal_layout"
+                    android:visibility="visible"
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="10dip"
+                    android:layout_height="wrap_content">
+                    <LinearLayout
+                        android:id="@+id/input_restriction_info"
                         android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dip"
+                        android:orientation="horizontal">
+                        <TextView
+                            android:id="@+id/input_type"
+                            android:gravity="left"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:textColor="?android:attr/textColorSecondary"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content" />
+                        <TextView
+                            android:id="@+id/num_of_chars"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:textColor="?android:attr/textColorSecondary"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="4dip" />
+                    </LinearLayout>
+                    <EditText
+                        android:id="@+id/in_text"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginBottom="20dip"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
-                    <TextView
-                        android:id="@+id/num_of_chars"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:layout_width="wrap_content"
+                    <Button
+                        android:id="@+id/button_ok"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_width="100sp"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="4dip" />
+                        android:textStyle="bold"
+                        android:text="@string/button_ok" />
                 </LinearLayout>
-                <EditText
-                    android:id="@+id/in_text"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginBottom="20dip"
+                <LinearLayout
+                    android:id="@+id/yes_no_layout"
+                    android:visibility="gone"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-                <Button
-                    android:id="@+id/button_ok"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_width="100sp"
                     android:layout_height="wrap_content"
-                    android:textStyle="bold"
-                    android:text="@string/button_ok" />
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/yes_no_layout"
-                android:visibility="gone"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal">
-                <Button
-                    android:id="@+id/button_yes"
-                    android:layout_width="100sp"
-                    android:layout_height="wrap_content"
-                    android:textStyle="bold"
-                    android:text="@string/button_yes" />
-                <Button
-                    android:id="@+id/button_no"
-                    android:layout_marginLeft="10dip"
-                    android:layout_width="100sp"
-                    android:layout_height="wrap_content"
-                    android:textStyle="bold"
-                    android:text="@string/button_no" />
+                    android:gravity="center_horizontal">
+                    <Button
+                        android:id="@+id/button_yes"
+                        android:layout_width="100sp"
+                        android:layout_height="wrap_content"
+                        android:textStyle="bold"
+                        android:text="@string/button_yes" />
+                    <Button
+                        android:id="@+id/button_no"
+                        android:layout_marginLeft="10dip"
+                        android:layout_width="100sp"
+                        android:layout_height="wrap_content"
+                        android:textStyle="bold"
+                        android:text="@string/button_no" />
+                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
-</ScrollView>
+    </ScrollView>
+</LinearLayout>
diff --git a/res/values/config.xml b/res/values/config.xml
new file mode 100755
index 0000000..d5f912e
--- /dev/null
+++ b/res/values/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+
+<resources>
+    <!-- Determines if alpha identifier of SET-UP MENU command is used for the menu title only -->
+    <bool name="show_menu_title_only_on_menu">true</bool>
+</resources>