diff options
| author | Stephen Bird <sbird@cyngn.com> | 2016-03-02 13:40:29 -0800 |
|---|---|---|
| committer | Richard MacGregor <rmacgregor@cyngn.com> | 2016-04-08 10:42:51 -0700 |
| commit | e32e50ebf2bf7bb0c4b842457239a367de220f8d (patch) | |
| tree | 9cf3c134d9677f9f173dee50011c2a178e86bcee | |
| parent | 8d0e05baca20b2b1cef554f7f387154a081d1de4 (diff) | |
| download | android_packages_apps_PhoneCommon-e32e50ebf2bf7bb0c4b842457239a367de220f8d.tar.gz android_packages_apps_PhoneCommon-e32e50ebf2bf7bb0c4b842457239a367de220f8d.tar.bz2 android_packages_apps_PhoneCommon-e32e50ebf2bf7bb0c4b842457239a367de220f8d.zip | |
Add back badgeicon after refactor
Also, remove duplicate getBrandIcon and sort a bit
Change-Id: I64bf4c8b66ec291d23012a5baa85a3dee6a7d831
| -rw-r--r-- | src-ambient/incall/CallMethodHelper.java | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src-ambient/incall/CallMethodHelper.java b/src-ambient/incall/CallMethodHelper.java index 8000032..fe30b74 100644 --- a/src-ambient/incall/CallMethodHelper.java +++ b/src-ambient/incall/CallMethodHelper.java @@ -624,19 +624,18 @@ public class CallMethodHelper { pluginResources.getDrawable(icpi.getActionOneIcon(), null); cmi.mActionTwoIcon = pluginResources.getDrawable(icpi.getActionTwoIcon(), null); - - cmi.mBrandIconId = icpi.getBrandIcon(); cmi.mBrandIcon = pluginResources.getDrawable(icpi.getBrandIcon(), null); - cmi.mLoginIconId = icpi.getLoginIcon(); - cmi.mLoginIcon = pluginResources.getDrawable(icpi.getLoginIcon(), - null); + cmi.mLoginIcon = + pluginResources.getDrawable(icpi.getLoginIcon(), null); cmi.mVoiceIcon = pluginResources.getDrawable(icpi .getVoiceMimeIcon(), null); cmi.mVideoIcon = pluginResources.getDrawable(icpi .getVideoMimeIcon(), null); cmi.mImIcon = pluginResources.getDrawable(icpi.getImMimeIcon(), null); + cmi.mBadgeIcon = pluginResources.getDrawable(icpi.getBadgeIcon(), + null); } catch (Resources.NotFoundException e) { Log.e(TAG, "Resource Not found: " + cn); @@ -668,6 +667,8 @@ public class CallMethodHelper { } } cmi.mBrandIconId = icpi.getBrandIcon(); + cmi.mLoginIconId = icpi.getLoginIcon(); + cmi.mAccountType = icpi.getAccountType(); mCallMethodInfos.put(cn, cmi); maybeBroadcastToSubscribers(); @@ -789,14 +790,6 @@ public class CallMethodHelper { */ protected static void getCallMethodAuthenticated(final ComponentName cn, final boolean broadcastASAP) { - // Let's attach a listener so that we can continue to listen to any authentication state - // changes - if (mAuthenticationListeners.get(cn) == null) { - AuthenticationListenerImpl listener = AuthenticationListenerImpl.getInstance(cn); - getInstance().mInCallApi.addAuthenticationListener(getInstance().mClient, cn, listener); - mAuthenticationListeners.put(cn, listener); - } - getInstance().mInCallApi.getAuthenticationState(getInstance().mClient, cn) .setResultCallback(new ResultCallback<AuthenticationStateResult>() { @Override |