Merge "Set group activity title to label name." into ub-contactsdialer-f-dev
diff --git a/res/layout/selection_bar.xml b/res/layout/selection_bar.xml
index f8fd7fc..c2521d1 100644
--- a/res/layout/selection_bar.xml
+++ b/res/layout/selection_bar.xml
@@ -18,39 +18,41 @@
android:id="@+id/selection_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/contextual_selection_bar_color" >
+ android:background="@color/contextual_selection_bar_color">
<ImageButton
android:id="@+id/selection_close"
android:layout_width="48dp"
android:layout_height="48dp"
- android:src="@drawable/ic_close_black_24dp"
+ android:layout_gravity="center_vertical|start"
+ android:alpha="@dimen/close_icon_alpha"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_menu_back_from_edit_select"
- android:layout_gravity="center_vertical|start"
- android:alpha="@dimen/close_icon_alpha" />
+ android:src="@drawable/ic_close_black_24dp"/>
<TextView
android:id="@+id/selection_count_text"
- android:layout_marginStart="72dp"
- android:layout_marginEnd="@dimen/edit_group_end_margin"
+ style="@style/ContactsActionBarTitleTextBlack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:visibility="gone"
android:layout_gravity="center_vertical|start"
- android:singleLine="true"
+ android:layout_marginEnd="@dimen/edit_group_end_margin"
+ android:layout_marginStart="72dp"
android:ellipsize="end"
- style="@style/ContactsActionBarTitleTextBlack" />
+ android:singleLine="true"
+ android:visibility="gone"/>
<TextView
android:id="@+id/add_contacts"
- android:layout_marginEnd="16dp"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone"
+ android:layout_height="48dp"
android:layout_gravity="center_vertical|end"
+ android:gravity="center"
+ android:paddingEnd="16dp"
+ android:paddingStart="16dp"
android:text="@string/menu_add_contacts"
android:textColor="@color/primary_color"
- android:textStyle="bold"/>
+ android:textStyle="bold"
+ android:visibility="gone"/>
</FrameLayout>