summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Charlton <evanc@google.com>2014-11-11 00:27:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-11 00:27:45 +0000
commit54c543d487a49f477756e7afeaafd68238229c50 (patch)
tree0412d308d13c6f489b2390bcacfa55b4f1c58570
parent338c951a0ee352afa8f91ad26ebcd87fa9b8b673 (diff)
parent4622011cfd3e7320c9dfd08f875584712b0f8717 (diff)
am 4622011c: am 612f818e: Merge "Allow ILD information to be populated" into lmp-mr1-dev
* commit '4622011cfd3e7320c9dfd08f875584712b0f8717': Allow ILD information to be populated
-rw-r--r--src/com/android/dialer/DialtactsActivity.java2
-rw-r--r--src/com/android/dialer/dialpad/DialpadFragment.java8
2 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 4b5b198a0..3c9b870dd 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -140,7 +140,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
/**
* Fragment containing the dialpad that slides into view
*/
- private DialpadFragment mDialpadFragment;
+ protected DialpadFragment mDialpadFragment;
/**
* Fragment for searching phone numbers using the alphanumeric keyboard.
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index 5695f1c48..6daa89cd1 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -519,6 +519,14 @@ public class DialpadFragment extends Fragment
mStartedFromNewIntent = value;
}
+ public void clearCallRateInformation() {
+ setCallRateInformation(null, null);
+ }
+
+ public void setCallRateInformation(String countryName, String displayRate) {
+ mDialpadView.setCallRateInformation(countryName, displayRate);
+ }
+
/**
* Sets formatted digits to digits field.
*/