diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-07-09 20:16:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 20:16:19 +0000 |
| commit | 2570940f827f2b593173d71a4a4f2629da9acbae (patch) | |
| tree | af87efa6ba4cbebf4e7f0a733a7d7fcc21c32cf9 /InCallUI | |
| parent | fe9d0481cb9c0b3334a7e4fb035784359fc47db3 (diff) | |
| parent | 4047eeeff9e898aebd8f0434dc6cd10b812ee809 (diff) | |
am 8bee8d1b: am 58104125: am 8da28140: am 7b8535ef: am 6a3ec937: Merge "Set task description for InCallActivity" into mnc-dev
* commit '8bee8d1b79c1563c5acff894e3252085421724e6':
Set task description for InCallActivity
Diffstat (limited to 'InCallUI')
| -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); } /** |