summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnie Chin <afchin@google.com>2017-02-01 17:55:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-02-01 17:55:33 +0000
commit615b4119e6246d590b21c8c4821d33088fb32f5c (patch)
tree5b503d80af3aa6161bd9b174b8e8d66e36d12569
parent8bf0dca11c18f2514feb5284705ec970edb01a11 (diff)
parent2a0f9c0fcba04139e85f63f3f1b95df1009940a0 (diff)
downloadExactCalculator-615b4119e6246d590b21c8c4821d33088fb32f5c.tar.gz
Merge "Change popBackStackImmediate to popBackStack." into ub-calculator-euler
-rw-r--r--src/com/android/calculator2/Calculator.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index f57c93c..39cb9de 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -731,8 +731,7 @@ public class Calculator extends Activity
private void removeHistoryFragment() {
final FragmentManager manager = getFragmentManager();
if (manager != null && !manager.isDestroyed()) {
- manager.popBackStackImmediate(HistoryFragment.TAG,
- FragmentManager.POP_BACK_STACK_INCLUSIVE);
+ manager.popBackStack(HistoryFragment.TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE);
}
// When HistoryFragment is hidden, the main Calculator is important for accessibility again.