commit 21b165ad0f1648b9803efb86c928240e658c0392
author Yorke Lee <yorkelee@google.com> Tue Apr 08 00:19:42 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 08 00:19:42 2014 +0000
tree ddc75797006e8ba3da693e9b76d1b006d44f2c77
parent 13a54c7689f18363c873e966a9e4e9d76ed3ffa7
parent 3921359f3f01938768f0b0e731941542f0385787

Merge "Catch activity not found exceptions"

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index cc45a98..f438570 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -123,8 +123,6 @@
 
     private static final int ANIMATION_DURATION = 200;
 
-    private String mFilterText;
-
     /**
      * The main fragment displaying the user's favorites and frequent contacts
      */
@@ -749,7 +747,6 @@
     public void onNewIntent(Intent newIntent) {
         setIntent(newIntent);
         displayFragment(newIntent);
-        final String action = newIntent.getAction();
 
         invalidateOptionsMenu();
     }
@@ -794,14 +791,6 @@
         }
     };
 
-    private void showInputMethod(View view) {
-        final InputMethodManager imm = (InputMethodManager) getSystemService(
-                Context.INPUT_METHOD_SERVICE);
-        if (imm != null) {
-            imm.showSoftInput(view, 0);
-        }
-    }
-
     private void hideInputMethod(View view) {
         final InputMethodManager imm = (InputMethodManager) getSystemService(
                 Context.INPUT_METHOD_SERVICE);

src/com/android/dialer/dialpad/DialpadFragment.java

diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index 36d5cf8..defd658 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -391,9 +391,6 @@
 
         vto.addOnPreDrawListener(preDrawListener);
 
-        // Load up the resources for the text field.
-        Resources r = getResources();
-
         mDigitsContainer = fragmentView.findViewById(R.id.digits_container);
         mDigits = (EditText) fragmentView.findViewById(R.id.digits);
         mDigits.setKeyListener(UnicodeDialerKeyListener.INSTANCE);
@@ -442,11 +439,6 @@
         return fragmentView;
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-    }
-
     private boolean isLayoutReady() {
         return mDigits != null;
     }
@@ -1048,7 +1040,6 @@
      * the previous digit or cancel previously entered character.
      */
     private void removePreviousDigitIfPossible() {
-        final Editable editable = mDigits.getText();
         final int currentPosition = mDigits.getSelectionStart();
         if (currentPosition > 0) {
             mDigits.setSelection(currentPosition);
@@ -1166,11 +1157,6 @@
         mDigits.getText().clear();
     }
 
-    private String getCallOrigin() {
-        return (getActivity() instanceof DialtactsActivity) ?
-                ((DialtactsActivity) getActivity()).getCallOrigin() : null;
-    }
-
     private void handleDialButtonClickWithEmptyDigits() {
         if (phoneIsCdma() && phoneIsOffhook()) {
             // This is really CDMA specific. On GSM is it possible