Fix CTS test by renaming button ids to match
BUG: 24264373
Change-Id: I9f04ff68dcd11f48df9331abf2f1775c95f31f99
diff --git a/res/layout-watch/confirmation_dialog.xml b/res/layout-watch/confirmation_dialog.xml
index 2eedae3..783d405 100644
--- a/res/layout-watch/confirmation_dialog.xml
+++ b/res/layout-watch/confirmation_dialog.xml
@@ -72,7 +72,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/conf_diag_button_container_height">
<Button
- android:id="@+id/horizontal_deny_button"
+ android:id="@+id/permission_deny_button"
android:layout_width="54dp"
android:layout_height="54dp"
android:layout_gravity="top|left"
@@ -81,7 +81,7 @@
android:background="@drawable/cancel_button"/>
<Button
- android:id="@+id/horizontal_allow_button"
+ android:id="@+id/permission_allow_button"
android:layout_width="54dp"
android:layout_height="54dp"
android:layout_gravity="top|right"
@@ -89,7 +89,7 @@
android:layout_marginTop="@dimen/conf_diag_2button_margin_top"
android:background="@drawable/confirm_button"/>
</FrameLayout>
-
+
<FrameLayout
android:id="@+id/vertical_button_bar"
android:layout_width="match_parent"
diff --git a/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java b/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java
index d4ed832..277bada 100644
--- a/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java
+++ b/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java
@@ -85,8 +85,8 @@
mHorizontalButtonBar = (ViewGroup) mRoot.findViewById(R.id.horizontal_button_bar);
mVerticalButtonBar = (ViewGroup) mRoot.findViewById(R.id.vertical_button_bar);
- Button horizontalAllow = (Button) mRoot.findViewById(R.id.horizontal_allow_button);
- Button horizontalDeny = (Button) mRoot.findViewById(R.id.horizontal_deny_button);
+ Button horizontalAllow = (Button) mRoot.findViewById(R.id.permission_allow_button);
+ Button horizontalDeny = (Button) mRoot.findViewById(R.id.permission_deny_button);
horizontalAllow.setOnClickListener(this);
horizontalDeny.setOnClickListener(this);
@@ -212,11 +212,11 @@
public void onClick(View v) {
int id = v.getId();
switch (id) {
- case R.id.horizontal_allow_button:
+ case R.id.permission_allow_button:
case R.id.vertical_button1:
onButton1();
break;
- case R.id.horizontal_deny_button:
+ case R.id.permission_deny_button:
case R.id.vertical_button2:
onButton2();
break;
