diff options
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); |