Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge "Reorganize Phone Settings"

  • Loading branch information...
commit 5a4f9e514919ff2a7551d2a3838d452505d62dcc 2 parents 8ae1f22 + 12410b8
Daisuke Miyakawa authored Android (Google) Code Review committed
4 res/values/strings.xml
@@ -1465,4 +1465,8 @@
1465 1465 <!-- Setting option name to enable or disable DTMF tone sound
1466 1466 [CHAR LIMIT=40] -->
1467 1467 <string name="dtmf_tone_enable_title">Dial pad touch tones</string>
  1468 +
  1469 + <!-- Title for the category "ringtone", which is shown above ringote settings
  1470 + [CHAR LIMIT=40] -->
  1471 + <string name="preference_category_ringtone">Ringtone</string>
1468 1472 </resources>
120 res/xml/call_feature_setting.xml
@@ -15,75 +15,52 @@
15 15 -->
16 16 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
17 17 xmlns:phone="http://schemas.android.com/apk/res/com.android.phone"
18   - android:title="@string/call_settings">
  18 + android:title="@string/call_settings">
19 19
20   - <com.android.phone.DefaultRingtonePreference
21   - android:key="button_ringtone_key"
22   - android:title="@string/ringtone_title"
23   - android:dialogTitle="@string/ringtone_title"
24   - android:persistent="false"
25   - android:ringtoneType="ringtone" />
26   -
27   - <CheckBoxPreference
28   - android:key="button_vibrate_on_ring"
29   - android:title="@string/vibrate_on_ring_title"
30   - android:persistent="false"
31   - android:defaultValue="false" />
32   -
33   - <CheckBoxPreference
34   - android:key="button_play_dtmf_tone"
35   - android:title="@string/dtmf_tone_enable_title"
36   - android:persistent="false"
37   - android:defaultValue="true" />
38   -
39   - <PreferenceScreen
40   - android:key="button_fdn_key"
41   - android:title="@string/fdn"
42   - android:summary="@string/sum_fdn"
  20 + <PreferenceCategory
  21 + android:key="button_ringtone_category_key"
  22 + android:title="@string/preference_category_ringtone"
43 23 android:persistent="false">
44 24
45   - <intent android:action="android.intent.action.MAIN"
46   - android:targetPackage="com.android.phone"
47   - android:targetClass="com.android.phone.FdnSetting" />
  25 + <com.android.phone.DefaultRingtonePreference
  26 + android:key="button_ringtone_key"
  27 + android:title="@string/ringtone_title"
  28 + android:dialogTitle="@string/ringtone_title"
  29 + android:persistent="false"
  30 + android:ringtoneType="ringtone" />
48 31
49   - </PreferenceScreen>
50   -
51   - <PreferenceScreen
52   - android:key="button_respond_via_sms_key"
53   - android:title="@string/respond_via_sms_setting_title"
54   - android:summary="@string/respond_via_sms_setting_summary"
55   - android:persistent="false">
56   -
57   - <intent android:action="android.intent.action.MAIN"
58   - android:targetPackage="com.android.phone"
59   - android:targetClass="com.android.phone.RespondViaSmsManager$Settings" />
60   - </PreferenceScreen>
  32 + <CheckBoxPreference
  33 + android:key="button_vibrate_on_ring"
  34 + android:title="@string/vibrate_on_ring_title"
  35 + android:persistent="false"
  36 + android:defaultValue="false" />
  37 + </PreferenceCategory>
61 38
62 39 <PreferenceCategory
63 40 android:key="button_voicemail_category_key"
64 41 android:title="@string/voicemail"
65 42 android:persistent="false">
66   - <ListPreference
67   - android:key="button_voicemail_provider_key"
68   - android:title="@string/voicemail_provider"
69   - android:summary="@string/sum_voicemail_choose_provider"
70   - android:defaultValue=""
71   - android:persistent="true"
72   - />
73   - <PreferenceScreen android:key="button_voicemail_setting_key"
  43 + <ListPreference
  44 + android:key="button_voicemail_provider_key"
  45 + android:title="@string/voicemail_provider"
  46 + android:summary="@string/sum_voicemail_choose_provider"
  47 + android:defaultValue=""
  48 + android:persistent="true" />
  49 + <PreferenceScreen
  50 + android:key="button_voicemail_setting_key"
74 51 android:title="@string/voicemail_settings"
75 52 android:persistent="false">
76 53
77 54 <!-- Note for all com.android.phone.EditPhoneNumberPreference objects
78 55
79   - The last several attributes are for use with the EditText field
80   - in the dialog. These attributes are forwarded to that field
81   - when the edittext is created. The attributes include:
82   - 1. android:singleLine
83   - 2. android:autoText
84   - 3. android:background -->
  56 + The last several attributes are for use with the EditText field
  57 + in the dialog. These attributes are forwarded to that field
  58 + when the edittext is created. The attributes include:
  59 + 1. android:singleLine
  60 + 2. android:autoText
  61 + 3. android:background -->
85 62
86   - <com.android.phone.EditPhoneNumberPreference
  63 + <com.android.phone.EditPhoneNumberPreference
87 64 android:key="button_voicemail_key"
88 65 android:title="@string/voicemail_settings_number_label"
89 66 android:persistent="false"
@@ -91,7 +68,7 @@
91 68 phone:confirmMode="confirm"
92 69 android:singleLine="true"
93 70 android:autoText="false" />
94   - </PreferenceScreen>
  71 + </PreferenceScreen>
95 72
96 73 <RingtonePreference
97 74 android:key="button_voicemail_notification_ringtone_key"
@@ -110,9 +87,36 @@
110 87 android:dialogTitle="@string/voicemail_notification_vibarte_when_dialog_title" />
111 88 </PreferenceCategory>
112 89
113   - <PreferenceCategory android:key="button_misc_category_key"
114   - android:title="@string/other_settings"
115   - android:persistent="false" />
  90 + <PreferenceCategory
  91 + android:key="button_misc_category_key"
  92 + android:title="@string/other_settings"
  93 + android:persistent="false" />
  94 +
  95 + <CheckBoxPreference
  96 + android:key="button_play_dtmf_tone"
  97 + android:title="@string/dtmf_tone_enable_title"
  98 + android:persistent="false"
  99 + android:defaultValue="true" />
  100 +
  101 + <PreferenceScreen
  102 + android:key="button_respond_via_sms_key"
  103 + android:title="@string/respond_via_sms_setting_title"
  104 + android:summary="@string/respond_via_sms_setting_summary"
  105 + android:persistent="false">
  106 + <intent
  107 + android:action="android.intent.action.MAIN"
  108 + android:targetPackage="com.android.phone"
  109 + android:targetClass="com.android.phone.RespondViaSmsManager$Settings" />
  110 + </PreferenceScreen>
  111 +
  112 + <PreferenceScreen
  113 + android:key="button_fdn_key"
  114 + android:title="@string/fdn"
  115 + android:persistent="false">
  116 + <intent android:action="android.intent.action.MAIN"
  117 + android:targetPackage="com.android.phone"
  118 + android:targetClass="com.android.phone.FdnSetting" />
  119 + </PreferenceScreen>
116 120
117 121 <CheckBoxPreference
118 122 android:key="button_auto_retry_key"
3  src/com/android/phone/CallFeaturesSetting.java
@@ -1830,7 +1830,6 @@ private void updateVMPreferenceWidgets(String currentProviderSetting) {
1830 1830 log("updateVMPreferenceWidget: provider for the key \"" + key + "\" is null.");
1831 1831 }
1832 1832 mVoicemailProviders.setSummary(getString(R.string.sum_voicemail_choose_provider));
1833   - mVoicemailSettings.setSummary("");
1834 1833 mVoicemailSettings.setEnabled(false);
1835 1834 mVoicemailSettings.setIntent(null);
1836 1835
@@ -1844,8 +1843,6 @@ private void updateVMPreferenceWidgets(String currentProviderSetting) {
1844 1843 }
1845 1844 final String providerName = provider.name;
1846 1845 mVoicemailProviders.setSummary(providerName);
1847   - mVoicemailSettings.setSummary(getApplicationContext().getString(
1848   - R.string.voicemail_settings_for, providerName));
1849 1846 mVoicemailSettings.setEnabled(true);
1850 1847 mVoicemailSettings.setIntent(provider.intent);
1851 1848

0 comments on commit 5a4f9e5

Please sign in to comment.
Something went wrong with that request. Please try again.