Fixed a few FCs. (567290c3) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/ContactsListActivity.java

+17 −4

Original line number	Diff line number	Diff line
		@@ -331,6 +331,7 @@ public final class ContactsListActivity extends ListActivity
		private String mShortcutAction;
		private boolean mDefaultMode = false;
		private boolean mFavTab = false;
		private boolean mContactsTab = false;

		//MenuItem for Clear Freq. Called
		private MenuItem mClearFreqCalled;
		@@ -526,6 +527,7 @@ public final class ContactsListActivity extends ListActivity

		if (mMode == MODE_UNKNOWN) {
		mMode = DEFAULT_MODE;
		mContactsTab = true;
		}

		// Setup the UI
		@@ -581,6 +583,9 @@ public final class ContactsListActivity extends ListActivity
		if (SystemProperties.getBoolean("ro.qualcomm.proprietary_obex", false)) {
		mBluetooth = (BluetoothDevice) getSystemService(Context.BLUETOOTH_SERVICE);
		}

		currPos = 0;
		prevPos = -1;
		}

		private void setEmptyText() {
		@@ -1933,6 +1938,7 @@ public final class ContactsListActivity extends ListActivity
		v = convertView;
		}
		bindView(v, mContext, mCursor);

		return v;
		}

		@@ -2004,7 +2010,7 @@ public final class ContactsListActivity extends ListActivity
		numberView.setText(cache.numberBuffer.data, 0, size);
		numberView.setVisibility(View.VISIBLE);
		labelView.setVisibility(View.VISIBLE);
		if ((ePrefs.getBoolean("contacts_show_dial_button", true) && !mFavTab) \|\|
		if ((ePrefs.getBoolean("contacts_show_dial_button", true) && mContactsTab) \|\|
		(ePrefs.getBoolean("favs_show_dial_button", true) && mFavTab)) {
		callView.setTag(new String(cache.numberBuffer.data, 0, size)); //Wysie_Soh: Set tag to green dial button
		callView.setVisibility(View.VISIBLE);
		@@ -2059,7 +2065,7 @@ public final class ContactsListActivity extends ListActivity
		}

		// Set the photo, if requested
		if (mDisplayPhotos && ((ePrefs.getBoolean("contacts_show_pic", true) && !mFavTab) \|\|
		if (mDisplayPhotos && ((ePrefs.getBoolean("contacts_show_pic", true) && mContactsTab) \|\|
		(ePrefs.getBoolean("favs_show_pic", true) && mFavTab))) {
		Bitmap photo = null;

		@@ -2101,8 +2107,14 @@ public final class ContactsListActivity extends ListActivity
		cache.photoView.setVisibility(View.VISIBLE);
		}
		else {
		// cache.photoView will be null in certain mModes.
		try {
		cache.photoView.setVisibility(View.GONE);
		}
		catch (NullPointerException e) {
		// Do nothing.
		}
		}
		}

		@Override
		@@ -2152,6 +2164,7 @@ public final class ContactsListActivity extends ListActivity
		}
		}
		}

		}

		/**

src/com/android/contacts/RecentCallsListActivity.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -442,14 +442,14 @@ public class RecentCallsListActivity extends ListActivity
		String callerNumberLabel = c.getString(CALLER_NUMBERLABEL_COLUMN_INDEX);

		// Store away the number so we can call it directly if you click on the call icon
		views.iconView.setTag(number);
		views.callView.setTag(number);

		if (!prefs.getBoolean("cl_show_dial_button", true)) {
		views.callView.setTag(number);
		views.iconView.setTag(number);
		views.iconView.setOnClickListener(this);
		}
		else {
		views.callView.setTag(null);
		views.iconView.setTag(null);
		views.iconView.setOnClickListener(null);
		}