Merge "Fix FC when drag delete call log to split screen" into android_ui.lnx.2.1-dev (b343d8d6) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/activities/MultiPickContactsActivity.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -246,7 +246,7 @@ public class MultiPickContactsActivity extends Activity implements ViewPager.OnP
		// occur crash.
		position = getRtlPosition(position);

		if (mAreTabsHiddenInViewPager) {
		if (mAreTabsHiddenInViewPager \|\| mPickMode.isPickCall()) {
		if (mPickMode.isPickCall()) {
		mDelCallLogFragment = new DelCallLogFragment();
		mDelCallLogFragment.setCheckListListener(new CheckListListener());
		@@ -295,8 +295,7 @@ public class MultiPickContactsActivity extends Activity implements ViewPager.OnP
		public Object instantiateItem(ViewGroup container, int position) {

		Fragment f = (Fragment) super.instantiateItem(container, position);

		if (mAreTabsHiddenInViewPager) {
		if (mAreTabsHiddenInViewPager \|\| mPickMode.isPickCall()) {
		if (mPickMode.isPickCall()) {
		if (mDelCallLogFragment == null) {
		mDelCallLogFragment = (DelCallLogFragment) f;

100644 → 100755

+1 −2

Original line number	Diff line number	Diff line
		@@ -423,8 +423,7 @@ public class ContactsFragment extends ListFragment {
		uri = Contacts.CONTENT_URI;
		break;
		default:
		throw new IllegalArgumentException("getUriToQuery: Incorrect mode: "
		+ mPickMode.getMode());
		uri = Contacts.CONTENT_URI;
		}
		return uri.buildUpon().appendQueryParameter(Contacts.EXTRA_ADDRESS_BOOK_INDEX, "true")
		.build();