Merge N-MR1 to remote branch.

Change-Id: I35095d893ec383aa2573cb6c8e2314e998fdbc6c

Author: Naveen Kumar

AndroidManifest.xml

@@ -22,9 +22,6 @@
 
     <uses-permission android:name="com.google.android.permission.INSTALL_WEARABLE_PACKAGES" />
 
-    <!-- Needed for passing extras with intent ACTION_SHOW_ADMIN_SUPPORT_DETAILS -->
-    <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
-
     <application android:label="@string/app_name"
             android:allowBackup="false"
             android:theme="@style/Theme.DialogWhenLarge"

res/layout/grant_permissions.xml

@@ -19,18 +19,21 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:clipChildren="false"
-    android:paddingLeft="@*android:dimen/floating_window_margin_left"
-    android:paddingRight="@*android:dimen/floating_window_margin_right"
-    android:paddingTop="@*android:dimen/floating_window_margin_top"
-    android:paddingBottom="@*android:dimen/floating_window_margin_bottom"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:paddingTop="8dp"
+    android:paddingBottom="32dp"
     android:clipToPadding="false">
 
+    <ScrollView android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
     <LinearLayout
         android:id="@+id/dialog_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:elevation="@*android:dimen/floating_window_z"
+        android:elevation="16dp"
         android:background="@drawable/dialog_background">
 
         <FrameLayout
@@ -87,7 +90,7 @@
                 </TextView>
 
                 <Space
-                    android:id="@*android:id/spacer"
+                    android:id="@+id/spacer"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:layout_weight="1"
@@ -102,18 +105,20 @@
                     android:text="@string/grant_dialog_button_deny" >
                 </Button>
 
-                <com.android.packageinstaller.permission.ui.SecureButtonView
+                <Button
                     android:id="@+id/permission_allow_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     style="?android:attr/buttonBarButtonStyle"
                     android:text="@string/grant_dialog_button_allow" >
-                </com.android.packageinstaller.permission.ui.SecureButtonView>
+                </Button>
 
             </com.android.packageinstaller.permission.ui.ButtonBarLayout>
 
         </LinearLayout>
 
     </LinearLayout>
 
+    </ScrollView>
+
 </com.android.packageinstaller.permission.ui.ManualLayoutFrame>

res/layout/header.xml

@@ -17,7 +17,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?android:attr/actionBarSize"
-    android:background="?android:attr/colorPrimary"
+    android:background="?android:attr/colorSecondary"
     android:gravity="center_vertical" >
 
     <ImageView android:id="@+id/icon"

res/layout/review_permissions.xml

@@ -56,15 +56,15 @@
         android:layout_weight="1">
     </FrameLayout>
 
-    <com.android.internal.widget.ButtonBarLayout
+    <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="@*android:id/spacer"
+            android:id="@+id/spacer"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_weight="1"
@@ -85,6 +85,6 @@
             android:layout_marginStart="8dip"
             android:text="@string/review_button_continue" />
 
-    </com.android.internal.widget.ButtonBarLayout>
+    </com.android.packageinstaller.permission.ui.ButtonBarLayout>
 
 </LinearLayout>

res/values-am/strings.xml

@@ -86,7 +86,7 @@
     <string name="grant_dialog_button_deny" msgid="2176510645406614340">"ከልክል"</string>
     <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"ለማንኛውም ከልክል"</string>
     <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> ከ<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
-    <string name="permission_warning_template" msgid="7332275268559121742">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; <xliff:g id="ACTION">%2$s</xliff:g> እንዲያደርግ ይፈቀድለት?"</string>
+    <string name="permission_warning_template" msgid="7332275268559121742">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; <xliff:g id="ACTION">%2$s</xliff:g> እንዲከናወን ይፈቀድለት?"</string>
     <string name="grant_dialog_button_allow" msgid="4616529495342337095">"ፍቀድ"</string>
     <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"መተግበሪያዎች"</string>
     <string name="app_permissions" msgid="3146758905824597178">"የመተግበሪያ ፈቃዶች"</string>

res/values-bg/strings.xml

@@ -86,7 +86,7 @@
     <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Отказване"</string>
     <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Отказване въпреки това"</string>
     <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> от <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
-    <string name="permission_warning_template" msgid="7332275268559121742">"Да се разреши ли на &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; следното действие: <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
+    <string name="permission_warning_template" msgid="7332275268559121742">"Разрешаване на &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; да <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
     <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Разрешаване"</string>
     <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Приложения"</string>
     <string name="app_permissions" msgid="3146758905824597178">"Разрешения за приложения"</string>

res/values-bn-rBD/strings.xml

@@ -86,7 +86,7 @@
     <string name="grant_dialog_button_deny" msgid="2176510645406614340">"প্রত্যাখ্যান করুন"</string>
     <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"যাইহোক অস্বীকার করুন"</string>
     <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g> এর <xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>"</string>
-    <string name="permission_warning_template" msgid="7332275268559121742">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt;কে <xliff:g id="ACTION">%2$s</xliff:g> এ অনুমতি দেবেন?"</string>
+    <string name="permission_warning_template" msgid="7332275268559121742">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt;কে <xliff:g id="ACTION">%2$s</xliff:g> এর অনুমতি দেবেন?"</string>
     <string name="grant_dialog_button_allow" msgid="4616529495342337095">"অনুমতি দিন"</string>
     <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"অ্যাপ্লিকেশানগুলি"</string>
     <string name="app_permissions" msgid="3146758905824597178">"অ্যাপ্লিকেশানের অনুমতি"</string>

res/values-es-rUS/strings.xml

@@ -86,7 +86,7 @@
     <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Rechazar"</string>
     <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Denegar de todos modos"</string>
     <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> de <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
-    <string name="permission_warning_template" msgid="7332275268559121742">"¿Permitir que &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; realice la siguiente acción: <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
+    <string name="permission_warning_template" msgid="7332275268559121742">"¿Permitir que la &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; realice la siguiente acción: <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
     <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Permitir"</string>
     <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Aplicaciones"</string>
     <string name="app_permissions" msgid="3146758905824597178">"Permisos de aplicaciones"</string>

res/values-et-rEE/strings.xml

@@ -86,7 +86,7 @@
     <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Keela"</string>
     <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Keela ikkagi"</string>
     <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>/<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>-st"</string>
-    <string name="permission_warning_template" msgid="7332275268559121742">"Kas lubada rakendusele &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; toiming <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
+    <string name="permission_warning_template" msgid="7332275268559121742">"Kas lubada rakendusel &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
     <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Luba"</string>
     <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Rakendused"</string>
     <string name="app_permissions" msgid="3146758905824597178">"Rakenduse load"</string>

res/values-eu-rES/strings.xml

@@ -86,7 +86,7 @@
     <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Ukatu"</string>
     <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Ukatu hala ere"</string>
     <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>/<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
-    <string name="permission_warning_template" msgid="7332275268559121742">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; aplikazioak <xliff:g id="ACTION">%2$s</xliff:g> ahal izatea baimendu nahi duzu?"</string>
+    <string name="permission_warning_template" msgid="7332275268559121742">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; aplikazioari <xliff:g id="ACTION">%2$s</xliff:g> baimena eman nahi diozu?"</string>
     <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Baimendu"</string>
     <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Aplikazioak"</string>
     <string name="app_permissions" msgid="3146758905824597178">"Aplikaziorako baimenak"</string>