Added toast to long press on pass/info/fail buttons.
Change-Id: I5fed8b49d422f7afcc3f2b83665e388c4122787a
diff --git a/apps/CtsVerifier/res/layout/pass_fail_buttons.xml b/apps/CtsVerifier/res/layout/pass_fail_buttons.xml
index 5eec539..b269dcd 100644
--- a/apps/CtsVerifier/res/layout/pass_fail_buttons.xml
+++ b/apps/CtsVerifier/res/layout/pass_fail_buttons.xml
@@ -13,28 +13,31 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
<ImageButton android:id="@+id/pass_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_weight="1"
+ android:layout_weight="1"
+ android:contentDescription="@string/pass_button_text"
android:src="@drawable/fs_good"/>
-
+
<ImageButton android:id="@+id/info_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
+ android:contentDescription="@string/info_button_text"
android:src="@drawable/fs_indeterminate"
android:visibility="gone"/>
<ImageButton android:id="@+id/fail_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_weight="1"
+ android:layout_weight="1"
+ android:contentDescription="@string/fail_button_text"
android:src="@drawable/fs_error"/>
-
+
</LinearLayout>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/PassFailButtons.java b/apps/CtsVerifier/src/com/android/cts/verifier/PassFailButtons.java
index 444a250..ab119bd 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/PassFailButtons.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/PassFailButtons.java
@@ -32,6 +32,7 @@
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageButton;
+import android.widget.Toast;
/**
* {@link Activity}s to handle clicks to the pass and fail buttons of the pass fail buttons layout.
@@ -242,8 +243,25 @@
}
};
- activity.findViewById(R.id.pass_button).setOnClickListener(clickListener);
- activity.findViewById(R.id.fail_button).setOnClickListener(clickListener);
+ View passButton = activity.findViewById(R.id.pass_button);
+ passButton.setOnClickListener(clickListener);
+ passButton.setOnLongClickListener(new View.OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View view) {
+ Toast.makeText(activity, R.string.pass_button_text, Toast.LENGTH_SHORT).show();
+ return true;
+ }
+ });
+
+ View failButton = activity.findViewById(R.id.fail_button);
+ failButton.setOnClickListener(clickListener);
+ failButton.setOnLongClickListener(new View.OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View view) {
+ Toast.makeText(activity, R.string.fail_button_text, Toast.LENGTH_SHORT).show();
+ return true;
+ }
+ });
}
private static void setInfo(final android.app.Activity activity, final int titleId,
@@ -257,6 +275,13 @@
showInfoDialog(activity, titleId, messageId, viewId);
}
});
+ infoButton.setOnLongClickListener(new View.OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View view) {
+ Toast.makeText(activity, R.string.info_button_text, Toast.LENGTH_SHORT).show();
+ return true;
+ }
+ });
// Show the info dialog if the user has never seen it before.
if (!hasSeenInfoDialog(activity)) {
