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

Commit 6efc5dcb authored by Sid Soundararajan's avatar Sid Soundararajan Committed by Android (Google) Code Review
Browse files

Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev

parents 344bd5c6 2cc285e2

packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ public class ViewFocusAnimator implements View.OnFocusChangeListener { 
    private final float mSelectedZDelta;

    private final float mSelectedZDelta;

    private final float mUnselectedSpacing;

    private final float mUnselectedSpacing;

    private final float mSelectedSpacingDelta;

    private final float mSelectedSpacingDelta;

    private final float mDismissIconAlpha;

    private final int mAnimDuration;

    private final int mAnimDuration;

    private final Interpolator mFocusInterpolator;

    private final Interpolator mFocusInterpolator;
@@ -71,6 +72,8 @@ public class ViewFocusAnimator implements View.OnFocusChangeListener { 
        mFocusAnimation.setDuration(mAnimDuration);

        mFocusAnimation.setDuration(mAnimDuration);

        mFocusAnimation.setInterpolator(mFocusInterpolator);

        mFocusAnimation.setInterpolator(mFocusInterpolator);





        mDismissIconAlpha = res.getFloat(R.integer.dismiss_unselected_alpha);



        setFocusProgress(0.0f);

        setFocusProgress(0.0f);





        mFocusAnimation.addListener(new AnimatorListenerAdapter() {

        mFocusAnimation.addListener(new AnimatorListenerAdapter() {
@@ -99,7 +102,7 @@ public class ViewFocusAnimator implements View.OnFocusChangeListener { 
        mTargetView.setPadding((int) spacing, mTargetView.getPaddingTop(),

        mTargetView.setPadding((int) spacing, mTargetView.getPaddingTop(),

                (int) spacing, mTargetView.getPaddingBottom());

                (int) spacing, mTargetView.getPaddingBottom());







        mTargetView.getDismissIconView().setAlpha(mDismissIconAlpha * level);

        mTargetView.getThumbnailView().setZ(z);

        mTargetView.getThumbnailView().setZ(z);

    }

    }

packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -47,6 +47,7 @@ public class TaskCardView extends LinearLayout { 




    private static final String TAG = "TaskCardView";

    private static final String TAG = "TaskCardView";

    private View mThumbnailView;

    private View mThumbnailView;

    private View mDismissIconView;

    private TextView mTitleTextView;

    private TextView mTitleTextView;

    private ImageView mBadgeView;

    private ImageView mBadgeView;

    private Task mTask;

    private Task mTask;
@@ -78,6 +79,7 @@ public class TaskCardView extends LinearLayout { 
        mThumbnailView = findViewById(R.id.card_view_thumbnail);

        mThumbnailView = findViewById(R.id.card_view_thumbnail);

        mTitleTextView = (TextView) findViewById(R.id.card_title_text);

        mTitleTextView = (TextView) findViewById(R.id.card_title_text);

        mBadgeView = (ImageView) findViewById(R.id.card_extra_badge);

        mBadgeView = (ImageView) findViewById(R.id.card_extra_badge);

        mDismissIconView = findViewById(R.id.dismiss_icon);

        mDismissAnimationsHolder = new DismissAnimationsHolder(this);

        mDismissAnimationsHolder = new DismissAnimationsHolder(this);

        View title = findViewById(R.id.card_info_field);

        View title = findViewById(R.id.card_info_field);

        mCornerRadius = getResources().getDimensionPixelSize(

        mCornerRadius = getResources().getDimensionPixelSize(
@@ -316,4 +318,8 @@ public class TaskCardView extends LinearLayout { 
    public View getThumbnailView() {

    public View getThumbnailView() {

        return mThumbnailView;

        return mThumbnailView;

    }

    }



    public View getDismissIconView() {

        return mDismissIconView;

    }

}
 
}