From 97704bfdbd9b5534f2d5c6fa2e232a09d424eaf4 Mon Sep 17 00:00:00 2001 From: apoorv9990 Date: Sun, 26 Apr 2020 09:53:11 -0700 Subject: [PATCH] Closes #9529: changed styling for permissions dialog to set proper padding - Changed the visibility check to check just for the permissions shown instead of all the permissions in WebsitePermissionsState - Added bottom padding to the permissions root view so there is balanced padding on top and bottom --- .../fenix/settings/quicksettings/WebsitePermissionsView.kt | 7 ++++++- app/src/main/res/layout/quicksettings_permissions.xml | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsitePermissionsView.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsitePermissionsView.kt index 1f2c7d371..4ef033dc5 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsitePermissionsView.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsitePermissionsView.kt @@ -55,7 +55,12 @@ class WebsitePermissionsView( * @param state [WebsitePermissionsState] to be rendered. */ fun update(state: WebsitePermissionsState) { - if (state.isVisible) { + val isAnyPermissionVisible = state.camera.isVisible || state.location.isVisible || + state.microphone.isVisible || state.notification.isVisible + + // Can not use state.isVisible because we are not handling the audio permissions here right + // now. If we add more permissions below we should update isAnyPermissionVisible too + if (isAnyPermissionVisible) { interactor.onPermissionsShown() } diff --git a/app/src/main/res/layout/quicksettings_permissions.xml b/app/src/main/res/layout/quicksettings_permissions.xml index ca4cf3a6e..066c561ff 100644 --- a/app/src/main/res/layout/quicksettings_permissions.xml +++ b/app/src/main/res/layout/quicksettings_permissions.xml @@ -9,7 +9,8 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/permissions_view" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_marginBottom="8dp">