diff options
| author | Anthony Hugh <ahugh@google.com> | 2015-09-24 23:35:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-24 23:35:40 +0000 |
| commit | b13684d671a271a2030140ec26948df96d9c5522 (patch) | |
| tree | 41b13c44985c90779897b753cc4265077b95a8ab | |
| parent | c81004d98d7423cc55ba06ad17f95b127a48d724 (diff) | |
| parent | 0d0e466a67a4d73089286c4cb7ea7412cf193686 (diff) | |
| download | android_packages_apps_PackageInstaller-b13684d671a271a2030140ec26948df96d9c5522.tar.gz android_packages_apps_PackageInstaller-b13684d671a271a2030140ec26948df96d9c5522.tar.bz2 android_packages_apps_PackageInstaller-b13684d671a271a2030140ec26948df96d9c5522.zip | |
am 0d0e466a: Fix CTS test by renaming button ids to match
* commit '0d0e466a67a4d73089286c4cb7ea7412cf193686':
Fix CTS test by renaming button ids to match
| -rw-r--r-- | res/layout-watch/confirmation_dialog.xml | 6 | ||||
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/res/layout-watch/confirmation_dialog.xml b/res/layout-watch/confirmation_dialog.xml index 2eedae35..783d4051 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 d4ed8327..277bada9 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 @@ public abstract class ConfirmationViewHandler implements 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 abstract class ConfirmationViewHandler implements 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; |