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

res/layout-finger/call_detail.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@
		android:layout_width="fill_parent"
		android:layout_height="fill_parent"
		android:scrollbarStyle="outsideOverlay"
		android:fastScrollEnabled="true"
		/>

		<!--

res/layout-finger/recent_calls.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		android:layout_width="fill_parent"
		android:layout_height="fill_parent"
		android:scrollbarStyle="outsideOverlay"
		android:fastScrollEnabled="true"
		/>

		<TextView android:id="@android:id/empty"

res/values/strings.xml

+8 −1

Original line number	Diff line number	Diff line
		@@ -752,6 +752,9 @@
		<string name="menu_preferences">Preferences</string>
		<string name="contacts_manage_groups">Manage groups</string>

		<string name="menu_show_all">Show all groups</string>
		<string name="menu_show_contacts_phones">Show contacts with phones</string>

		<!-- Wysie_Soh: Dialer menu -->
		<string name="dialer_menu_sms">SMS/MMS</string>

		@@ -820,6 +823,10 @@
		<string name="title_contacts_show_separators">Show alphabetical separators</string>
		<string name="summaryon_contacts_show_separators">Alphabetical separators will be shown in the contacts list</string>
		<string name="summaryoff_contacts_show_separators">Alphabetical separators will be hidden in the contacts list</string>
		<string name="title_auto_show_keyboard">Auto-show virtual keyboard</string>
		<string name="summary_auto_show_keyboard">Virtual keyboard will be shown upon entering Contacts</string>
		<string name="title_auto_hide_keyboard">Auto-hide keyboard</string>
		<string name="summary_auto_hide_keyboard">Virtual keyboard will be hidden upon scrolling</string>
		<string name="title_view_contact">View contact</string>
		<string name="summary_view_contact">Set preferences when viewing an individual contact</string>
		<string name="title_show_text_mobile_only">Text action for mobile only</string>
		@@ -854,7 +861,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.61</string>
		<string name="summary_about_version">2.7</string>
		<string name="title_about_credits">Credits</string>
		<string name="summary_about_credits">ChainsDD, geesun and the rest of XDA! :)</string>

res/xml/contacts_preferences.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -199,6 +199,11 @@
		android:summaryOn="@string/summaryon_contacts_show_separators"
		android:summaryOff="@string/summaryoff_contacts_show_separators"
		android:defaultValue="true" />
		<CheckBoxPreference
		android:key="contacts_auto_hide_vk"
		android:title="@string/title_auto_hide_keyboard"
		android:summary="@string/summary_auto_hide_keyboard"
		android:defaultValue="false" />
		<PreferenceScreen
		android:key="view_contact"
		android:title="@string/title_view_contact"

src/com/android/contacts/ContactsListActivity.java

+127 −30

Original line number	Diff line number	Diff line
		@@ -66,6 +66,7 @@ import android.util.Log;
		import android.util.SparseArray;
		import android.view.ContextMenu;
		import android.view.Gravity;
		import android.view.inputmethod.InputMethodManager;
		import android.view.KeyEvent;
		import android.view.LayoutInflater;
		import android.view.Menu;
		@@ -74,7 +75,10 @@ import android.view.SubMenu;
		import android.view.View;
		import android.view.ViewGroup;
		import android.view.ContextMenu.ContextMenuInfo;
		import android.view.inputmethod.EditorInfo;
		import android.view.inputmethod.InputMethodManager;
		import android.widget.AbsListView;
		import android.widget.AbsListView.OnScrollListener;
		import android.widget.AdapterView;
		import android.widget.AlphabetIndexer;
		import android.widget.Filter;
		@@ -99,7 +103,7 @@ import android.bluetooth.BluetoothDevice;
		* Displays a list of contacts. Usually is embedded into the ContactsActivity.
		*/
		public final class ContactsListActivity extends ListActivity
		implements View.OnCreateContextMenuListener, DialogInterface.OnClickListener {
		implements View.OnCreateContextMenuListener, DialogInterface.OnClickListener, ListView.OnScrollListener {
		private static final String TAG = "ContactsListActivity";

		private static final boolean ENABLE_ACTION_ICON_OVERLAYS = false;
		@@ -123,6 +127,8 @@ public final class ContactsListActivity extends ListActivity
		public static final int MENU_IMPORT_CONTACTS = 12;
		public static final int MENU_EXPORT_CONTACTS = 13;
		public static final int MENU_CLEAR_FREQ_CONTACTS = 14;
		public static final int MENU_SHOW_ALL_CONTACTS = 20;
		public static final int MENU_SHOW_CONTACTS_WITH_PHONES = 21;

		static final int MENU_ITEM_SEND_BT = 14;
		static final int MENU_ITEM_GET_BT = 15;
		@@ -344,9 +350,16 @@ public final class ContactsListActivity extends ListActivity
		private static boolean showFavsDialButton;
		private static boolean showFavsLabel;
		private static boolean showFavsPic;
		private static boolean autoHideKeyboard;
		//private static boolean firstTimeShowVK;

		//Wysie_Soh: Variable to show only contacts with phones when inserting or editing a contact
		private static boolean showOnlyPhonesEditCreateMode = false;

		//MenuItem for Clear Freq. Called
		private MenuItem mClearFreqCalled;
		private MenuItem mShowAllContacts;
		private MenuItem mShowContactsWithPhones;

		/**
		* Internal query type when in mode {@link #MODE_QUERY_PICK_TO_VIEW}.
		@@ -403,12 +416,35 @@ public final class ContactsListActivity extends ListActivity
		}
		}

		public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
		//Do nothing
		}

		public void onScrollStateChanged(AbsListView view, int scrollState) {
		if (mContactsTab && autoHideKeyboard) {
		InputMethodManager mgr = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
		switch (scrollState) {
		case OnScrollListener.SCROLL_STATE_IDLE:
		break;
		case OnScrollListener.SCROLL_STATE_TOUCH_SCROLL:
		mgr.hideSoftInputFromWindow(view.getWindowToken(), 0);
		break;
		case OnScrollListener.SCROLL_STATE_FLING:
		mgr.hideSoftInputFromWindow(view.getWindowToken(), 0);
		break;
		}
		}
		}

		@Override
		protected void onCreate(Bundle icicle) {
		super.onCreate(icicle);

		ePrefs = PreferenceManager.getDefaultSharedPreferences(getBaseContext());

		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
		showOnlyPhonesEditCreateMode = prefs.getBoolean("show_only_phones_edit_mode", false);

		// Resolve the intent
		final Intent intent = getIntent();

		@@ -548,6 +584,7 @@ public final class ContactsListActivity extends ListActivity
		if ((mMode & MODE_MASK_NO_FILTER) != MODE_MASK_NO_FILTER) {
		list.setTextFilterEnabled(true);
		}
		list.setOnScrollListener(this);

		if ((mMode & MODE_MASK_CREATE_NEW) != 0) {
		// Add the header for creating a new contact
		@@ -724,9 +761,35 @@ public final class ContactsListActivity extends ListActivity
		setEmptyText();
		}



		@Override
		protected void onResume() {
		super.onResume();

		showContactsNumber = ePrefs.getBoolean("contacts_show_number", true);
		showContactsDialButton = ePrefs.getBoolean("contacts_show_dial_button", true);
		showContactsLabel = ePrefs.getBoolean("contacts_show_label", true);
		showContactsPic = ePrefs.getBoolean("contacts_show_pic", true);
		showFavsNumber = ePrefs.getBoolean("favs_show_number", true);
		showFavsDialButton = ePrefs.getBoolean("favs_show_dial_button", true);
		showFavsLabel = ePrefs.getBoolean("favs_show_label", true);
		showFavsPic = ePrefs.getBoolean("favs_show_pic", true);
		autoHideKeyboard = ePrefs.getBoolean("contacts_auto_hide_vk", false);
		if (mContactsTab) {
		mDisplaySectionHeaders = ePrefs.getBoolean("contacts_show_alphabetical_separators", true);
		//firstTimeShowVK = true;
		}


		//Wysie_Soh: if mMode == MODE_STREQUENT or MODE_FREQUENT, mDisplaySectionHeaders is already set to false
		//Doing so means that the section separators will be shown in all other mModes. If I'm not wrong,
		//The default Eclair Contacts only shows the section separators in "Contacts" tab mode.
		//if (!(mMode == MODE_STREQUENT \|\| mMode == MODE_FREQUENT)) {
		// mDisplaySectionHeaders = ePrefs.getBoolean("contacts_show_alphabetical_separators", true);
		//}
		//Wysie_Soh: Decide whether to display headers or not based on preferences

		boolean runQuery = true;
		Activity parent = getParent();

		@@ -771,6 +834,7 @@ public final class ContactsListActivity extends ListActivity
		// Run the filtered query on the adapter
		((ContactItemListAdapter) getListAdapter()).onContentChanged();
		}

		}

		private void updateGroup() {
		@@ -802,6 +866,12 @@ public final class ContactsListActivity extends ListActivity
		protected void onStop() {
		super.onStop();

		/*
		InputMethodManager mgr = (InputMethodManager)
		getSystemService(Context.INPUT_METHOD_SERVICE);
		mgr.hideSoftInputFromWindow(mList.getWindowToken(), 0);
		*/

		// We don't want the list to display the empty state, since when we resume it will still
		// be there and show up while the new query is happening. After the async query finished
		// in response to onRestart() setLoading(false) will be called.
		@@ -817,6 +887,14 @@ public final class ContactsListActivity extends ListActivity

		@Override
		public boolean onCreateOptionsMenu(Menu menu) {
		if (mMode == MODE_INSERT_OR_EDIT_CONTACT) {
		mShowAllContacts = menu.add(0, MENU_SHOW_ALL_CONTACTS, 0, R.string.menu_show_all)
		.setIcon(com.android.internal.R.drawable.ic_menu_allfriends);
		mShowContactsWithPhones = menu.add(0, MENU_SHOW_CONTACTS_WITH_PHONES, 0, R.string.menu_show_contacts_phones)
		.setIcon(com.android.internal.R.drawable.ic_menu_allfriends);
		return super.onCreateOptionsMenu(menu);
		}

		// If Contacts was invoked by another Activity simply as a way of
		// picking a contact, don't show the options menu
		if ((mMode & MODE_MASK_PICKER) == MODE_MASK_PICKER) {
		@@ -891,6 +969,19 @@ public final class ContactsListActivity extends ListActivity
		@Override
		public boolean onPrepareOptionsMenu(Menu menu) {
		super.onPrepareOptionsMenu(menu);

		if (mMode == MODE_INSERT_OR_EDIT_CONTACT) {
		if (showOnlyPhonesEditCreateMode) {
		mShowAllContacts.setVisible(true);
		mShowContactsWithPhones.setVisible(false);
		}
		else {
		mShowAllContacts.setVisible(false);
		mShowContactsWithPhones.setVisible(true);
		}
		return true;
		}

		boolean bluetoothEnabled = false;
		if (mBluetooth != null) {
		bluetoothEnabled = mBluetooth.isEnabled();
		@@ -952,6 +1043,7 @@ public final class ContactsListActivity extends ListActivity

		@Override
		public boolean onOptionsItemSelected(MenuItem item) {
		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
		switch (item.getItemId()) {
		case MENU_DISPLAY_GROUP:
		AlertDialog.Builder builder = new AlertDialog.Builder(this)
		@@ -1013,6 +1105,16 @@ public final class ContactsListActivity extends ListActivity
		clearFrequentlyCalled();
		}
		return true;
		case MENU_SHOW_ALL_CONTACTS:
		showOnlyPhonesEditCreateMode = false;
		prefs.edit().putBoolean("show_only_phones_edit_mode", showOnlyPhonesEditCreateMode).commit();
		updateGroup();
		return true;
		case MENU_SHOW_CONTACTS_WITH_PHONES:
		showOnlyPhonesEditCreateMode = true;
		prefs.edit().putBoolean("show_only_phones_edit_mode", showOnlyPhonesEditCreateMode).commit();
		updateGroup();
		return true;

		}
		return false;
		@@ -1242,9 +1344,9 @@ public final class ContactsListActivity extends ListActivity
		@Override
		protected void onListItemClick(ListView l, View v, int position, long id) {
		// Hide soft keyboard, if visible
		InputMethodManager inputMethodManager = (InputMethodManager)
		InputMethodManager mgr = (InputMethodManager)
		getSystemService(Context.INPUT_METHOD_SERVICE);
		inputMethodManager.hideSoftInputFromWindow(mList.getWindowToken(), 0);
		mgr.hideSoftInputFromWindow(mList.getWindowToken(), 0);

		if (mMode == MODE_INSERT_OR_EDIT_CONTACT) {
		Intent intent;
		@@ -1521,8 +1623,15 @@ public final class ContactsListActivity extends ListActivity
		case MODE_PICK_CONTACT:
		case MODE_PICK_OR_CREATE_CONTACT:
		case MODE_INSERT_OR_EDIT_CONTACT:
		if (!showOnlyPhonesEditCreateMode) {
		mQueryHandler.startQuery(QUERY_TOKEN, null, People.CONTENT_URI, CONTACTS_PROJECTION,
		null, null, getSortOrder(CONTACTS_PROJECTION));
		}
		else {
		mQueryHandler.startQuery(QUERY_TOKEN, null, People.CONTENT_URI, CONTACTS_PROJECTION,
		People.PRIMARY_PHONE_ID + " IS NOT NULL", null,
		getSortOrder(CONTACTS_PROJECTION));
		}
		break;

		case MODE_WITH_PHONES:
		@@ -1891,6 +2000,7 @@ public final class ContactsListActivity extends ListActivity
		mFavTab = true;
		}


		}

		private SectionIndexer getNewIndexer(Cursor cursor) {
		@@ -1976,30 +2086,17 @@ public final class ContactsListActivity extends ListActivity
		v = convertView;
		}

		//Wysie_Soh: if mMode == MODE_STREQUENT or MODE_FREQUENT, mDisplaySectionHeaders is already set to false
		//Doing so means that the section separators will be shown in all other mModes. If I'm not wrong,
		//The default Eclair Contacts only shows the section separators in "Contacts" tab mode.
		//if (!(mMode == MODE_STREQUENT \|\| mMode == MODE_FREQUENT)) {
		// mDisplaySectionHeaders = ePrefs.getBoolean("contacts_show_alphabetical_separators", true);
		//}

		//Wysie_Soh: Decide whether to display headers or not based on preferences
		if (mContactsTab) {
		mDisplaySectionHeaders = ePrefs.getBoolean("contacts_show_alphabetical_separators", true);
		}

		showContactsNumber = ePrefs.getBoolean("contacts_show_number", true);
		showContactsDialButton = ePrefs.getBoolean("contacts_show_dial_button", true);
		showContactsLabel = ePrefs.getBoolean("contacts_show_label", true);
		showContactsPic = ePrefs.getBoolean("contacts_show_pic", true);
		showFavsNumber = ePrefs.getBoolean("favs_show_number", true);
		showFavsDialButton = ePrefs.getBoolean("favs_show_dial_button", true);
		showFavsLabel = ePrefs.getBoolean("favs_show_label", true);
		showFavsPic = ePrefs.getBoolean("favs_show_pic", true);

		bindView(v, mContext, mCursor);
		bindSectionHeader(v, realPosition, mDisplaySectionHeaders);

		/*
		if (mContactsTab && firstTimeShowVK) {
		InputMethodManager mgr = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
		mgr.showSoftInput(getListView(), InputMethodManager.SHOW_IMPLICIT);
		firstTimeShowVK = false;
		}
		*/

		return v;
		}