diff options
3 files changed, 22 insertions, 1 deletions
diff --git a/packages/SystemUI/res/values/values_tv.xml b/packages/SystemUI/res/values/values_tv.xml index dc0483f4c988..925941560c83 100644 --- a/packages/SystemUI/res/values/values_tv.xml +++ b/packages/SystemUI/res/values/values_tv.xml @@ -16,5 +16,5 @@ limitations under the License. <resources xmlns:android="http://schemas.android.com/apk/res/android"> <item format="float" type="integer" name="unselected_scale">1.0</item> <item format="float" type="integer" name="selected_scale">1.259</item> - <item format="float" type="integer" name="dismiss_unselected_alpha">0.1</item> + <item format="float" type="integer" name="dismiss_unselected_alpha">0.3</item> </resources> diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java b/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java index c3efe64207ea..82185990c828 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java @@ -104,6 +104,7 @@ public class ViewFocusAnimator implements View.OnFocusChangeListener { mTargetView.getDismissIconView().setAlpha(mDismissIconAlpha * level); mTargetView.getThumbnailView().setZ(z); + mTargetView.getDismissIconView().setZ(z); } public float getFocusProgress() { diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java index 2eede999f478..bd857481e8ff 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java @@ -38,6 +38,8 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.android.systemui.R; +import com.android.systemui.recents.Recents; +import com.android.systemui.recents.misc.SystemServicesProxy; import com.android.systemui.recents.tv.animations.DismissAnimationsHolder; import com.android.systemui.recents.tv.animations.RecentsRowFocusAnimationHolder; import com.android.systemui.recents.tv.animations.ViewFocusAnimator; @@ -85,6 +87,24 @@ public class TaskCardView extends LinearLayout { mCornerRadius = getResources().getDimensionPixelSize( R.dimen.recents_task_view_rounded_corners_radius); mRecentsRowFocusAnimationHolder = new RecentsRowFocusAnimationHolder(this, title); + SystemServicesProxy ssp = Recents.getSystemServices(); + if (ssp.isTouchExplorationEnabled()) { + mDismissIconView.setFocusable(true); + mDismissIconView.setFocusableInTouchMode(true); + mDismissIconView.setOnFocusChangeListener(new OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + if (hasFocus) { + setDismissState(true); + } else { + setDismissState(false); + } + } + }); + } else { + mDismissIconView.setFocusable(false); + mDismissIconView.setFocusableInTouchMode(false); + } mViewFocusAnimator = new ViewFocusAnimator(this); } |