Change owner info to be a dialog rather than screen

Bug: 15937670
Change-Id: I8d8609ff165c4a76e318a80a62fb1dc9effbc82a

1 files changed, 19 insertions, 60 deletions

diff --git a/res/layout/ownerinfo.xml b/res/layout/ownerinfo.xml
index 6adec7d..80f0192 100644
--- a/res/layout/ownerinfo.xml
+++ b/res/layout/ownerinfo.xml
@@ -16,70 +16,29 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingStart="20dip"
+    android:paddingEnd="20dip"
+    android:paddingTop="20dip"
     android:orientation="vertical"
-    android:scrollbars="vertical"
     android:background="@android:color/white">
 
-    <ScrollView
+    <EditText
+        android:id="@+id/owner_info_edit_text"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbarStyle="outsideOverlay"
-        android:fillViewport="true">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-
-            <View
-                android:paddingTop="53dip"
-                android:layout_width="match_parent"
-                android:layout_height="1dip"
-                android:background="#ff404040"
-                />
-
-            <EditText android:id="@+id/owner_info_nickname"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dip"
-                android:gravity="top"
-                android:hint="@string/user_nickname"
-                android:inputType="textCapWords"
-            />
-
-            <CheckBox android:id="@+id/show_owner_info_on_lockscreen_checkbox"
-                android:layout_width="match_parent"
-                android:layout_height="64dip"
-                android:gravity="center_vertical"
-                android:layout_marginTop="8dip"
-                android:text="@string/show_owner_info_on_lockscreen_label"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="?android:attr/textColorSecondary"
-            />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dip"
-                android:background="#ff404040"
-                />
-
-            <EditText android:id="@+id/owner_info_edit_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="62dip"
-                android:layout_marginTop="40dip"
-                android:gravity="top"
-                android:hint="@string/owner_info_settings_edit_text_hint"
-                android:lines="8"
-                android:maxLines="8"
-                android:inputType="textMultiLine|textCapSentences"
-            />
-
-        </LinearLayout>
-
-    </ScrollView>
+        android:layout_height="wrap_content"
+        android:gravity="top"
+        android:hint="@string/owner_info_settings_edit_text_hint"
+        android:maxLength="100"
+        android:inputType="textMultiLine|textCapSentences"
+        />
+
+    <TextView
+        android:id="@+id/owner_info_status"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="end"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        />
 
 </LinearLayout>