Merge "Follow framework API changes." into ics-mr1 (97f4d04f) · Commits · e / os / android_packages_apps_Contacts

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -508,7 +508,7 @@ public class DialtactsActivity extends TransactionSafeActivity {
		mSearchFragment.setQuickContactEnabled(true);
		mSearchFragment.setDarkTheme(true);
		mSearchFragment.setPhotoPosition(ContactListItemView.PhotoPosition.LEFT);
		mSearchFragment.setStartDeferred(true);
		mSearchFragment.setUserVisibleHint(false);
		final FragmentTransaction transaction = getFragmentManager().beginTransaction();
		if (mInSearchUi) {
		transaction.show(mSearchFragment);
		@@ -846,7 +846,7 @@ public class DialtactsActivity extends TransactionSafeActivity {
		// layout instead of asking the search menu item to take care of SearchView.
		mSearchView.onActionViewExpanded();
		mInSearchUi = true;
		mSearchFragment.setStartDeferred(false);
		mSearchFragment.setUserVisibleHint(true);
		}

		private void showInputMethod(View view) {

+4 −4

Original line number	Diff line number	Diff line
		@@ -817,8 +817,8 @@ public class PeopleActivity extends ContactsActivity
		Fragment f = getFragment(position);
		mCurTransaction.show(f);

		// Non primary pages should be deferred.
		f.setStartDeferred(f != mCurrentPrimaryItem);
		// Non primary pages are not visible.
		f.setUserVisibleHint(f == mCurrentPrimaryItem);
		return f;
		}

		@@ -849,10 +849,10 @@ public class PeopleActivity extends ContactsActivity
		Fragment fragment = (Fragment) object;
		if (mCurrentPrimaryItem != fragment) {
		if (mCurrentPrimaryItem != null) {
		mCurrentPrimaryItem.setStartDeferred(true);
		mCurrentPrimaryItem.setUserVisibleHint(false);
		}
		if (fragment != null) {
		fragment.setStartDeferred(false);
		fragment.setUserVisibleHint(true);
		}
		mCurrentPrimaryItem = fragment;
		}