Loading AndroidManifest.xml +1 −1 Original line number Diff line number Diff line Loading @@ -49,7 +49,7 @@ </intent-filter> </activity> <activity android:name="DialerPreferences"> <activity android:name="ContactsPreferences"> <intent-filter> <action android:name="android.intent.action.VIEW" /> <category android:name="android.intent.category.DEFAULT" /> Loading res/values/strings.xml +2 −0 Original line number Diff line number Diff line Loading @@ -743,4 +743,6 @@ <string name="menu_preferences">Settings</string> <string name="title_dialer_category">Dialer</string> </resources> No newline at end of file res/xml/dialer_preferences.xml→res/xml/contacts_preferences.xml +18 −14 Original line number Diff line number Diff line Loading @@ -18,6 +18,8 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceCategory android:title="@string/title_dialer_category"> <ListPreference android:key="vm_button" android:title="@string/title_vm_button" Loading @@ -34,4 +36,6 @@ android:entryValues="@array/entryvalues_numbers" android:defaultValue="0" /> </PreferenceCategory> </PreferenceScreen> No newline at end of file src/com/android/contacts/DialerPreferences.java→src/com/android/contacts/ContactsPreferences.java +3 −3 Original line number Diff line number Diff line Loading @@ -30,9 +30,9 @@ import android.content.pm.ResolveInfo; import android.util.Log; public class DialerPreferences extends PreferenceActivity implements Preference.OnPreferenceChangeListener { public class ContactsPreferences extends PreferenceActivity implements Preference.OnPreferenceChangeListener { private static final String TAG = "DialerPreferences"; private static final String TAG = "ContactsPreferences"; private ListPreference mVMButton; private ListPreference mVMHandler; Loading @@ -42,7 +42,7 @@ public class DialerPreferences extends PreferenceActivity implements Preference. super.onCreate(savedInstanceState); // Load the preferences from an XML resource addPreferencesFromResource(R.xml.dialer_preferences); addPreferencesFromResource(R.xml.contacts_preferences); mVMButton = (ListPreference) findPreference("vm_button"); mVMHandler = (ListPreference) findPreference("vm_handler"); Loading src/com/android/contacts/DialtactsActivity.java +4 −0 Original line number Diff line number Diff line Loading @@ -25,6 +25,7 @@ import android.net.Uri; import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; import android.preference.PreferenceManager; import android.provider.CallLog; import android.provider.Contacts; import android.provider.CallLog.Calls; Loading @@ -35,6 +36,7 @@ import android.view.Window; import android.widget.TabHost; import com.android.internal.telephony.ITelephony; /** * The dialer activity that has one tab with the virtual 12key dialer, * and another tab with recent calls in it. This is the container and the tabs Loading Loading @@ -66,6 +68,8 @@ public class DialtactsActivity extends TabActivity implements TabHost.OnTabChang protected void onCreate(Bundle icicle) { super.onCreate(icicle); PreferenceManager.setDefaultValues(this, R.xml.contacts_preferences, false); final Intent intent = getIntent(); fixIntent(intent); Loading Loading
AndroidManifest.xml +1 −1 Original line number Diff line number Diff line Loading @@ -49,7 +49,7 @@ </intent-filter> </activity> <activity android:name="DialerPreferences"> <activity android:name="ContactsPreferences"> <intent-filter> <action android:name="android.intent.action.VIEW" /> <category android:name="android.intent.category.DEFAULT" /> Loading
res/values/strings.xml +2 −0 Original line number Diff line number Diff line Loading @@ -743,4 +743,6 @@ <string name="menu_preferences">Settings</string> <string name="title_dialer_category">Dialer</string> </resources> No newline at end of file
res/xml/dialer_preferences.xml→res/xml/contacts_preferences.xml +18 −14 Original line number Diff line number Diff line Loading @@ -18,6 +18,8 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceCategory android:title="@string/title_dialer_category"> <ListPreference android:key="vm_button" android:title="@string/title_vm_button" Loading @@ -34,4 +36,6 @@ android:entryValues="@array/entryvalues_numbers" android:defaultValue="0" /> </PreferenceCategory> </PreferenceScreen> No newline at end of file
src/com/android/contacts/DialerPreferences.java→src/com/android/contacts/ContactsPreferences.java +3 −3 Original line number Diff line number Diff line Loading @@ -30,9 +30,9 @@ import android.content.pm.ResolveInfo; import android.util.Log; public class DialerPreferences extends PreferenceActivity implements Preference.OnPreferenceChangeListener { public class ContactsPreferences extends PreferenceActivity implements Preference.OnPreferenceChangeListener { private static final String TAG = "DialerPreferences"; private static final String TAG = "ContactsPreferences"; private ListPreference mVMButton; private ListPreference mVMHandler; Loading @@ -42,7 +42,7 @@ public class DialerPreferences extends PreferenceActivity implements Preference. super.onCreate(savedInstanceState); // Load the preferences from an XML resource addPreferencesFromResource(R.xml.dialer_preferences); addPreferencesFromResource(R.xml.contacts_preferences); mVMButton = (ListPreference) findPreference("vm_button"); mVMHandler = (ListPreference) findPreference("vm_handler"); Loading
src/com/android/contacts/DialtactsActivity.java +4 −0 Original line number Diff line number Diff line Loading @@ -25,6 +25,7 @@ import android.net.Uri; import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; import android.preference.PreferenceManager; import android.provider.CallLog; import android.provider.Contacts; import android.provider.CallLog.Calls; Loading @@ -35,6 +36,7 @@ import android.view.Window; import android.widget.TabHost; import com.android.internal.telephony.ITelephony; /** * The dialer activity that has one tab with the virtual 12key dialer, * and another tab with recent calls in it. This is the container and the tabs Loading Loading @@ -66,6 +68,8 @@ public class DialtactsActivity extends TabActivity implements TabHost.OnTabChang protected void onCreate(Bundle icicle) { super.onCreate(icicle); PreferenceManager.setDefaultValues(this, R.xml.contacts_preferences, false); final Intent intent = getIntent(); fixIntent(intent); Loading