diff options
| author | Tao Bai <michaelbai@google.com> | 2014-05-14 16:43:42 -0700 |
|---|---|---|
| committer | Tao Bai <michaelbai@google.com> | 2014-05-15 08:31:21 -0700 |
| commit | ffe54cb32e3a74e82c11bb0f2584588d71332964 (patch) | |
| tree | 75c4f871df581fcc1dca0b9c3e1cf52d7e43a9ad /src/com/android/browser | |
| parent | 440030f0992eec8da2b717566ad4895d9621041c (diff) | |
| download | packages_apps_Browser-ffe54cb32e3a74e82c11bb0f2584588d71332964.zip packages_apps_Browser-ffe54cb32e3a74e82c11bb0f2584588d71332964.tar.gz packages_apps_Browser-ffe54cb32e3a74e82c11bb0f2584588d71332964.tar.bz2 | |
Fix permission related issues
- Hide the 'remember' TextView.
- Correctly display permission combination.
Change-Id: I7242413519d827eada96a692c8a7db3e89eccae4
Diffstat (limited to 'src/com/android/browser')
| -rw-r--r-- | src/com/android/browser/PermissionsPrompt.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/browser/PermissionsPrompt.java b/src/com/android/browser/PermissionsPrompt.java index 284a3ea..e84ab32 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; |