am c7375b1c: am cea5d1c2: am fffcb9d9: am 9661871f: am 8d38cdd2: Merge "Projection Widget Test: Remove two unnecessary buttons" into lollipop-mr1-cts-dev
* commit 'c7375b1c1568c890075885ddd6c4aafc87b3aea3':
Projection Widget Test: Remove two unnecessary buttons
diff --git a/apps/CtsVerifier/res/layout/pwa_widgets.xml b/apps/CtsVerifier/res/layout/pwa_widgets.xml
index 537fc32..6204d3e 100644
--- a/apps/CtsVerifier/res/layout/pwa_widgets.xml
+++ b/apps/CtsVerifier/res/layout/pwa_widgets.xml
@@ -56,20 +56,6 @@
android:layout_weight="1"
android:text="@string/pwa_button_down" />
- <Button
- android:id="@+id/left_button"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:text="@string/pwa_button_left" />
-
- <Button
- android:id="@+id/right_button"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="@string/pwa_button_right" />
-
</LinearLayout>
</LinearLayout>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/projection/widgets/ProjectionWidgetActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/projection/widgets/ProjectionWidgetActivity.java
index 9b862de..9f8cb51 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/projection/widgets/ProjectionWidgetActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/projection/widgets/ProjectionWidgetActivity.java
@@ -67,13 +67,5 @@
button = (Button) view.findViewById(R.id.down_button);
button.setOnClickListener(new InjectDPadClickListener(KeyEvent.KEYCODE_DPAD_DOWN));
}
- {
- button = (Button) view.findViewById(R.id.right_button);
- button.setOnClickListener(new InjectDPadClickListener(KeyEvent.KEYCODE_DPAD_RIGHT));
- }
- {
- button = (Button) view.findViewById(R.id.left_button);
- button.setOnClickListener(new InjectDPadClickListener(KeyEvent.KEYCODE_DPAD_LEFT));
- }
}
}