am 353c4140: am 2819f47f: am 3e265823: Merge "Make non-clickable item not focusable" into lollipop-cts-dev automerge: a55bf06
* commit '353c4140a837a4df9469bc67fbc65484eb5a80a6':
Make non-clickable item not focusable
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/tv/TvAppVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/tv/TvAppVerifierActivity.java
index 3529237..12e9652 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/tv/TvAppVerifierActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/tv/TvAppVerifierActivity.java
@@ -63,6 +63,7 @@
protected void setButtonEnabled(View item, boolean enabled) {
View button = item.findViewById(R.id.user_action_button);
+ button.setFocusable(enabled);
button.setClickable(enabled);
button.setEnabled(enabled);
}
@@ -70,9 +71,7 @@
protected void setPassState(View item, boolean passed) {
ImageView status = (ImageView) item.findViewById(R.id.status);
status.setImageResource(passed ? R.drawable.fs_good : R.drawable.fs_error);
- View button = item.findViewById(R.id.user_action_button);
- button.setClickable(false);
- button.setEnabled(false);
+ setButtonEnabled(item, false);
status.invalidate();
}