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

Commit 544ad438 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'LNX.LA.3.5.2.2.1_rb1' of... 

Merge branch 'LNX.LA.3.5.2.2.1_rb1' of git://codeaurora.org/platform/packages/apps/Dialer into cm-11.0

Change-Id: I7497fe21c77475625e990b707a98dbd975187984
parents 3f568b1c 475e223a

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
    <uses-permission android:name="android.permission.STOP_APP_SWITCHES" />

    <uses-permission android:name="android.permission.CAMERA" />

    <uses-permission android:name="com.qti.permission.DIAG" />

    <uses-permission android:name="com.qti.permission.IMS" />



    <application

        android:name="DialerApplication"

res/layout/dialpad_fragment.xml

+12 −3
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
                android:maxLength="2000"

                android:maxLines="3"

                android:minHeight="48dip"

                android:textColor="?android:attr/textColorPrimary"

                android:textColor="@color/dialpad_text_color"

                android:textSize="16sp" />

        </LinearLayout>
@@ -110,13 +110,21 @@ 
            android:paddingLeft="5dip"

            android:paddingRight="5dip" />



        <LinearLayout

        <View

            android:layout_width="match_parent"

            android:layout_height="@dimen/dialpad_vertical_margin"

            android:background="#66000000" />



        <TableLayout

            android:id="@+id/dialButtonContainer"

            android:layout_width="match_parent"

            android:layout_height="@dimen/fake_action_bar_height"

            android:layout_gravity="center_horizontal"

            android:background="@color/dialpad_call_button_color"

            android:layoutDirection="locale">

        <TableRow

            android:layout_height="match_parent"

            android:layout_weight="1">

            <ImageButton

                android:id="@+id/call_history_on_dialpad_button"

                android:layout_height="match_parent"
@@ -155,7 +163,8 @@ 
                android:background="@drawable/btn_call"

                android:contentDescription="@string/description_dial_button"

                android:src="@drawable/ic_add_group_holo_dark" />

        </LinearLayout>

            </TableRow>

        </TableLayout>



        <!-- "Dialpad chooser" UI, shown only when the user brings up the

             Dialer while a call is already in progress.

src/com/android/dialer/SpecialCharSequenceMgr.java

+6 −0
Original line number Diff line number Diff line
@@ -319,6 +319,9 @@ public class SpecialCharSequenceMgr { 
    private static void showIMEIPanel(Context context, boolean useSystemWindow) {

        String imeiStr;

        if (MSimTelephonyManager.getDefault().isMultiSimEnabled()) {

            int subscription = MSimTelephonyManager.getDefault().

                    getPreferredVoiceSubscription();



            imeiStr = getMSimDeviceIds(context);

        } else {

            imeiStr = ((TelephonyManager)context.
@@ -336,6 +339,9 @@ public class SpecialCharSequenceMgr { 
    private static void showMEIDPanel(Context context, boolean useSystemWindow) {

        String meidStr;

        if (MSimTelephonyManager.getDefault().isMultiSimEnabled()) {

            int subscription = MSimTelephonyManager.getDefault().

                    getPreferredVoiceSubscription();



            meidStr = getMSimDeviceIds(context);

        } else {

            meidStr = ((TelephonyManager)context.

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

+1 −1
Original line number Diff line number Diff line
@@ -1493,7 +1493,7 @@ public class DialpadFragment extends Fragment 
        // change the image visibility of the button

        if (mRecipients != null) mRecipients.setVisibility(conferenceButtonVisibility);

        if (mDialpadStub != null) mDialpadStub.setVisibility(conferenceButtonVisibility);

        if (mDigitsContainer != null) mDigitsContainer.setVisibility(nonConferenceButtonVisibility);

        if (mDigitsContainer != null) mDigitsContainer.setVisibility(View.VISIBLE);

        if (mDigits != null) mDigits.setVisibility(nonConferenceButtonVisibility);

        if (mDelete != null) mDelete.setVisibility(nonConferenceButtonVisibility);

        if (mDialpad != null) mDialpad.setVisibility(nonConferenceButtonVisibility);