diff options
| author | 2016-03-31 21:46:59 +0000 | |
|---|---|---|
| committer | 2016-03-31 21:47:01 +0000 | |
| commit | 8e2e40a28a53579fe91ce80d770519daa060ea3c (patch) | |
| tree | e9f97e511ebc8d119b4929778a27bcfeb61dd56e | |
| parent | c3af194138f3df8a81a244e041da98097427b4d2 (diff) | |
| parent | 69e852d7590c1683cb96471f1cbe49dee60242cd (diff) | |
Merge "Fix search view tests on handheld devices" into nyc-dev
| -rw-r--r-- | packages/DocumentsUI/tests/src/com/android/documentsui/bots/UiBot.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/bots/UiBot.java b/packages/DocumentsUI/tests/src/com/android/documentsui/bots/UiBot.java index 5b53cafd843d..4c8dc00cc0ae 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/bots/UiBot.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/bots/UiBot.java @@ -162,7 +162,9 @@ public class UiBot extends BaseBot { } UiObject findSearchViewIcon() { - return findObject("com.android.documentsui:id/menu_search", "android:id/search_button"); + return mContext.getResources().getBoolean(R.bool.full_bar_search_view) + ? findObject("com.android.documentsui:id/menu_search") + : findObject("com.android.documentsui:id/menu_search", "android:id/search_button"); } UiObject findActionModeBar() { |