From 1896344b53ddf6cdaf17dc02a05c45f587879d99 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Fri, 6 Jun 2014 17:20:13 -0700
Subject: Revise remove view target positioning.

- Move placement from dialtacts activity layout to the lists fragment,
so that it can be positioned over the tab bar.
- Relocate references to RemoveView/RemoveViewContainer to the lists
fragment from the activity class.
- Set colors using tints, remove old highlight state asset.
- Fade out search bar and recent card when dragging.

Bug: 15434489
Change-Id: I49205c79aeb008a30efc3c2ea417b8836444e203
---
 res/drawable-hdpi/ic_remove_highlight.png   | Bin 717 -> 0 bytes
 res/drawable-mdpi/ic_remove_highlight.png   | Bin 587 -> 0 bytes
 res/drawable-xhdpi/ic_remove_highlight.png  | Bin 974 -> 0 bytes
 res/drawable-xxhdpi/ic_remove_highlight.png | Bin 1590 -> 0 bytes
 res/layout/dialtacts_activity.xml           |  43 +-------------
 res/layout/lists_fragment.xml               |  86 ++++++++++++++++++++++------
 res/values/colors.xml                       |   3 +-
 7 files changed, 69 insertions(+), 63 deletions(-)
 delete mode 100644 res/drawable-hdpi/ic_remove_highlight.png
 delete mode 100644 res/drawable-mdpi/ic_remove_highlight.png
 delete mode 100644 res/drawable-xhdpi/ic_remove_highlight.png
 delete mode 100644 res/drawable-xxhdpi/ic_remove_highlight.png

(limited to 'res')

diff --git a/res/drawable-hdpi/ic_remove_highlight.png b/res/drawable-hdpi/ic_remove_highlight.png
deleted file mode 100644
index 435ee36b0..000000000
Binary files a/res/drawable-hdpi/ic_remove_highlight.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_remove_highlight.png b/res/drawable-mdpi/ic_remove_highlight.png
deleted file mode 100644
index 6a961cbb2..000000000
Binary files a/res/drawable-mdpi/ic_remove_highlight.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_remove_highlight.png b/res/drawable-xhdpi/ic_remove_highlight.png
deleted file mode 100644
index 57949e317..000000000
Binary files a/res/drawable-xhdpi/ic_remove_highlight.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_remove_highlight.png b/res/drawable-xxhdpi/ic_remove_highlight.png
deleted file mode 100644
index 23ee8f6da..000000000
Binary files a/res/drawable-xxhdpi/ic_remove_highlight.png and /dev/null differ
diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml
index c7a788da8..71e58cb48 100644
--- a/res/layout/dialtacts_activity.xml
+++ b/res/layout/dialtacts_activity.xml
@@ -35,49 +35,8 @@
             android:layout_height="match_parent"
             android:layout_width="match_parent"
             android:id="@+id/dialtacts_frame"
-            android:clipChildren="false"
-            >
-        </FrameLayout>
-        <!-- Search entry box and remove view -->
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:id="@+id/search_and_remove_view_container"
-            android:visibility="gone"
-            >
-        </FrameLayout>
+            android:clipChildren="false" />
     </RelativeLayout>
-    <com.android.dialer.list.RemoveView
-        android:layout_width="match_parent"
-        android:layout_height="56dp"
-        android:id="@+id/remove_view"
-        android:layout_alignParentTop="true"
-        >
-        <LinearLayout
-            android:id="@+id/remove_view_container"
-            android:layout_height="match_parent"
-            android:layout_width="match_parent"
-            android:gravity="center"
-            android:orientation="horizontal"
-            android:visibility="gone" >
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/remove_view_icon"
-                android:src="@drawable/ic_remove"
-                android:contentDescription="@string/remove_contact"
-                />
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/remove_view_text"
-                android:textSize="@dimen/remove_text_size"
-                android:textColor="@color/remove_text_color"
-                android:text="@string/remove_contact"
-                />
-        </LinearLayout>
-    </com.android.dialer.list.RemoveView >
     <FrameLayout
         android:id="@+id/floating_action_button_container"
         android:layout_width="@dimen/floating_action_button_width"
diff --git a/res/layout/lists_fragment.xml b/res/layout/lists_fragment.xml
index 02dcbe3a0..1de8364b7 100644
--- a/res/layout/lists_fragment.xml
+++ b/res/layout/lists_fragment.xml
@@ -16,10 +16,11 @@
 
 <com.android.dialer.widget.OverlappingPaneLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/lists_frame"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:animateLayoutChanges="true"
-    android:id="@+id/lists_frame">
+    android:animateLayoutChanges="true" >
+
     <ListView
         android:id="@+id/shortcut_card_list"
         android:layout_width="match_parent"
@@ -29,24 +30,71 @@
         android:clipToPadding="false"
         android:fadingEdge="none"
         android:divider="@null" />
-    <LinearLayout
+
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-        <com.android.dialer.list.ViewPagerTabs
-            android:id="@+id/lists_pager_header"
+        android:layout_height="match_parent">
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/tab_height"
-            android:textAllCaps="true"
-            android:orientation="horizontal"
-            android:layout_gravity="top"
-            android:elevation="@dimen/tab_elevation"
-            style="@style/DialtactsActionBarTabTextStyle" />
-        <android.support.v4.view.ViewPager
-            android:id="@+id/lists_pager"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <com.android.dialer.list.ViewPagerTabs
+                android:id="@+id/lists_pager_header"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/tab_height"
+                android:textAllCaps="true"
+                android:orientation="horizontal"
+                android:layout_gravity="top"
+                android:elevation="@dimen/tab_elevation"
+                style="@style/DialtactsActionBarTabTextStyle" />
+
+            <android.support.v4.view.ViewPager
+                android:id="@+id/lists_pager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+        </LinearLayout>
+
+        <com.android.dialer.list.RemoveView
+            android:id="@+id/remove_view"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-        </android.support.v4.view.ViewPager>
-    </LinearLayout>
+            android:layout_height="@dimen/tab_height"
+            android:layout_alignParentTop="true" >
+
+            <LinearLayout
+                android:id="@+id/remove_view_content"
+                android:layout_height="match_parent"
+                android:layout_width="match_parent"
+                android:background="@color/actionbar_background_color"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:visibility="gone" >
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:id="@+id/remove_view_icon"
+                    android:src="@drawable/ic_remove"
+                    android:contentDescription="@string/remove_contact"
+                    android:tint="@color/remove_text_color" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/remove_view_text"
+                    android:textSize="@dimen/remove_text_size"
+                    android:textColor="@color/remove_text_color"
+                    android:text="@string/remove_contact" />
+
+            </LinearLayout>
+
+        </com.android.dialer.list.RemoveView >
+
+    </FrameLayout>
+
 </com.android.dialer.widget.OverlappingPaneLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a5ad64167..e4df4d0a0 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -72,8 +72,7 @@
     <!-- Text color for no favorites message -->
     <color name="nofavorite_text_color">#777777</color>
 
-    <!-- Text color for the "Remove" text in its regular state -->
-    <color name="remove_text_color">#555555</color>
+    <color name="remove_text_color">#ffffff</color>
 
     <!-- Text color for the "Remove" text when a contact is dragged on top of the remove view -->
     <color name="remove_highlighted_text_color">#FF3F3B</color>
-- 
cgit v1.2.3