diff options
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | res/layout/dialpad_fragment.xml | 15 | ||||
| -rw-r--r-- | src/com/android/dialer/SpecialCharSequenceMgr.java | 6 | ||||
| -rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 2 |
4 files changed, 20 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7b6b2a6db..dabfbebed 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -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" diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml index 2f256b8ef..3738af55d 100644 --- a/res/layout/dialpad_fragment.xml +++ b/res/layout/dialpad_fragment.xml @@ -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. diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java index 02deb66c6..60bf0fb44 100644 --- a/src/com/android/dialer/SpecialCharSequenceMgr.java +++ b/src/com/android/dialer/SpecialCharSequenceMgr.java @@ -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. diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index 65b6a9d70..48446e097 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -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); |