Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b296942 authored May 15, 2012 by Maurice Chu Committed by Android Git Automerger May 15, 2012

am e8893b91: Merge "Fragment carousel always starts on About page" into jb-dev

* commit 'e8893b91':
  Fragment carousel always starts on About page

parents 736f9050 e8893b91

src/com/android/contacts/detail/ContactDetailFragmentCarousel.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -173,6 +173,16 @@ public class ContactDetailFragmentCarousel extends HorizontalScrollView implemen
		}
		}

		/**
		* Reset the fragment carousel to show the about page.
		*/
		public void reset() {
		if (mCurrentPage != ABOUT_PAGE) {
		mCurrentPage = ABOUT_PAGE;
		snapToEdge();
		}
		}

		public int getCurrentPage() {
		return mCurrentPage;
		}

src/com/android/contacts/detail/ContactDetailLayoutController.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -405,6 +405,9 @@ public class ContactDetailLayoutController {
		case LayoutMode.TWO_COLUMN_FRAGMENT_CAROUSEL: {
		// Allow swiping between all fragments
		mFragmentCarousel.enableSwipe(true);
		if (isDifferentContact) {
		mFragmentCarousel.reset();
		}
		if (!isDifferentContact && animateStateChange) {
		mFragmentCarousel.animateAppear();
		}