diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-27 00:18:53 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-27 00:18:53 +0000 |
commit | 4f6214ee55f6d286db36d970e2c60c9402c34d60 (patch) | |
tree | 47eefa3a9b9b172df2db32e2f1b6246bad885a57 /java/com/android/incallui/InCallPresenter.java | |
parent | 9b99b22391a92fe20a74076bf5e47d36eb9b4ab4 (diff) | |
parent | 8d662cae2c05b5e256e7bb826abf05fb9ace133d (diff) |
Merge "Set incall button color to match sim color."
Diffstat (limited to 'java/com/android/incallui/InCallPresenter.java')
-rw-r--r-- | java/com/android/incallui/InCallPresenter.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java index 8535cbc3e..ed7b2c290 100644 --- a/java/com/android/incallui/InCallPresenter.java +++ b/java/com/android/incallui/InCallPresenter.java @@ -357,8 +357,10 @@ public class InCallPresenter implements CallList.Listener { mProximitySensor = proximitySensor; addListener(mProximitySensor); - mThemeColorManager = - new ThemeColorManager(new InCallUIMaterialColorMapUtils(mContext.getResources())); + if (mThemeColorManager == null) { + mThemeColorManager = + new ThemeColorManager(new InCallUIMaterialColorMapUtils(mContext.getResources())); + } mCallList = callList; mExternalCallList = externalCallList; @@ -1651,6 +1653,11 @@ public class InCallPresenter implements CallList.Listener { return mThemeColorManager; } + @VisibleForTesting + public void setThemeColorManager(ThemeColorManager themeColorManager) { + mThemeColorManager = themeColorManager; + } + /** Called when the foreground call changes. */ public void onForegroundCallChanged(DialerCall newForegroundCall) { mThemeColorManager.onForegroundCallChanged(mContext, newForegroundCall); |