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

Commit 1390f85d authored by Katherine Kuan's avatar Katherine Kuan
Browse files

Modify action bar for group editor and group card 

- Remove home icon in group card
- Change done/cancel buttons in editor
- Remove old honeycomb style on editor activities
and have it use the new split style solid action bar one

Bug: 5081353
Change-Id: Ie39f7f1ea5bd80d5246158442325207effd6aff7
parent e09c1147

res/layout/contact_editor_custom_action_bar.xml→res/layout/editor_custom_action_bar.xml

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
                android:layout_gravity="center_vertical"

                android:layout_marginRight="20dip"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:textColor="@android:color/white"

                android:text="@string/menu_done"

                style="@android:style/Widget.Holo.ActionBar.TabText" />

res/menu/edit_group.xml

+2 −9
Original line number Diff line number Diff line
@@ -15,16 +15,9 @@ 
-->



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

    <item

        android:id="@+id/menu_done"

        android:alphabeticShortcut="\n"

        android:icon="@drawable/ic_menu_done_holo_light"

        android:title="@string/menu_done"

        android:showAsAction="always|withText" />



    <item

        android:id="@+id/menu_discard"

        android:alphabeticShortcut="q"

        android:title="@string/menu_doNotSave"

        android:showAsAction="always|withText" />

        android:title="@string/menu_discard"

        android:showAsAction="withText" />

</menu>

res/values-sw580dp/styles.xml

+0 −9
Original line number Diff line number Diff line
@@ -83,15 +83,6 @@ 
        <item name="android:windowContentOverlay">@null</item>

    </style>



    <style name="ContactEditorActivityTheme" parent="@android:Theme.Holo.Light">

        <item name="android:actionBarStyle">@style/TransparentActionBarStyle</item>

        <item name="android:windowContentOverlay">@null</item>

    </style>



    <style name="TransparentActionBarStyle" parent="android:Widget.Holo.Light.ActionBar">

        <item name="android:background">@null</item>

    </style>



    <style name="DirectoryHeader" parent="PeopleTheme">

        <item name="android:background">@drawable/directory_bg_holo</item>

    </style>

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ 
    <!-- Menu item to indicate you are done editing a contact and want to save the changes you've made -->

    <string name="menu_done">Done</string>



    <!-- Menu item to indicate you want to stop editing a group and NOT save the changes you've made [CHAR LIMIT=12] -->

    <!-- Menu item to indicate you want to cancel the current editing process and NOT save the changes you've made [CHAR LIMIT=12] -->

    <string name="menu_doNotSave">Cancel</string>



    <!-- Menu item to indicate you want to stop editing a contact and NOT save the changes you've made [CHAR LIMIT=12] -->

src/com/android/contacts/activities/ContactEditorActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -84,8 +84,7 @@ public class ContactEditorActivity extends ContactsActivity 
            // to the contact

            LayoutInflater inflater = (LayoutInflater) getSystemService

                    (Context.LAYOUT_INFLATER_SERVICE);

            View customActionBarView = inflater.inflate(R.layout.contact_editor_custom_action_bar,

                    null);

            View customActionBarView = inflater.inflate(R.layout.editor_custom_action_bar, null);

            View saveMenuItem = customActionBarView.findViewById(R.id.save_menu_item);

            saveMenuItem.setOnClickListener(new OnClickListener() {

                @Override