Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e790c977: Hide View.getBackgroundColor() prior to removal

Browse Source 
* commit 'e790c97787dbc05930ad0c4a708fad7cd7d3f2b9':
  Hide View.getBackgroundColor() prior to removal
This commit is contained in:
Chet Haase
2015-06-05 14:55:27 +00:00
committed by Android Git Automerger
parent 1f3a0fdbda e790c97787
commit 4628f85bdc
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -35986,7 +35986,6 @@ package android.view {
method public android.view.animation.Animation getAnimation();
method public android.os.IBinder getApplicationWindowToken();
method public android.graphics.drawable.Drawable getBackground();
method public int getBackgroundColor();
method public android.content.res.ColorStateList getBackgroundTintList();
method public android.graphics.PorterDuff.Mode getBackgroundTintMode();
method public int getBaseline();

1
api/system-current.txt
View File

@@ -38251,7 +38251,6 @@ package android.view {
method public android.view.animation.Animation getAnimation();
method public android.os.IBinder getApplicationWindowToken();
method public android.graphics.drawable.Drawable getBackground();
method public int getBackgroundColor();
method public android.content.res.ColorStateList getBackgroundTintList();
method public android.graphics.PorterDuff.Mode getBackgroundTintMode();
method public int getBaseline();

1
core/java/android/view/View.java
View File

@@ -17148,6 +17148,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* drawable.
*
* @return The color of the ColorDrawable background, if set, otherwise 0.
* @hide
*/
@ColorInt
public int getBackgroundColor() {

4
packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
View File

@@ -26,6 +26,7 @@ import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable;
import android.graphics.drawable.RippleDrawable;
@@ -200,7 +201,8 @@ public class TaskViewHeader extends FrameLayout {
mActivityDescription.setContentDescription(t.contentDescription);
// Try and apply the system ui tint
int existingBgColor = getBackgroundColor();
int existingBgColor = (getBackground() instanceof ColorDrawable) ?
((ColorDrawable) getBackground()).getColor() : 0;
if (existingBgColor != t.colorPrimary) {
mBackgroundColorDrawable.setColor(t.colorPrimary);
mBackgroundColor = t.colorPrimary;