Improvements to multi select
* selection bar now uses an <- instead of X icon
* FAB animates away when entering either selection or search mode
* allow selection mode to be entered once already in search mode
Demo: https://drive.google.com/a/google.com/file/d/0B-vjphxTdjuANERMUDF6Y2NyQXc/view?usp=sharing
Bug: 19549465
Change-Id: I657bf564c8e6cdfca6f7779918c4807e09e78d9b
diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml
index 34612d5..7753c89 100644
--- a/res/drawable/floating_action_button.xml
+++ b/res/drawable/floating_action_button.xml
@@ -16,6 +16,10 @@
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/contacts_accent_color">
- <item android:drawable="@drawable/fab_blue" />
-</ripple>
+ android:color="@color/contacts_accent_color">
+ <item android:id="@android:id/mask">
+ <shape android:shape="oval">
+ <solid android:color="@android:color/white" />
+ </shape>
+ </item>
+</ripple>
\ No newline at end of file
diff --git a/res/layout/floating_action_button.xml b/res/layout/floating_action_button.xml
index 1541d42..294d88b 100644
--- a/res/layout/floating_action_button.xml
+++ b/res/layout/floating_action_button.xml
@@ -22,6 +22,7 @@
android:layout_height="@dimen/floating_action_button_height"
android:layout_marginEnd="@dimen/floating_action_button_margin_right"
android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
+ android:background="@drawable/fab_blue"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true">
diff --git a/res/layout/selection_bar.xml b/res/layout/selection_bar.xml
index e6b1f66..34cdd60 100644
--- a/res/layout/selection_bar.xml
+++ b/res/layout/selection_bar.xml
@@ -24,7 +24,7 @@
android:id="@+id/selection_close"
android:layout_width="48dp"
android:layout_height="48dp"
- android:src="@drawable/ic_close_dk"
+ android:src="@drawable/ic_back_arrow"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_menu_back_from_search"
android:layout_gravity="center_vertical|start"