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

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

Browse Source
This commit is contained in:
Sid Soundararajan
2016-04-21 20:06:29 +00:00
committed by Android (Google) Code Review
parent 344bd5c63d 2cc285e267
commit 6efc5dcb27
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
} }

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

@@ -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;
}
} }