diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-07-09 19:19:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 19:19:16 +0000 |
| commit | a61fc1b565ab5e60bd02e15cb09081fb6cbfb6da (patch) | |
| tree | da1eb96b9c745f5281eae18c9375bcb267a3c5d2 | |
| parent | a30d33a223d05f942f15e48e3764fae2b64e8cc7 (diff) | |
| parent | d0e728d93273181d8dba32ecacdee88d7c86e8c7 (diff) | |
am 6a3ec937: Merge "Set task description for InCallActivity" into mnc-dev
* commit '6a3ec9377f29a2afd2cf3ffd662537835b127a2e':
Set task description for InCallActivity
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallPresenter.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java index 84ccc7c55..236129637 100644 --- a/InCallUI/src/com/android/incallui/InCallPresenter.java +++ b/InCallUI/src/com/android/incallui/InCallPresenter.java @@ -16,6 +16,7 @@ package com.android.incallui; +import android.app.ActivityManager.TaskDescription; import android.app.FragmentManager; import android.content.Context; import android.content.Intent; @@ -1486,12 +1487,17 @@ public class InCallPresenter implements CallList.Listener, } final Resources resources = mInCallActivity.getResources(); + final int color; if (resources.getBoolean(R.bool.is_layout_landscape)) { - mInCallActivity.getWindow().setStatusBarColor( - resources.getColor(R.color.statusbar_background_color)); + color = resources.getColor(R.color.statusbar_background_color, null); } else { - mInCallActivity.getWindow().setStatusBarColor(mThemeColors.mSecondaryColor); + color = mThemeColors.mSecondaryColor; } + + mInCallActivity.getWindow().setStatusBarColor(color); + final TaskDescription td = new TaskDescription( + resources.getString(R.string.notification_ongoing_call), null, color); + mInCallActivity.setTaskDescription(td); } /** |