diff options
| author | Evan Charlton <evanc@google.com> | 2014-05-01 09:15:28 -0700 |
|---|---|---|
| committer | Evan Charlton <evanc@google.com> | 2014-05-01 09:15:28 -0700 |
| commit | f89a6ff0918c5af0703f68401db48f9709948463 (patch) | |
| tree | de0220f45844608f849d35cf5a5d75b54562baf3 /InCallUI | |
| parent | 9b7a48ee455a9ceecc08ab683de882048ea88d54 (diff) | |
Fix the build
Somewhere along the line, we dropped a resource (and a variable name
was changed). Fix these errors.
Change-Id: I06ce956961e8bf0e08f03d51651bf48262055703
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/res/values/dimens.xml | 5 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml index 0ecfab45f..e9dd26bc9 100644 --- a/InCallUI/res/values/dimens.xml +++ b/InCallUI/res/values/dimens.xml @@ -37,6 +37,11 @@ <!-- Padding at the top and bottom edges of the "provider information" --> <dimen name="provider_info_top_bottom_padding">8dp</dimen> + <!-- Text size for the name in the call info. --> + <dimen name="call_name_text_size">36sp</dimen> + <!-- Text size for the call info label and number. --> + <dimen name="call_label_text_size">18sp</dimen> + <!-- Right padding for name and number fields in the call banner. This padding is used to ensure that ultra-long names or numbers won't overlap the elapsed time indication. --> diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index d86b01b6b..29ec687ac 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -329,7 +329,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr private void updateCallStateLabel(int state, boolean bluetoothOn, String text) { // Update the call state label. - mCallStateLabel.setText(callStateLabel); + mCallStateLabel.setText(text); if (Call.State.INCOMING == state) { setBluetoothOn(bluetoothOn); |