diff options
| author | Brian Attwell <brianattwell@google.com> | 2015-04-22 18:08:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-22 18:08:54 +0000 |
| commit | 585bdaea755cb6e22cae8f843b6b453622b6e01f (patch) | |
| tree | 15bc8ba41f2b2a60b127e7bd6487ebbcfecd0f31 /res | |
| parent | 06e2cead02680ef5b521681380c24f89808f9ae9 (diff) | |
| parent | 865847b1f567cb28664a57ac9cac05c3f2a8de32 (diff) | |
| download | packages_apps_Contacts-585bdaea755cb6e22cae8f843b6b453622b6e01f.tar.gz packages_apps_Contacts-585bdaea755cb6e22cae8f843b6b453622b6e01f.tar.bz2 packages_apps_Contacts-585bdaea755cb6e22cae8f843b6b453622b6e01f.zip | |
Merge "Improvements to multi select"
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable/floating_action_button.xml | 10 | ||||
| -rw-r--r-- | res/layout/floating_action_button.xml | 1 | ||||
| -rw-r--r-- | res/layout/selection_bar.xml | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml index 34612d523..7753c8996 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 1541d42d2..294d88b55 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 e6b1f6608..34cdd6051 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" |