From ffe54cb32e3a74e82c11bb0f2584588d71332964 Mon Sep 17 00:00:00 2001 From: Tao Bai Date: Wed, 14 May 2014 16:43:42 -0700 Subject: Fix permission related issues - Hide the 'remember' TextView. - Correctly display permission combination. Change-Id: I7242413519d827eada96a692c8a7db3e89eccae4 --- src/com/android/browser/PermissionsPrompt.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src') 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 strings = new Vector(); 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; -- cgit v1.2.3