Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97ec3824 authored by Wenyi Wang's avatar Wenyi Wang Committed by Android (Google) Code Review
Browse files

Merge "Bring action bar up to spec (E3)"

parents f5103c60 db662696

res/drawable/ic_menu_delete.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ 
        android:viewportHeight="24.0"

        android:viewportWidth="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:fillColor="@color/actionbar_icon_color_grey"

        android:pathData="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"/>

</vector>

res/drawable/ic_menu_link.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ 
        android:viewportHeight="24.0"

        android:viewportWidth="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:fillColor="@color/actionbar_icon_color_grey"

        android:pathData="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"/>

</vector>

res/drawable/ic_menu_share.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ 
        android:viewportHeight="24.0"

        android:viewportWidth="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:fillColor="@color/actionbar_icon_color_grey"

        android:pathData="M18 16.08c-.76 0-1.44.3-1.96.77L8.91 12.7c.05-.23.09-.46.09-.7s-.04-.47-.09-.7l7.05-4.11c.54.5 1.25.81 2.04.81 1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3c0 .24.04.47.09.7L8.04 9.81C7.5 9.31 6.79 9 6 9c-1.66 0-3 1.34-3 3s1.34 3 3 3c.79 0 1.5-.31 2.04-.81l7.12 4.16c-.05.21-.08.43-.08.65 0 1.61 1.31 2.92 2.92 2.92 1.61 0 2.92-1.31 2.92-2.92s-1.31-2.92-2.92-2.92z"/>

</vector>

res/layout/selection_bar.xml

+6 −3
Original line number Diff line number Diff line
@@ -28,16 +28,19 @@ 
        android:background="?attr/selectableItemBackgroundBorderless"

        android:contentDescription="@string/action_menu_back_from_edit_select"

        android:layout_gravity="center_vertical|start"

        android:tint="@android:color/white" />

        android:alpha="@dimen/close_icon_alpha" />



    <TextView

        android:id="@+id/selection_count_text"

        android:layout_marginStart="72dp"

        android:layout_marginEnd="@dimen/edit_group_end_margin"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:visibility="gone"

        android:layout_gravity="center_vertical|start"

        style="@style/ContactsActionBarTitleTextAppCompat" />

        android:singleLine="true"

        android:ellipsize="end"

        style="@style/ContactsActionBarTitleTextBlack" />



    <TextView

        android:id="@+id/add_contacts"
@@ -47,7 +50,7 @@ 
        android:visibility="gone"

        android:layout_gravity="center_vertical|end"

        android:text="@string/menu_add_contacts"

        android:textColor="@color/actionbar_text_color"

        android:textColor="@color/primary_color"

        android:textStyle="bold"/>



</FrameLayout>

res/values-sw600dp/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -45,4 +45,7 @@ 
    <dimen name="account_container_left_padding">16dip</dimen>

    <dimen name="contact_detail_list_top_padding">8dip</dimen>

    <dimen name="frequently_contacted_title_text_size">24sp</dimen>



    <!-- End margin of edit group title -->

    <dimen name="edit_group_end_margin">80dp</dimen>

</resources>