Merge "Dialpad save on orientation change in InCallUI."

2 files changed, 21 insertions, 0 deletions

diff --git a/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java
index d0d2d7f54..8d8703bed 100644
--- a/InCallUI/src/com/android/incallui/DialpadFragment.java
+++ b/InCallUI/src/com/android/incallui/DialpadFragment.java
@@ -458,6 +458,24 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese
         super.onDestroyView();
     }
 
+    /**
+     * Getter for Dialpad text.
+     *
+     * @return String containing current Dialpad EditText text.
+     */
+    public String getDtmfText() {
+        return mDtmfDialerField.getText().toString();
+    }
+
+    /**
+     * Sets the Dialpad text field with some text.
+     *
+     * @param text Text to set Dialpad EditText to.
+     */
+    public void setDtmfText(String text) {
+        mDtmfDialerField.setText(text);
+    }
+
     @Override
     public void setVisible(boolean on) {
         if (on) {
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index b37bdcbd8..f6e485b4c 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -44,6 +44,7 @@ import com.android.incallui.Call.State;
 public class InCallActivity extends Activity {
 
     public static final String SHOW_DIALPAD_EXTRA = "InCallActivity.show_dialpad";
+    public static final String DIALPAD_TEXT_EXTRA = "InCallActivity.dialpad_text";
     public static final String NEW_OUTGOING_CALL = "InCallActivity.new_outgoing_call";
 
     private static final int INVALID_RES_ID = -1;
@@ -112,6 +113,7 @@ public class InCallActivity extends Activity {
             if (icicle.getBoolean(SHOW_DIALPAD_EXTRA)) {
                 mCallButtonFragment.displayDialpad(true /* show */, false /* animate */);
             }
+            mDialpadFragment.setDtmfText(icicle.getString(DIALPAD_TEXT_EXTRA));
         }
         Log.d(this, "onCreate(): exit");
     }
@@ -119,6 +121,7 @@ public class InCallActivity extends Activity {
     @Override
     protected void onSaveInstanceState(Bundle out) {
         out.putBoolean(SHOW_DIALPAD_EXTRA, mCallButtonFragment.isDialpadVisible());
+        out.putString(DIALPAD_TEXT_EXTRA, mDialpadFragment.getDtmfText());
     }
 
     @Override