Moved Paste popup window up in TextView

Bug 3228601

A tap on the insertion handle displays the paste popup immediately.
Tapping again hides the popup.
Bug 3248651

Change-Id: I5a501b3ebe36e23cbbf0f1b3d588884c6ecd1d56

2 files changed, 23 insertions, 41 deletions

diff --git a/core/res/res/layout/text_edit_no_paste_window.xml b/core/res/res/layout/text_edit_no_paste_window.xml
index d409d97..fa50275 100644
--- a/core/res/res/layout/text_edit_no_paste_window.xml
+++ b/core/res/res/layout/text_edit_no_paste_window.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2010 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.
@@ -14,34 +14,25 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@android:drawable/text_edit_paste_window">
-
-    <ImageView android:id="@+id/paste_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dip"
-        android:paddingRight="8dip"
-        android:paddingTop="8dip"
-        android:paddingBottom="8dip"
-        android:layout_centerVertical="true"
-        android:background="@android:drawable/ic_menu_paste_dark"
-    />
+    android:layout_height="wrap_content">
 
     <TextView android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingLeft="0dip"
+        android:paddingLeft="16dip"
         android:paddingRight="16dip"
         android:paddingTop="8dip"
         android:paddingBottom="8dip"
-        android:layout_centerVertical="true"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="@android:string/pasteDisabled"
+        android:drawableLeft="@android:drawable/ic_menu_paste_dark"
+        android:drawablePadding="8dip"
+        android:gravity="center"
+        android:textAppearance="?android:attr/textAppearanceMediumInverse"
         android:textColor="@android:color/dim_foreground_dark_inverse_disabled"
-        android:layout_toRightOf="@id/paste_icon"
+        android:background="@android:drawable/text_edit_paste_window"
+        android:text="@android:string/pasteDisabled"
+        android:layout_marginBottom="12dip"
     />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/core/res/res/layout/text_edit_paste_window.xml b/core/res/res/layout/text_edit_paste_window.xml
index d153365..575b98e 100644
--- a/core/res/res/layout/text_edit_paste_window.xml
+++ b/core/res/res/layout/text_edit_paste_window.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2010 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.
@@ -14,34 +14,25 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@android:drawable/text_edit_paste_window">
-
-    <ImageView android:id="@+id/paste_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dip"
-        android:paddingRight="8dip"
-        android:paddingTop="8dip"
-        android:paddingBottom="8dip"
-        android:layout_centerVertical="true"
-        android:background="@android:drawable/ic_menu_paste_light"
-    />
+    android:layout_height="wrap_content">
 
     <TextView android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingLeft="0dip"
+        android:paddingLeft="16dip"
         android:paddingRight="16dip"
         android:paddingTop="8dip"
         android:paddingBottom="8dip"
-        android:layout_centerVertical="true"
+        android:drawableLeft="@android:drawable/ic_menu_paste_light"
+        android:drawablePadding="8dip"
+        android:gravity="center"
         android:textAppearance="?android:attr/textAppearanceMediumInverse"
-        android:text="@android:string/paste"
         android:textColor="@android:color/black"
-        android:layout_toRightOf="@id/paste_icon"
+        android:background="@android:drawable/text_edit_paste_window"
+        android:text="@android:string/paste"
+        android:layout_marginBottom="12dip"
     />
 
-</RelativeLayout>
+</LinearLayout>