resolve merge conflicts of c10abb25f3 to cw-e-dev.

Change-Id: I3fe38a9ac62466b38efec834dceb712d2782c518

1 files changed, 12 insertions, 7 deletions

diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml
index b3565240..086a541a 100644
--- a/res/layout/grant_permissions.xml
+++ b/res/layout/grant_permissions.xml
@@ -18,6 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent" >
+
     <LinearLayout
         android:id="@+id/dialog_container"
         android:layout_width="fill_parent"
@@ -46,7 +47,7 @@
             android:visibility="gone">
         </CheckBox>
 
-        <com.android.internal.widget.ButtonBarLayout
+        <com.android.packageinstaller.permission.ui.ButtonBarLayout
             android:id="@+id/button_group"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -62,8 +63,8 @@
                 android:paddingBottom="4dp"
                 android:paddingEnd="12dp"
                 android:singleLine="true"
-                style="@android:style/TextAppearance.Material.Body2"
-                android:textColor="@color/grant_permissions_progress_color"
+                style="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorSecondary"
                 android:visibility="invisible">
             </TextView>
 
@@ -72,14 +73,16 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:layout_weight="1"
-                android:visibility="invisible" />
+                android:visibility="invisible" >
+            </Space>
 
             <Button
                 android:id="@+id/permission_deny_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="?android:attr/buttonBarButtonStyle"
-                android:text="@string/grant_dialog_button_deny" />
+                android:text="@string/grant_dialog_button_deny" >
+            </Button>
 
             <Button
                 android:id="@+id/permission_allow_button"
@@ -87,9 +90,11 @@
                 android:layout_height="wrap_content"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_marginStart="8dip"
-                android:text="@string/grant_dialog_button_allow" />
+                android:text="@string/grant_dialog_button_allow" >
+            </Button>
 
-        </com.android.internal.widget.ButtonBarLayout>
+        </com.android.packageinstaller.permission.ui.ButtonBarLayout>
 
     </LinearLayout>
+
 </com.android.packageinstaller.permission.ui.ManualLayoutFrame>