Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4628f85b authored by Chet Haase's avatar Chet Haase Committed by Android Git Automerger
Browse files

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

* commit 'e790c977':
  Hide View.getBackgroundColor() prior to removal
parents 1f3a0fdb e790c977

api/current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -35986,7 +35986,6 @@ package android.view { 
    method public android.view.animation.Animation getAnimation();

    method public android.view.animation.Animation getAnimation();

    method public android.os.IBinder getApplicationWindowToken();

    method public android.os.IBinder getApplicationWindowToken();

    method public android.graphics.drawable.Drawable getBackground();

    method public android.graphics.drawable.Drawable getBackground();

    method public int getBackgroundColor();

    method public android.content.res.ColorStateList getBackgroundTintList();

    method public android.content.res.ColorStateList getBackgroundTintList();

    method public android.graphics.PorterDuff.Mode getBackgroundTintMode();

    method public android.graphics.PorterDuff.Mode getBackgroundTintMode();

    method public int getBaseline();

    method public int getBaseline();

api/system-current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -38251,7 +38251,6 @@ package android.view { 
    method public android.view.animation.Animation getAnimation();

    method public android.view.animation.Animation getAnimation();

    method public android.os.IBinder getApplicationWindowToken();

    method public android.os.IBinder getApplicationWindowToken();

    method public android.graphics.drawable.Drawable getBackground();

    method public android.graphics.drawable.Drawable getBackground();

    method public int getBackgroundColor();

    method public android.content.res.ColorStateList getBackgroundTintList();

    method public android.content.res.ColorStateList getBackgroundTintList();

    method public android.graphics.PorterDuff.Mode getBackgroundTintMode();

    method public android.graphics.PorterDuff.Mode getBackgroundTintMode();

    method public int getBaseline();

    method public int getBaseline();

core/java/android/view/View.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -17148,6 +17148,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * drawable.

     * drawable.

     *

     *

     * @return The color of the ColorDrawable background, if set, otherwise 0.

     * @return The color of the ColorDrawable background, if set, otherwise 0.

     * @hide

     */

     */

    @ColorInt

    @ColorInt

    public int getBackgroundColor() {

    public int getBackgroundColor() {

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.Context; 
import android.content.res.ColorStateList;

import android.content.res.ColorStateList;

import android.graphics.Canvas;

import android.graphics.Canvas;

import android.graphics.Color;

import android.graphics.Color;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.GradientDrawable;

import android.graphics.drawable.GradientDrawable;

import android.graphics.drawable.RippleDrawable;

import android.graphics.drawable.RippleDrawable;
@@ -200,7 +201,8 @@ public class TaskViewHeader extends FrameLayout { 
        mActivityDescription.setContentDescription(t.contentDescription);

        mActivityDescription.setContentDescription(t.contentDescription);





        // Try and apply the system ui tint

        // Try and apply the system ui tint

        int existingBgColor = getBackgroundColor();

        int existingBgColor = (getBackground() instanceof ColorDrawable) ?

                ((ColorDrawable) getBackground()).getColor() : 0;

        if (existingBgColor != t.colorPrimary) {

        if (existingBgColor != t.colorPrimary) {

            mBackgroundColorDrawable.setColor(t.colorPrimary);

            mBackgroundColorDrawable.setColor(t.colorPrimary);

            mBackgroundColor = t.colorPrimary;

            mBackgroundColor = t.colorPrimary;