Merge "Use general permission API."

3 files changed, 97 insertions, 0 deletions

diff --git a/res/layout/permissions_prompt.xml b/res/layout/permissions_prompt.xml
new file mode 100644
index 0000000..d18d796
--- /dev/null
+++ b/res/layout/permissions_prompt.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+
+     This is the layout for the Geolocation permissions prompt.
+-->
+
+<com.android.browser.PermissionsPrompt
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/geolocation_permissions_prompt_background"
+    android:visibility="gone">
+
+    <!-- 'google.com wants to know your location' -->
+    <TextView android:id="@+id/message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:scrollHorizontally="true"
+        android:padding="6dip"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <CheckBox android:id="@+id/remember"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/message"
+        android:layout_alignLeft="@id/message" />
+    <TextView
+        android:paddingLeft="4dip"
+        android:text="@string/permissions_prompt_remember"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:layout_alignBaseline="@id/remember"
+        android:layout_toRightOf="@id/remember" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/remember"
+        android:orientation="vertical"
+        android:divider="?android:attr/dividerHorizontal"
+        android:showDividers="beginning"
+        android:dividerPadding="16dip"
+        android:background="@null">
+        <LinearLayout
+            style="?android:attr/buttonBarStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingLeft="2dip"
+            android:paddingRight="2dip"
+            android:measureWithLargestChild="true"
+            android:background="@null">
+            <Button
+                android:id="@+id/deny_button"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_weight="1"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:text="@string/permissions_prompt_deny" />
+            <Button
+                android:id="@+id/allow_button"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_weight="1"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:text="@string/permissions_prompt_allow" />
+        </LinearLayout>
+    </LinearLayout>
+
+</com.android.browser.PermissionsPrompt>
diff --git a/res/layout/tab.xml b/res/layout/tab.xml
index 69baf56..040c977 100755
--- a/res/layout/tab.xml
+++ b/res/layout/tab.xml
@@ -31,6 +31,12 @@
         android:layout_height="0dip"
         android:layout_weight="1" />
 
+    <!-- Permissions prompt -->
+    <ViewStub android:id="@+id/permissions_prompt"
+        android:layout="@layout/permissions_prompt"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
     <!-- Geolocation permissions prompt -->
     <ViewStub android:id="@+id/geolocation_permissions_prompt"
         android:layout="@layout/geolocation_permissions_prompt"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 079d893..8a0fd49 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -854,6 +854,13 @@
 
     <!-- Geolocation -->
     <!-- Permissions prompt -->
+    <string name="permissions_prompt_message"><xliff:g id="website origin" example="maps.google.com">%s</xliff:g> wants to use your <xliff:g id="resources" example="camera, microphone">%s</xliff:g>.</string>
+    <string name="permissions_prompt_allow">Allow</string>
+    <string name="permissions_prompt_deny">Deny</string>
+    <string name="permissions_prompt_remember">Remember preference</string>
+    <string name="resource_geolocation">location</string>
+    <string name="resource_video_capture">camera</string>
+    <string name="resource_audio_capture">microphone</string>
     <string name="geolocation_permissions_prompt_message"><xliff:g id="website origin" example="maps.google.com">%s</xliff:g> wants to know your location</string>
     <string name="geolocation_permissions_prompt_share">Share location</string>
     <string name="geolocation_permissions_prompt_dont_share">Decline</string>