Clarify projection widget test and fix a crash
Bug: 25674032
Change-Id: Icef99b97ae15b5275d14738ede8a7ebc7e9a5afe
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index ca525ee..0ba2b14 100644
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -1546,12 +1546,10 @@
<string name="pwa_info">This tests whether or displaying widets and keyfocus navigation works.\n
You should see four buttons on the bottom of the screen.\n
Pressing the "up" and "down" buttons should highlight different buttons.\n
- Further, you should also be able to touch them and they should highlight as usual.</string>
+ Furthermore, the highlight should disappear when any button is touched, and the touched button should behave as usual.\n</string>
<string name="pwa_test">Projection Widget Test</string>
<string name="pwa_button_up">Up</string>
<string name="pwa_button_down">Down</string>
- <string name="pwa_button_left">Left</string>
- <string name="pwa_button_right">Right</string>
<string name="pwa_button">Button</string>
<string name="pla_test">Projection Scrolling List Test</string>
<string name="pla_info">This tests whether a projected list view will scroll properly\n
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/projection/ProjectionActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/projection/ProjectionActivity.java
index 77de71d..11d2445 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/projection/ProjectionActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/projection/ProjectionActivity.java
@@ -123,8 +123,7 @@
mWidth = width;
mHeight = height;
if (mService == null) {
- bindService(mStartIntent, mConnection,
- Context.BIND_AUTO_CREATE);
+ bindService(mStartIntent, mConnection, Context.BIND_AUTO_CREATE);
}
}
@@ -143,6 +142,7 @@
mSurface = null;
unbindService(mConnection);
+ mService = null;
return true;
}