Merge "Fix the tests that interact with the menu" into oc-dev
am: 3e231a5e46
Change-Id: I1da23710e9c3e1adcb2c2c7eb95ba25fc8e68504
diff --git a/src/com/android/emergency/EmergencyTabActivity.java b/src/com/android/emergency/EmergencyTabActivity.java
index 5f14343..3ca6c36 100644
--- a/src/com/android/emergency/EmergencyTabActivity.java
+++ b/src/com/android/emergency/EmergencyTabActivity.java
@@ -20,17 +20,17 @@
import android.app.FragmentManager;
import android.content.res.Configuration;
import android.support.annotation.LayoutRes;
+import android.support.annotation.VisibleForTesting;
import android.support.design.widget.TabLayout;
import android.support.design.widget.TabLayout.TabLayoutOnPageChangeListener;
import android.support.design.widget.TabLayout.ViewPagerOnTabSelectedListener;
import android.support.v13.app.FragmentStatePagerAdapter;
import android.support.v4.view.ViewPager;
import android.util.Pair;
+import android.view.Menu;
import android.view.MenuItem;
import android.widget.Toolbar;
-import com.android.internal.annotations.VisibleForTesting;
-
import java.util.ArrayList;
/**
* An activity uses a tab layout to separate personal and medical information
@@ -39,6 +39,7 @@
public abstract class EmergencyTabActivity extends Activity {
private ViewPagerAdapter mTabsAdapter;
private TabLayout mTabLayout;
+ private Menu mMenu;
private ArrayList<Pair<String, Fragment>> mFragments;
@@ -53,6 +54,17 @@
}
}
+ @VisibleForTesting
+ public Menu getMenu() {
+ return mMenu;
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ mMenu = menu;
+ return super.onCreateOptionsMenu(menu);
+ }
+
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
diff --git a/src/com/android/emergency/edit/EditInfoActivity.java b/src/com/android/emergency/edit/EditInfoActivity.java
index 405e506..fb26e94 100644
--- a/src/com/android/emergency/edit/EditInfoActivity.java
+++ b/src/com/android/emergency/edit/EditInfoActivity.java
@@ -89,7 +89,7 @@
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.edit_info_menu, menu);
- return true;
+ return super.onCreateOptionsMenu(menu);
}
@Override
diff --git a/src/com/android/emergency/view/ViewInfoActivity.java b/src/com/android/emergency/view/ViewInfoActivity.java
index fcfd41b..3b0a7d8 100644
--- a/src/com/android/emergency/view/ViewInfoActivity.java
+++ b/src/com/android/emergency/view/ViewInfoActivity.java
@@ -105,7 +105,7 @@
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.view_info_menu, menu);
- return true;
+ return super.onCreateOptionsMenu(menu);
}
@Override
diff --git a/tests/src/com/android/emergency/edit/EditInfoActivityTest.java b/tests/src/com/android/emergency/edit/EditInfoActivityTest.java
index 2fff8dd..83df4b5 100644
--- a/tests/src/com/android/emergency/edit/EditInfoActivityTest.java
+++ b/tests/src/com/android/emergency/edit/EditInfoActivityTest.java
@@ -157,8 +157,7 @@
(EditInfoActivity.ClearAllDialogFragment) editInfoActivity.getFragmentManager()
.findFragmentByTag(EditInfoActivity.TAG_CLEAR_ALL_DIALOG);
assertNull(clearAllDialogFragment);
- getInstrumentation().invokeMenuActionSync(editInfoActivity, R.id.action_clear_all,
- 0 /* flags */);
+ editInfoActivity.getMenu().performIdentifierAction(R.id.action_clear_all, 0 /* flags */);
getInstrumentation().waitForIdleSync();
final EditInfoActivity.ClearAllDialogFragment clearAllDialogFragmentAfterwards =
(EditInfoActivity.ClearAllDialogFragment) editInfoActivity.getFragmentManager()
diff --git a/tests/src/com/android/emergency/view/ViewInfoActivityTest.java b/tests/src/com/android/emergency/view/ViewInfoActivityTest.java
index 42df43d..feb8268 100644
--- a/tests/src/com/android/emergency/view/ViewInfoActivityTest.java
+++ b/tests/src/com/android/emergency/view/ViewInfoActivityTest.java
@@ -182,8 +182,7 @@
getInstrumentation().addMonitor(EditInfoActivity.class.getName(),
null /* result */, false /* block */);
- getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_MENU);
- getInstrumentation().invokeMenuActionSync(activity, R.id.action_edit, 0 /* flags */);
+ activity.getMenu().performIdentifierAction(R.id.action_edit, 0 /* flags */);
EditInfoActivity editInfoActivity = (EditInfoActivity)
getInstrumentation().waitForMonitorWithTimeout(activityMonitor, 1000 /* timeOut */);
