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

Commit f5493a63 authored by Wenyi Wang's avatar Wenyi Wang
Browse files

Bring action bar up to spec (E2) 

* Reorder delete, link and share and show icons.
* Replace check mark with "Add" TextView in multi select mode of
  ContactSelectionActivity

Bug 29831679

Change-Id: I87988019d4fc59d674ae0cf13ce26a7d4ef27db3
parent 5e19c23a

res/drawable/ic_menu_delete.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- A trash can icon (ic_menu_delete) -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportHeight="24.0"

        android:viewportWidth="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        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

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- ic_menu_link -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportHeight="24.0"

        android:viewportWidth="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        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

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- ic_menu_share -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportHeight="24.0"

        android:viewportWidth="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        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

+11 −0
Original line number Diff line number Diff line
@@ -39,4 +39,15 @@ 
        android:layout_gravity="center_vertical|start"

        style="@style/ContactsActionBarTitleTextAppCompat" />



    <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_gravity="center_vertical|end"

        android:text="@string/menu_add_contacts"

        android:textColor="@color/actionbar_text_color"

        android:textStyle="bold"/>



</FrameLayout>

res/menu/group_member_picker.xml

+0 −6
Original line number Diff line number Diff line
@@ -17,12 +17,6 @@ 
<menu xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:contacts="http://schemas.android.com/apk/res-auto">



    <item

        android:id="@+id/menu_done"

        android:icon="@drawable/ic_done_wht_24dp"

        android:title="@string/menu_addContactsToGroup"

        contacts:showAsAction="always" />



    <item

        android:id="@+id/menu_select"

        android:title="@string/menu_selectForGroup" />