Add a back arrow in test activitiy.All test activity will have an option
to back to upper level.
Bug:152685192
Test: manual test on Emulator
Change-Id: Ic63becedd7770831966d2ac0fbdaa2db6cd5ba65
(cherry picked from commit 1472522019a54a6050b698e0e73f303676ced4a0)
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/PassFailButtons.java b/apps/CtsVerifier/src/com/android/cts/verifier/PassFailButtons.java
index 7776d27..c8a667b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/PassFailButtons.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/PassFailButtons.java
@@ -35,6 +35,8 @@
import android.view.View.OnClickListener;
import android.widget.ImageButton;
import android.widget.Toast;
+import android.app.ActionBar;
+import android.view.MenuItem;
import java.util.List;
import java.util.stream.Collectors;
@@ -180,6 +182,25 @@
@Override
public TestResultHistoryCollection getHistoryCollection() { return mHistoryCollection; }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ ActionBar actBar = getActionBar();
+ if (actBar != null) {
+ actBar.setDisplayHomeAsUpEnabled(true);
+ }
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ if (item.getItemId() == android.R.id.home) {
+ onBackPressed();
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
+ }
+
}
public static class ListActivity extends android.app.ListActivity implements PassFailActivity {
@@ -234,6 +255,25 @@
@Override
public TestResultHistoryCollection getHistoryCollection() { return mHistoryCollection; }
+
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ ActionBar actBar = getActionBar();
+ if (actBar != null) {
+ actBar.setDisplayHomeAsUpEnabled(true);
+ }
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ if (item.getItemId() == android.R.id.home) {
+ onBackPressed();
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
+ }
}
public static class TestListActivity extends AbstractTestListActivity
@@ -302,6 +342,25 @@
public void updatePassButton() {
getPassButton().setEnabled(mAdapter.allTestsPassed());
}
+
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ ActionBar actBar = getActionBar();
+ if (actBar != null) {
+ actBar.setDisplayHomeAsUpEnabled(true);
+ }
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ if (item.getItemId() == android.R.id.home) {
+ onBackPressed();
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
+ }
}
protected static <T extends android.app.Activity & PassFailActivity>
