diff options
| -rw-r--r-- | res/values/styles.xml | 3 | ||||
| -rw-r--r-- | src/com/android/dialer/calllog/PhoneAccountUtils.java | 6 | ||||
| -rw-r--r-- | src/com/android/dialer/settings/GeneralSettingsFragment.java | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index a0ba5c32a..92d1f4ad0 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -135,7 +135,8 @@ <item name="android:displayOptions"></item> <item name="android:height">@dimen/action_bar_height_large</item> <!-- Override ActionBar title offset to keep search box aligned left --> - <item name="android:contentInsetStart">0px</item> + <item name="android:contentInsetStart">0dp</item> + <item name="android:contentInsetEnd">0dp</item> </style> <!-- Text in the action bar at the top of the screen --> diff --git a/src/com/android/dialer/calllog/PhoneAccountUtils.java b/src/com/android/dialer/calllog/PhoneAccountUtils.java index 3979a3e5e..adeec0f2b 100644 --- a/src/com/android/dialer/calllog/PhoneAccountUtils.java +++ b/src/com/android/dialer/calllog/PhoneAccountUtils.java @@ -18,7 +18,6 @@ package com.android.dialer.calllog; import android.content.ComponentName; import android.content.Context; -import android.graphics.drawable.Drawable; import android.telecom.PhoneAccount; import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; @@ -65,7 +64,10 @@ public class PhoneAccountUtils { */ public static String getAccountLabel(Context context, PhoneAccountHandle accountHandle) { PhoneAccount account = getAccountOrNull(context, accountHandle); - return account == null ? null : account.getLabel().toString(); + if (account != null && account.getLabel() != null) { + return account.getLabel().toString(); + } + return null; } /** diff --git a/src/com/android/dialer/settings/GeneralSettingsFragment.java b/src/com/android/dialer/settings/GeneralSettingsFragment.java index d04fae398..578ff3389 100644 --- a/src/com/android/dialer/settings/GeneralSettingsFragment.java +++ b/src/com/android/dialer/settings/GeneralSettingsFragment.java @@ -107,7 +107,7 @@ public class GeneralSettingsFragment extends PreferenceFragment mContext, mRingtoneLookupComplete, RingtoneManager.TYPE_RINGTONE, - mRingtonePreference, + mRingtonePreference.getKey(), MSG_UPDATE_RINGTONE_SUMMARY); } } |