summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-05-07 02:01:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-07 02:01:13 +0000
commit861fd2a2737051843582c4261567342016853868 (patch)
tree21586ebf5849d63dde70cfa3eb518189f427adc9 /res
parentcdfa6c66fa29ee0de675cd77b3bc72f6fba5ef0c (diff)
parent2826619b274772beebc7369d5dfe616344f74b6f (diff)
downloadpackages_apps_Dialer-861fd2a2737051843582c4261567342016853868.tar.gz
packages_apps_Dialer-861fd2a2737051843582c4261567342016853868.tar.bz2
packages_apps_Dialer-861fd2a2737051843582c4261567342016853868.zip
Merge "Refactor drag and drop to work for entire Dialer layout"
Diffstat (limited to 'res')
-rw-r--r--res/layout/dialtacts_activity.xml51
1 files changed, 29 insertions, 22 deletions
diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml
index 2cd796b60..e4e2a238b 100644
--- a/res/layout/dialtacts_activity.xml
+++ b/res/layout/dialtacts_activity.xml
@@ -46,30 +46,37 @@
android:id="@+id/search_and_remove_view_container"
android:visibility="gone"
>
- <com.android.dialer.list.RemoveView
- android:layout_width="match_parent"
- android:layout_height="56dp"
- android:id="@+id/remove_view_container"
- android:orientation="horizontal"
- android:gravity="center">
- <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"
- />
- </com.android.dialer.list.RemoveView>
</FrameLayout>
</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">
+ <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:layout_height="@dimen/floating_action_button_height"
android:layout_width="@dimen/floating_action_button_width"