diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-10-08 22:48:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-08 22:48:44 +0000 |
| commit | 529b78941c20c2b45312eeedbd509d0ded4f7323 (patch) | |
| tree | 1aff9a9aac271e48dec04cb986c5cadc5f4105e9 /packages/SystemUI/src/com/android/systemui | |
| parent | 511925c9e143ebc6eeb0efdf433cc0519b5e5eb1 (diff) | |
| parent | 89b196958fee07475765bd3c458098464ba16f2e (diff) | |
| download | frameworks_base-529b78941c20c2b45312eeedbd509d0ded4f7323.zip frameworks_base-529b78941c20c2b45312eeedbd509d0ded4f7323.tar.gz frameworks_base-529b78941c20c2b45312eeedbd509d0ded4f7323.tar.bz2 | |
am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit '89b196958fee07475765bd3c458098464ba16f2e':
Put in real "code" (aka marketing) name.
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index eef4a5a..9492a14 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -696,7 +696,7 @@ public abstract class BaseStatusBar extends SystemUI implements if (entry.expanded.getId() != com.android.internal.R.id.status_bar_latest_event_content) { // Using custom RemoteViews if (entry.targetSdk >= Build.VERSION_CODES.GINGERBREAD - && entry.targetSdk < Build.VERSION_CODES.L) { + && entry.targetSdk < Build.VERSION_CODES.LOLLIPOP) { entry.row.setShowingLegacyBackground(true); entry.legacy = true; } @@ -712,7 +712,7 @@ public abstract class BaseStatusBar extends SystemUI implements } if (entry.icon != null) { - if (entry.targetSdk >= Build.VERSION_CODES.L) { + if (entry.targetSdk >= Build.VERSION_CODES.LOLLIPOP) { entry.icon.setColorFilter(mContext.getResources().getColor(android.R.color.white)); } else { entry.icon.setColorFilter(null); @@ -1385,7 +1385,7 @@ public abstract class BaseStatusBar extends SystemUI implements Drawable iconDrawable = StatusBarIconView.getIcon(mContext, ic); icon.setImageDrawable(iconDrawable); - if (entry.targetSdk >= Build.VERSION_CODES.L + if (entry.targetSdk >= Build.VERSION_CODES.LOLLIPOP || mNotificationColorUtil.isGrayscaleIcon(iconDrawable)) { icon.setBackgroundResource( com.android.internal.R.drawable.notification_icon_legacy_bg); |