Revert "Make ReviewPermissions a MD full screen dialog"

This reverts commit 0bbd04b3b5995c96fc268713bdfbebe153251bbd.

Change-Id: I69f062bfb74717e17d377f249886e2a814605671

4 files changed, 71 insertions, 64 deletions

diff --git a/res/drawable/ic_close.xml b/res/drawable/ic_close.xml
deleted file mode 100644
index 0a590c64..00000000
--- a/res/drawable/ic_close.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-            android:fillColor="#FFFFFFFF"
-            android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>
-
diff --git a/res/layout/review_permissions.xml b/res/layout/review_permissions.xml
index ad00094c..71d31917 100644
--- a/res/layout/review_permissions.xml
+++ b/res/layout/review_permissions.xml
@@ -14,36 +14,77 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fitsSystemWindows="true"
-        android:orientation="vertical">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_marginTop="32dip"
+    android:layout_marginBottom="8dip"
+    android:orientation="vertical">
 
-    <android.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?android:attr/colorPrimary"
-            android:paddingEnd="8dp"
-            android:elevation="4dp"
-            android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar" />
-
-    <TextView
-            android:id="@+id/message"
-            style="?android:attr/textAppearanceMedium"
-            android:textColor="?android:attr/textColorPrimary"
-            android:layout_width="match_parent"
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dip"
+        android:layout_marginEnd="16dip"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/app_icon"
+            android:layout_width="36dip"
+            android:layout_height="36dip"
+            android:tint="?android:attr/colorAccent"
+            android:scaleType="fitCenter">
+        </ImageView>
+
+        <TextView
+            android:id="@+id/permissions_message"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="16dp" />
+            android:layout_marginStart="16dip"
+            style="?android:attr/textAppearanceMedium">
+        </TextView>
+
+    </LinearLayout>
 
     <FrameLayout
-            android:id="@+id/preferences_frame"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_marginStart="2dip"
-            android:layout_marginEnd="2dip"
-            android:layout_weight="1">
+        android:id="@+id/preferences_frame"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="2dip"
+        android:layout_weight="1">
     </FrameLayout>
 
+    <com.android.packageinstaller.permission.ui.ButtonBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingStart="2dip"
+        android:paddingTop="16dip">
+
+        <Space
+            android:id="@+id/spacer"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:visibility="invisible" />
+
+        <Button
+            android:id="@+id/cancel_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:text="@string/review_button_cancel" />
+
+        <Button
+            android:id="@+id/continue_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_marginStart="8dip"
+            android:text="@string/review_button_continue" />
+
+    </com.android.packageinstaller.permission.ui.ButtonBarLayout>
+
 </LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8946b3b5..12ad5f12 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -278,14 +278,12 @@
         Allow <xliff:g id="app_name" example="Gmail">%1$s</xliff:g> to
         access the following?</string>
 
-    <string name="permission_review_title">Permissions</string>
-
-    <!-- Template for the message when app permissions are reviewed on install. -->
-    <string name="permission_review_message_template_install">Choose what to allow
+    <!-- Template for the screen title when app permissions are reviewed on install. -->
+    <string name="permission_review_title_template_install">Choose what to allow
         <xliff:g id="app_name" example="Gmail">%1$s</xliff:g> to access</string>
 
-    <!-- Template for the message when app permissions are reviewed on update. -->
-    <string name="permission_review_message_template_update">
+    <!-- Template for the screen title when app permissions are reviewed on update. -->
+    <string name="permission_review_title_template_update">
         <xliff:g id="app_name" example="Gmail">%1$s</xliff:g> has been updated.
         Choose what to allow this app to access.</string>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 93108791..db4b744e 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -33,10 +33,4 @@
         <item name="android:windowBackground">@android:color/transparent</item>
     </style>
 
-    <style name="ReviewPermissions"
-            parent="@android:style/Theme.DeviceDefault.Light.DarkActionBar">
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
 </resources>