Skip to content

Commit

Permalink
(Telephony)(3 of 3) Bring in CM10 Dialer. Thanks cyanogenmod.
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit f2838f9
Author: Danesh M <daneshm90@gmail.com>
Date:   Mon Jul 16 08:46:23 2012 -0400

    Phone: Dialpad settings

    Change-Id: I0d9e6a747c5c5b8d08883f697c672a63d1d3624c

commit 6c01519
Author: Ricardo Cerqueira <github@cerqueira.org>
Date:   Tue Apr 17 01:34:31 2012 +0100

    Phone: Enable LTE for GSM LTE phones (part I)

    Change-Id: I580c37f3272c8cc8363e8db5b1c227bf6f74a04a

Change-Id: Ie038e87d61fd83d650f607ebe789247df55158f5

Conflicts:

	src/com/android/phone/PhoneInterfaceManager.java

Signed-off-by: qnhoang81 <qnhoang81@yahoo.com>
  • Loading branch information
qnhoang81 authored and Gerrit Code Review committed Aug 11, 2012
1 parent c3aa495 commit c9a0bb7
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
4 changes: 4 additions & 0 deletions res/values/strings.xml
Expand Up @@ -1080,6 +1080,10 @@
<!-- Title displayed above settings coming after voicemail in the call features screen -->
<string name="other_settings">Other call settings</string>

<!-- Dialer UI Settings -->
<string name="dialer_ui_settings_title">Dialpad settings</string>
<string name="dialer_ui_settings_summary">Settings for the dialpad</string>

<!-- Title displayed in the overlay when a call is placed using a 3rd party provider.
[CHAR LIMIT=40] -->
<string name="calling_via_template">Calling via <xliff:g id="provider_name">%s</xliff:g></string>
Expand Down
11 changes: 11 additions & 0 deletions res/xml/call_feature_setting.xml
Expand Up @@ -180,4 +180,15 @@
android:targetPackage="com.android.phone"
android:targetClass="com.android.phone.CdmaCallOptions"/>
</PreferenceScreen>

<PreferenceScreen
android:title="@string/dialer_ui_settings_title"
android:summary="@string/dialer_ui_settings_summary"
android:persistent="false">

<intent android:action="android.intent.action.MAIN"
android:targetPackage="com.android.contacts"
android:targetClass="com.android.contacts.preference.DialpadPreferenceActivity"/>
</PreferenceScreen>

</PreferenceScreen>

0 comments on commit c9a0bb7

Please sign in to comment.