Fix permission related issues

- Hide the 'remember' TextView.
- Correctly display permission combination.

Change-Id: I7242413519d827eada96a692c8a7db3e89eccae4

2 files changed, 7 insertions, 8 deletions

diff --git a/res/layout/permissions_prompt.xml b/res/layout/permissions_prompt.xml
index d18d7966a..55210648b 100644
--- a/res/layout/permissions_prompt.xml
+++ b/res/layout/permissions_prompt.xml
@@ -23,7 +23,6 @@
     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"
@@ -32,11 +31,13 @@
         android:padding="6dip"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
+    <!-- TODO: Implement remember -->
     <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" />
+        android:layout_alignLeft="@id/message"
+        android:visibility="invisible" />
     <TextView
         android:paddingLeft="4dip"
         android:text="@string/permissions_prompt_remember"
@@ -44,7 +45,8 @@
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:layout_alignBaseline="@id/remember"
-        android:layout_toRightOf="@id/remember" />
+        android:layout_toRightOf="@id/remember"
+        android:visibility="invisible" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/src/com/android/browser/PermissionsPrompt.java b/src/com/android/browser/PermissionsPrompt.java
index 284a3eae7..e84ab328b 100644
--- a/src/com/android/browser/PermissionsPrompt.java
+++ b/src/com/android/browser/PermissionsPrompt.java
@@ -58,9 +58,6 @@ public class PermissionsPrompt extends RelativeLayout {
         mAllowButton = (Button) findViewById(R.id.allow_button);
         mDenyButton = (Button) findViewById(R.id.deny_button);
         mRemember = (CheckBox) findViewById(R.id.remember);
-        // TODO: Retain permission.
-        // Hide the Remember checkBox as this feature is missing.
-        mRemember.setVisibility(View.INVISIBLE);
 
         mAllowButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -88,9 +85,9 @@ public class PermissionsPrompt extends RelativeLayout {
         Vector<String> strings = new Vector<String>();
         if ((resources & PermissionRequest.RESOURCE_GEOLOCATION) != 0)
             strings.add(getResources().getString(R.string.resource_geolocation));
-        else if ((resources & PermissionRequest.RESOURCE_VIDEO_CAPTURE) != 0)
+        if ((resources & PermissionRequest.RESOURCE_VIDEO_CAPTURE) != 0)
             strings.add(getResources().getString(R.string.resource_video_capture));
-        else if ((resources & PermissionRequest.RESOURCE_AUDIO_CAPTURE) != 0)
+        if ((resources & PermissionRequest.RESOURCE_AUDIO_CAPTURE) != 0)
             strings.add(getResources().getString(R.string.resource_audio_capture));
         if (strings.isEmpty()) return;