Merge branch 'donut' of git://github.com/Wysie/android_packages_apps_Contacts into donut (fd72b091) · Commits · e / os / android_packages_apps_Contacts

res/values/strings.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -772,6 +772,7 @@
		<string name="title_use_1_for_reg_vm">Use 1 for regular voicemail</string>
		<string name="summaryon_use_1_for_reg_vm">Key 1 will be used for regular voicemail</string>
		<string name="summaryoff_use_1_for_reg_vm">Key 1 will follow voicemail handler</string>
		<string name="title_enable_haptic_feedback">Enable haptic feedback</string>

		<string name="title_digits_color_unselected">Digits color (not selected)</string>
		<string name="title_digits_color_focused">Digits color (focused)</string>
		@@ -817,7 +818,7 @@
		<string name="title_about_name">Mod Name</string>
		<string name="summary_about_name">Wysie Contacts</string>
		<string name="title_about_version">Version</string>
		<string name="summary_about_version">2.01</string>
		<string name="summary_about_version">2.11</string>
		<string name="title_about_credits">Credits</string>
		<string name="summary_about_credits">ChainsDD and the rest of XDA! :)</string>

res/xml/contacts_preferences.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,10 @@
		android:summaryOn="@string/summaryon_disable_num_check"
		android:summaryOff="@string/summaryoff_disable_num_check"
		android:defaultValue="false" />
		<CheckBoxPreference
		android:key="dial_enable_haptic"
		android:title="@string/title_enable_haptic_feedback"
		android:defaultValue="false" />
		<PreferenceScreen
		android:key="dial_digits_color"
		android:title="@string/title_change_digits_color">

src/com/android/contacts/ContactsListActivity.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -332,7 +332,7 @@ public final class ContactsListActivity extends ListActivity
		private String mShortcutAction;
		private boolean mDefaultMode = false;
		private boolean mFavTab = false;
		private boolean mDisplaySectionHeaders = true;
		private boolean mDisplaySectionHeaders = false; //With it set to false, separators will only show in "Contacts" tab, and based on prefs.
		private boolean mContactsTab = false;

		//MenuItem for Clear Freq. Called
		@@ -1980,7 +1980,10 @@ public final class ContactsListActivity extends ListActivity
		final ContactListItemCache cache = (ContactListItemCache) view.getTag();
		if (!displaySectionHeaders) {
		cache.header.setVisibility(View.GONE);
		cache.divider.setVisibility(View.VISIBLE);

		//Wysie_Soh: AOSP master sets it to View.VISIBLE. I think it's a mistake cause it simply makes the separator between
		//each contact thicker.
		cache.divider.setVisibility(View.GONE);
		} else {
		final int section = getSectionForPosition(position);
		if (getPositionForSection(section) == position) {
		@@ -1996,10 +1999,13 @@ public final class ContactsListActivity extends ListActivity
		}

		// move the divider for the last item in a section
		//
		if (getPositionForSection(section + 1) - 1 == position) {
		cache.divider.setVisibility(View.GONE);
		} else {
		// Wysie_Soh: AOSP master sets it to View.GONE, seems like a mistake
		cache.divider.setVisibility(View.VISIBLE);
		} else {
		// Wysie_Soh: AOSP master sets it to View.VISIBLE, seems like a mistake
		cache.divider.setVisibility(View.GONE);
		}
		}
		}

src/com/android/contacts/TwelveKeyDialer.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@ import android.view.MenuItem.OnMenuItemClickListener;
		import com.android.internal.telephony.ITelephony;
		import android.content.res.Configuration;


		/**
		* Dialer activity that displays the typical twelve key interface.
		*/
		@@ -105,6 +106,7 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
		private View mVoicemailDialAndDeleteRow;
		private ImageButton mVoicemailButton, mDialButton, mDelete;
		private SharedPreferences prefs;
		private Vibrator vibrator;

		private ListView mDialpadChooser;
		private DialpadChooserAdapter mDialpadChooserAdapter;
		@@ -226,6 +228,9 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
		initVoicemailButton();
		checkForNumber();

		//Wysie_Soh: Initialize vibrator
		vibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE);

		// If the mToneGenerator creation fails, just continue without it. It is
		// a local audio signal, and is not as important as the dtmf tone itself.
		synchronized (mToneGeneratorLock) {
		@@ -618,6 +623,10 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
		}

		public void onClick(View view) {
		if (prefs.getBoolean("dial_enable_haptic", false)) {
		vibrator.vibrate(50);
		}

		switch (view.getId()) {
		case R.id.one: {
		playTone(ToneGenerator.TONE_DTMF_1);
		@@ -713,6 +722,10 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
		}

		public boolean onLongClick(View view) {
		if (prefs.getBoolean("dial_enable_haptic", false)) {
		vibrator.vibrate(50);
		}

		Editable digits = mDigits.getText();
		int id = view.getId();
		switch (id) {

src/com/android/contacts/ViewContactActivity.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -917,7 +917,7 @@ public class ViewContactActivity extends ListActivity
		case Contacts.KIND_IM: {
		Object protocolObj = ContactMethods.decodeImProtocol(
		methodsCursor.getString(METHODS_AUX_DATA_COLUMN));
		String host;
		String host = null;
		if (protocolObj instanceof Number) {
		int protocol = ((Number) protocolObj).intValue();
		entry.label = buildActionString(R.string.actionChat,
		@@ -927,8 +927,12 @@ public class ViewContactActivity extends ListActivity
		\|\| protocol == ContactMethods.PROTOCOL_MSN) {
		entry.maxLabelLines = 2;
		}
		} else {
		}
		//Wysie_Soh: 2.11, temp fix for some people whose Contacts are not saved properly (probably some other app)
		//Default AOSP code does not have the if part, just else (no checks)
		else if (protocolObj != null) {
		String providerName = (String) protocolObj;

		entry.label = buildActionString(R.string.actionChat,
		providerName, false);
		host = providerName.toLowerCase();