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

Commit 683b57e1 authored by Isaac Katzenelson's avatar Isaac Katzenelson
Browse files

Options Menu layout changes 

Show correct buttons for each tab
Show correct buttons for contact viewer and editor
Removed ContactOptions activity and now showing ringtone picker
directly.
Removed all "contact options" from XMLs.

Bug: 5062002

Change-Id: Ic52eaacdc5d9b5aab55fde37181c6ad6d7154b74
parent 9e85e53e

AndroidManifest.xml

+0 −10
Original line number Diff line number Diff line
@@ -532,16 +532,6 @@ 
            android:name=".ContactSaveService"

            android:exported="false" />



        <!-- Views the details of a single contact -->

        <activity android:name="ContactOptionsActivity"

            android:label="@string/contactOptionsTitle"

        >

            <intent-filter>

                <action android:name="android.intent.action.EDIT" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <!-- Attaches a photo to a contact. Started from external applications -->

        <activity android:name=".activities.AttachPhotoActivity"

            android:label="@string/attach_photo_dialog_title"

res/layout/contact_options.xml

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

<!-- Copyright (C) 2009 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.

-->



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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

>



    <include layout="@layout/preference_with_more_button" android:id="@+id/ringtone" />

    <View

        android:layout_width="match_parent"

        android:layout_height="1dip"

        android:background="?android:attr/listDivider"

    />

    <include layout="@layout/edit_contact_entry_voicemail" android:id="@+id/voicemail"/>



</LinearLayout>

res/menu-sw580dp-w720dp/actions.xml

+9 −5
Original line number Diff line number Diff line
@@ -29,21 +29,25 @@ 
    <item

        android:id="@+id/menu_contacts_filter"

        android:icon="@drawable/ic_menu_settings_holo_light"

        android:orderInCategory="1"

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



    <item

        android:id="@+id/menu_settings"

        android:icon="@drawable/ic_menu_settings_holo_light"

        android:orderInCategory="2"

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



    <item

        android:id="@+id/menu_accounts"

        android:icon="@drawable/ic_menu_accounts_holo_light"

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



    <item

        android:id="@+id/menu_import_export"

        android:icon="@drawable/ic_menu_import_export_holo_light"

        android:orderInCategory="3"

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



    <item

        android:id="@+id/menu_accounts"

        android:icon="@drawable/ic_menu_accounts_holo_light"

        android:orderInCategory="4"

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



</menu>

res/menu-sw580dp-w720dp/view_contact.xml

+5 −9
Original line number Diff line number Diff line
@@ -22,19 +22,15 @@ 
        android:alphabeticShortcut="e"

        android:showAsAction="always" />



    <item

        android:id="@+id/menu_delete"

        android:icon="@drawable/ic_menu_trash_holo_light"

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



    <item

        android:id="@+id/menu_share"

        android:icon="@drawable/ic_menu_share_holo_light"

        android:title="@string/menu_share"

        android:alphabeticShortcut="s" />



    <item

        android:id="@+id/menu_options"

        android:icon="@drawable/ic_menu_mark"

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



    <item

        android:id="@+id/menu_delete"

        android:icon="@drawable/ic_menu_trash_holo_light"

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

</menu>

res/menu-sw580dp/actions.xml

+14 −5
Original line number Diff line number Diff line
@@ -26,24 +26,33 @@ 
        android:title="@string/menu_new_group_action_bar"

        android:showAsAction="withText" />



    <!-- Added orderInCategory to keep the following buttons at the end of the menu

         Buttons will be added in the order added/inflated. Ordered buttons will be added

         at the end according to the orderInCategory. This setup insures that the buttons below

         will be the last buttons in the menu regardless of how many buttons are added

    -->

    <item

        android:id="@+id/menu_contacts_filter"

        android:icon="@drawable/ic_menu_settings_holo_light"

        android:orderInCategory="1"

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



    <item

        android:id="@+id/menu_settings"

        android:icon="@drawable/ic_menu_settings_holo_light"

        android:orderInCategory="2"

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



    <item

        android:id="@+id/menu_accounts"

        android:icon="@drawable/ic_menu_accounts_holo_light"

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



    <item

        android:id="@+id/menu_import_export"

        android:icon="@drawable/ic_menu_import_export_holo_light"

        android:orderInCategory="3"

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



    <item

        android:id="@+id/menu_accounts"

        android:icon="@drawable/ic_menu_accounts_holo_light"

        android:orderInCategory="4"

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



</menu>