diff options
author | Eric Erfanian <erfanian@google.com> | 2017-05-05 15:23:13 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-05 15:23:13 +0000 |
commit | 300a8683b9c28424fb0f0c571a0abe128c461f69 (patch) | |
tree | 3a325b0effac02fbd228b8ddf2f96589e5df72cd /java/com/android/incallui/incall/impl/InCallFragment.java | |
parent | d67f1627521b174f12e0c247f154c7c93c5e408e (diff) | |
parent | 10b34a5ebf12e97ecba0caf3c8e30b476b038a96 (diff) |
Update Dialer to V10 RC16
am: 10b34a5ebf
Change-Id: Iea3e96ccdeaf1fa796ceca702cace82ca20f298c
Diffstat (limited to 'java/com/android/incallui/incall/impl/InCallFragment.java')
-rw-r--r-- | java/com/android/incallui/incall/impl/InCallFragment.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java index ac3c57ca9..c5d75329f 100644 --- a/java/com/android/incallui/incall/impl/InCallFragment.java +++ b/java/com/android/incallui/incall/impl/InCallFragment.java @@ -208,8 +208,8 @@ public class InCallFragment extends Fragment } @Override - public void onDestroy() { - super.onDestroy(); + public void onDestroyView() { + super.onDestroyView(); inCallScreenDelegate.onInCallScreenUnready(); } @@ -267,11 +267,14 @@ public class InCallFragment extends Fragment adapter.setAttachments(multimediaData); } - if (adapter.getCount() > 1) { + if (adapter.getCount() > 1 && getResources().getInteger(R.integer.incall_num_rows) > 1) { paginator.setVisibility(View.VISIBLE); paginator.setupWithViewPager(pager); + pager.setSwipingLocked(false); if (!stateRestored) { handler.postDelayed(pagerRunnable, 4_000); + } else { + pager.setCurrentItem(adapter.getButtonGridPosition(), false /* animateScroll */); } } else { paginator.setVisibility(View.GONE); |