am 6a15ad7d: DO NOT MERGE Fix crash when recreating activity and receiving dial intent (6503dc1a) · Commits · e / os / android_packages_apps_Dialer

src/com/android/dialer/DialtactsActivity.java

+6 −8

Original line number	Diff line number	Diff line
		@@ -336,7 +336,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
		}
		});


		setupFakeActionBarItems();
		prepareSearchView();

		if (UI.FILTER_CONTACTS_ACTION.equals(intent.getAction())
		@@ -353,7 +353,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
		@Override
		protected void onResume() {
		super.onResume();
		setupFakeActionBarItems();
		if (mFirstLaunch) {
		displayFragment(getIntent());
		} else if (!phoneIsInUse() && mInCallDialpadUp) {
		@@ -552,6 +551,11 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
		ft.commit();
		mDialButton.setVisibility(shouldShowOnscreenDialButton() ? View.VISIBLE : View.GONE);
		mDialpadButton.setVisibility(View.GONE);

		if (mDialpadOverflowMenu == null) {
		mDialpadOverflowMenu = mDialpadFragment.buildOptionsMenu(mMenuButton);
		}

		mMenuButton.setOnTouchListener(mDialpadOverflowMenu.getDragToOpenListener());
		}

		@@ -680,17 +684,12 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
		if (mOverflowMenu == null) {
		mOverflowMenu = buildOptionsMenu(mMenuButton);
		}
		if (mDialpadOverflowMenu == null) {
		mDialpadOverflowMenu = mDialpadFragment.buildOptionsMenu(mMenuButton);
		}
		// Initial state is with dialpad fragment not shown
		mMenuButton.setOnTouchListener(mOverflowMenu.getDragToOpenListener());
		}

		mFakeActionBar = findViewById(R.id.fake_action_bar);

		mCallHistoryButton = findViewById(R.id.call_history_button);
		// mCallHistoryButton.setMinimumWidth(fakeMenuItemWidth);
		mCallHistoryButton.setOnClickListener(this);

		mDialButton = findViewById(R.id.dial_button);
		@@ -698,7 +697,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
		mDialButton.setOnLongClickListener(this);

		mDialpadButton = findViewById(R.id.dialpad_button);
		// DialpadButton.setMinimumWidth(fakeMenuItemWidth);
		mDialpadButton.setOnClickListener(this);
		}