Reverted to a version before I used GitHub. Some bugs when I was merging code :(. (9127e389) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/TwelveKeyDialer.java

+19 −28

Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
		private static final int TONE_RELATIVE_VOLUME = 50;

		private EditText mDigits;
		private View mDelete;
		private MenuItem mAddToContactMenuItem, mPreferences;
		private ToneGenerator mToneGenerator;
		private Object mToneGeneratorLock = new Object();
		@@ -94,7 +95,8 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
		private Drawable mDigitsEmptyBackground;
		private View mDialpad;
		private View mVoicemailDialAndDeleteRow;
		private ImageButton mVoicemailButton, mDialButton, mDelete;
		private ImageButton mVoicemailButton;
		private View mDialButton;

		private ListView mDialpadChooser;
		private DialpadChooserAdapter mDialpadChooserAdapter;
		@@ -185,7 +187,7 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
		mVoicemailDialAndDeleteRow = findViewById(R.id.voicemailAndDialAndDelete);

		// Check whether we should show the onscreen "Dial" button.
		mDialButton = (ImageButton)mVoicemailDialAndDeleteRow.findViewById(R.id.dialButton);
		mDialButton = mVoicemailDialAndDeleteRow.findViewById(R.id.dialButton);

		// if (r.getBoolean(R.bool.config_show_onscreen_dial_button)) {
		mDialButton.setOnClickListener(this);
		@@ -194,9 +196,10 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
		// mDialButton = null;
		// }

		mDelete = (ImageButton)mVoicemailDialAndDeleteRow.findViewById(R.id.deleteButton);
		mDelete.setOnClickListener(this);
		mDelete.setOnLongClickListener(this);
		view = mVoicemailDialAndDeleteRow.findViewById(R.id.deleteButton);
		view.setOnClickListener(this);
		view.setOnLongClickListener(this);
		mDelete = view;

		mDialpad = (View) findViewById(R.id.dialpad); // This is null in landscape mode

		@@ -671,7 +674,9 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,

		//Wysie_Soh
		//Set the "voicemail"/add button to be enabled/disabled according to if any number is displayed
		toggleActionRow();
		if (leftButtonType.equals(DialerSettings.ADDCONTACTS)) {
		checkForNumber();
		}
		}

		public boolean onLongClick(View view) {
		@@ -681,7 +686,9 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
		case R.id.deleteButton: {
		digits.clear();
		//Wysie_Soh: Set "add" button to disabled since digits are all cleared
		toggleActionRow();
		if (leftButtonType.equals(DialerSettings.ADDCONTACTS)) {
		mVoicemailButton.setEnabled(false);
		}
		return true;
		}
		case R.id.one: {
		@@ -1021,7 +1028,7 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
		if (leftButtonType.equals(DialerSettings.ADDCONTACTS)) {
		mVoicemailButton.setImageResource(R.drawable.ic_add_contacts);
		mVoicemailButton.setOnClickListener(this);
		toggleActionRow();
		checkForNumber();
		}
		else if (leftButtonType.startsWith(DialerSettings.VOICEMAIL)) {
		mVoicemailButton.setImageResource(R.drawable.ic_dial_action_voice_mail);
		@@ -1052,29 +1059,13 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
		}

		//Wysie_Soh: Method to check if there's any number entered
		private boolean hasNumber() {
		private void checkForNumber() {
		CharSequence digits = mDigits.getText();
		if (digits == null \|\| !TextUtils.isGraphic(digits)) {
		return false;
		mVoicemailButton.setEnabled(false);
		} else {
		return true;
		}
		}

		//Wysie_Soh: Method will enable/disable add contacts, dial and delete button depending on whether a number is entered
		//Knownbug: mDelete still be selected for some reason sometimes
		private void toggleActionRow() {
		if (hasNumber()) {
		// Put the current digits string into an intent
		mVoicemailButton.setEnabled(true);
		mDelete.setEnabled(true);
		mDialButton.setEnabled(true);
		} else {

		if (leftButtonType.equals(DialerSettings.ADDCONTACTS))
		mVoicemailButton.setEnabled(false);

		mDialButton.setEnabled(false);
		mDelete.setEnabled(false);
		}
		}