summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-07-09 19:35:20 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-09 19:35:20 +0000
commita13d62ef527e04c36d9ee340e94aae364c15b322 (patch)
treeda1eb96b9c745f5281eae18c9375bcb267a3c5d2 /InCallUI
parent1ddf42670d30c193920965d6a2f89d57d659d5e8 (diff)
parenta61fc1b565ab5e60bd02e15cb09081fb6cbfb6da (diff)
am 7b8535ef: am 6a3ec937: Merge "Set task description for InCallActivity" into mnc-dev
* commit '7b8535ef9eb22ed12aaa344dc7a0d94d4a777c09': Set task description for InCallActivity
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/src/com/android/incallui/InCallPresenter.java12
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);
}
/**