Merge "Remove the report view icon Bug:157195530 Test: manual test on Emulator" into qt-dev am: 811e65b9e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11739980
Change-Id: I39ef8df5984b1a2509a74f139162f33abaaec156
diff --git a/apps/CtsVerifier/res/layout/test_list_footer.xml b/apps/CtsVerifier/res/layout/test_list_footer.xml
index cb73ed1..831ea2e 100644
--- a/apps/CtsVerifier/res/layout/test_list_footer.xml
+++ b/apps/CtsVerifier/res/layout/test_list_footer.xml
@@ -28,12 +28,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<Button
- android:id="@+id/view"
- android:text="@string/view"
- android:layout_gravity="center"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
- <Button
android:id="@+id/export"
android:text="@string/export"
android:layout_gravity="center"
diff --git a/apps/CtsVerifier/res/menu/test_list_menu.xml b/apps/CtsVerifier/res/menu/test_list_menu.xml
index ecc6920..20e3cc9 100644
--- a/apps/CtsVerifier/res/menu/test_list_menu.xml
+++ b/apps/CtsVerifier/res/menu/test_list_menu.xml
@@ -4,12 +4,8 @@
android:icon="@android:drawable/ic_menu_delete"
android:title="@string/clear"
android:showAsAction="ifRoom" />
- <item android:id="@+id/view"
- android:icon="@android:drawable/ic_menu_view"
- android:title="@string/view"
- android:showAsAction="ifRoom" />
<item android:id="@+id/export"
android:icon="@android:drawable/ic_menu_save"
android:title="@string/export"
android:showAsAction="ifRoom" />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/apps/CtsVerifier/res/values/integers.xml b/apps/CtsVerifier/res/values/integers.xml
index 2ced54b..508c52c 100644
--- a/apps/CtsVerifier/res/values/integers.xml
+++ b/apps/CtsVerifier/res/values/integers.xml
@@ -14,5 +14,5 @@
limitations under the License.
-->
<resources>
- <integer name="test_list_footer_button_count">3</integer>
+ <integer name="test_list_footer_button_count">2</integer>
</resources>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/TestListActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/TestListActivity.java
index 4dd7777..ab7799c 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/TestListActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/TestListActivity.java
@@ -91,7 +91,6 @@
View footer = getLayoutInflater().inflate(R.layout.test_list_footer, null);
footer.findViewById(R.id.clear).setOnClickListener(this);
- footer.findViewById(R.id.view).setOnClickListener(this);
footer.findViewById(R.id.export).setOnClickListener(this);
getListView().addFooterView(footer);
@@ -143,13 +142,6 @@
.show();
}
- private void handleViewItemSelected() {
- TestResultsReport report = new TestResultsReport(this, mAdapter);
- Intent intent = new Intent(this, ReportViewerActivity.class);
- intent.putExtra(ReportViewerActivity.EXTRA_REPORT_CONTENTS, report.getContents());
- startActivity(intent);
- }
-
private void handleExportItemSelected() {
new ReportExporter(this, mAdapter).execute();
}
@@ -157,8 +149,6 @@
private boolean handleMenuItemSelected(int id) {
if (id == R.id.clear) {
handleClearItemSelected();
- } else if (id == R.id.view) {
- handleViewItemSelected();
} else if (id == R.id.export) {
handleExportItemSelected();
} else {