Update Grant Permissions dialog to redlines

Changes:
    - Refactor the ViewHandler a bit to be more generic.
      This should help with another upcoming Wear dialog.
    - Update assets for buttons
    - Add deny asset
    - Fix margins and other UI number tweaks

BUG: 24133550
Change-Id: I330bdf3217fa5c554f71d9105a0475106b6f3e12

1 files changed, 35 insertions, 18 deletions

diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsWatchViewHandler.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsWatchViewHandler.java
index a3d3b805..242d0bce 100644
--- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsWatchViewHandler.java
+++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsWatchViewHandler.java
@@ -2,6 +2,7 @@ package com.android.packageinstaller.permission.ui;
 
 import android.content.Context;
 import android.graphics.PixelFormat;
+import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
 import android.os.Bundle;
 import android.util.Log;
@@ -9,18 +10,19 @@ import android.view.View;
 import android.view.WindowManager;
 
 import com.android.packageinstaller.R;
+import com.android.packageinstaller.permission.ui.wear.ConfirmationViewHandler;
 
 /**
  * Watch-specific view handler for the grant permissions activity.
  */
-final class GrantPermissionsWatchViewHandler extends PermissionConfirmationViewHandler
+final class GrantPermissionsWatchViewHandler extends ConfirmationViewHandler
         implements GrantPermissionsViewHandler {
     private static final String TAG = "GrantPermsWatchViewH";
 
     private static final String ARG_GROUP_NAME = "ARG_GROUP_NAME";
 
     private final Context mContext;
-
+    
     private ResultListener mResultListener;
     
     private String mGroupName;
@@ -101,56 +103,71 @@ final class GrantPermissionsWatchViewHandler extends PermissionConfirmationViewH
         }
     }
 
-    @Override // PermissionConfirmationViewHandler
-    public void onAllow() {
+    @Override // ConfirmationViewHandler
+    public void onButton1() {
         onClick(true /* granted */, false /* doNotAskAgain */);
     }
 
-    @Override // PermissionConfirmationViewHandler
-    public void onDeny() {
+    @Override // ConfirmationViewHandler
+    public void onButton2() {
         onClick(false /* granted */, false /* doNotAskAgain */);
     }
 
-    @Override // PermissionConfirmationViewHandler
-    public void onDenyDoNotAskAgain() {
+    @Override // ConfirmationViewHandler
+    public void onButton3() {
         onClick(false /* granted */, true /* doNotAskAgain */);
     }
 
-    @Override // PermissionConfirmationViewHandler
+    @Override // ConfirmationViewHandler
     public CharSequence getCurrentPageText() {
         return mCurrentPageText;
     }
 
-    @Override // PermissionConfirmationViewHandler
+    @Override // ConfirmationViewHandler
     public Icon getPermissionIcon() {
         return mIcon;
     }
 
-    @Override // PermissionConfirmationViewHandler
+    @Override // ConfirmationViewHandler
     public CharSequence getMessage() {
         return mMessage;
     }
 
-    @Override // PermissionConfirmationViewHandler
+    @Override // ConfirmationViewHandler
     public int getButtonBarMode() {
         return mShowDoNotAsk ? MODE_VERTICAL_BUTTONS : MODE_HORIZONTAL_BUTTONS;
     }
 
-    @Override // PermissionConfirmationViewHandler
-    public CharSequence getVerticalAllowText() {
+    @Override // ConfirmationViewHandler
+    public CharSequence getVerticalButton1Text() {
         return mContext.getString(R.string.grant_dialog_button_allow);
     }
 
-    @Override // PermissionConfirmationViewHandler
-    public CharSequence getVerticalDenyText() {
+    @Override // ConfirmationViewHandler
+    public CharSequence getVerticalButton2Text() {
         return mContext.getString(R.string.grant_dialog_button_deny);
     }
 
-    @Override // PermissionConfirmationViewHandler
-    public CharSequence getVerticalDenyDoNotAskAgainText() {
+    @Override // ConfirmationViewHandler
+    public CharSequence getVerticalButton3Text() {
         return mContext.getString(R.string.grant_dialog_button_deny_dont_ask_again);
     }
 
+    @Override // ConfirmationViewHandler
+    public Drawable getVerticalButton1Icon(){
+        return mContext.getDrawable(R.drawable.confirm_button);
+    }
+
+    @Override // ConfirmationViewHandler
+    public Drawable getVerticalButton2Icon(){
+        return mContext.getDrawable(R.drawable.cancel_button);
+    }
+
+    @Override // ConfirmationViewHandler
+    public Drawable getVerticalButton3Icon(){
+        return mContext.getDrawable(R.drawable.deny_button);
+    }
+
     private void onClick(boolean granted, boolean doNotAskAgain) {
         if (mResultListener != null) {
             mResultListener.onPermissionGrantResult(mGroupName, granted, doNotAskAgain);