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

Commit c72f419b authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Add "Call with Note" from dialpad. 

Bug: 22685114
Change-Id: Id7d16634a0baad03b28b509b62315f43fa022ee4
parent 20c63bb4

AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -172,6 +172,13 @@ 
            </intent-filter>

        </activity>



        <activity android:name="com.android.contacts.common.dialog.CallSubjectHistory"

                  android:theme="@style/Theme.CallSubjectSelector">

            <intent-filter>

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

            </intent-filter>

        </activity>



        <!-- Backwards compatibility: "Phone" from Gingerbread and earlier -->

        <activity-alias android:name="DialtactsActivity"

            android:targetActivity=".DialtactsActivity"

res/menu/dialpad_options.xml

+4 −1
Original line number Diff line number Diff line
@@ -23,5 +23,8 @@ 
        android:id="@+id/menu_add_wait"

        android:title="@string/add_wait"

        android:showAsAction="withText" />



    <item

        android:id="@+id/menu_call_with_note"

        android:title="@string/call_with_a_note"

        android:showAsAction="withText" />

</menu>

src/com/android/dialer/dialpad/DialpadFragment.java

+11 −2
Original line number Diff line number Diff line
@@ -67,7 +67,9 @@ import android.widget.PopupMenu; 
import android.widget.RelativeLayout;

import android.widget.TextView;



import com.android.contacts.common.CallUtil;

import com.android.contacts.common.GeoUtil;

import com.android.contacts.common.dialog.CallSubjectDialog;

import com.android.contacts.common.util.PermissionsUtil;

import com.android.contacts.common.util.PhoneNumberFormatter;

import com.android.contacts.common.util.StopWatch;
@@ -896,9 +898,12 @@ public class DialpadFragment extends Fragment 


                boolean enable = !isDigitsEmpty();

                for (int i = 0; i < menu.size(); i++) {

                    menu.getItem(i).setEnabled(enable);

                    MenuItem item = menu.getItem(i);

                    item.setEnabled(enable);

                    if (item.getItemId() == R.id.menu_call_with_note) {

                        item.setVisible(CallUtil.isCallWithSubjectSupported(getContext()));

                    }

                }



                super.show();

            }

        };
@@ -1470,6 +1475,10 @@ public class DialpadFragment extends Fragment 
            case R.id.menu_add_wait:

                updateDialString(WAIT);

                return true;

            case R.id.menu_call_with_note:

                CallSubjectDialog.start(getActivity(), mDigits.getText().toString());

                hideAndClearDialpad(false);

                return true;

            default:

                return false;

        }