commit 5a6855b9be5ad9f8cd5f8d4432bab4ec81d860e9
author Justin Klaassen <justinklaassen@google.com> Tue Jun 10 18:05:02 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 10 18:05:02 2014 +0000
tree 886b1f3fdb621c4481250d734472f033b7eb4e69
parent 00c3f783346465d873c02e45266e426b3c419fed
parent 3b4d13d528a14a0f46e7ae022357dfde90a307ad

am 3b4d13d5: Back button should hide advanced pad

* commit '3b4d13d528a14a0f46e7ae022357dfde90a307ad':
  Back button should hide advanced pad

res/layout/activity_calculator_port.xml

diff --git a/res/layout/activity_calculator_port.xml b/res/layout/activity_calculator_port.xml
index ddc7c8b..975c4a7 100644
--- a/res/layout/activity_calculator_port.xml
+++ b/res/layout/activity_calculator_port.xml
@@ -27,6 +27,7 @@
         android:layout_height="wrap_content" />
 
     <com.android.calculator2.CalculatorPadViewPager
+        android:id="@+id/pad_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/display">

src/com/android/calculator2/CalculatorActivity.java

diff --git a/src/com/android/calculator2/CalculatorActivity.java b/src/com/android/calculator2/CalculatorActivity.java
index f368ce8..a9837b7 100644
--- a/src/com/android/calculator2/CalculatorActivity.java
+++ b/src/com/android/calculator2/CalculatorActivity.java
@@ -25,6 +25,7 @@
 import android.animation.ValueAnimator.AnimatorUpdateListener;
 import android.app.Activity;
 import android.os.Bundle;
+import android.support.v4.view.ViewPager;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -67,6 +68,8 @@
     private CalculatorEditText mFormulaEditText;
     private CalculatorEditText mResultEditText;
 
+    private ViewPager mPadViewPager;
+
     private View mRevealView;
     private View mDeleteButton;
     private View mClearButton;
@@ -84,6 +87,8 @@
         mFormulaEditText = (CalculatorEditText) findViewById(R.id.formula);
         mResultEditText = (CalculatorEditText) findViewById(R.id.result);
 
+        mPadViewPager = (ViewPager) findViewById(R.id.pad_pager);
+
         mRevealView = findViewById(R.id.reveal);
         mDeleteButton = findViewById(R.id.del);
         mClearButton = findViewById(R.id.clr);
@@ -135,6 +140,18 @@
     }
 
     @Override
+    public void onBackPressed() {
+        if (mPadViewPager == null || mPadViewPager.getCurrentItem() == 0) {
+            // If the user is currently looking at the first pad (or the pad is not paged),
+            // allow the system to handle the Back button.
+            super.onBackPressed();
+        } else {
+            // Otherwise, select the previous pad.
+            mPadViewPager.setCurrentItem(mPadViewPager.getCurrentItem() - 1);
+        }
+    }
+
+    @Override
     public void onUserInteraction() {
         super.onUserInteraction();