blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #3906 - Add backgrounds to Permissions Buttons (#3958)

master
Emily Kager 2019-07-10 21:59:47 -04:00 committed by Colin Lee
parent 9e7282cf18
commit 547c5d7bbe
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/res/layout/component_permissions_blocked_by_android.xml
View File

@ -30,13 +30,15 @@
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:text="@string/phone_feature_blocked_by_android_explanation"/>
<Button
android:id="@+id/settings_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/SitePermissionButton"
android:text="@string/phone_feature_go_to_settings"
android:layout_marginTop="24dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/settings_button"
style="@style/ThemeIndependentMaterialGreyButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:paddingStart="24dp"
android:paddingEnd="24dp"
android:text="@string/phone_feature_go_to_settings" />
</LinearLayout>

17
app/src/main/res/layout/layout_clear_permission_button.xml
View File

@ -1,11 +1,12 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<Button
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/reset_permission"
android:text="@string/clear_permissions"
android:layout_margin="16dp"
style="@style/SitePermissionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/reset_permission"
style="@style/ThemeIndependentMaterialGreyButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:paddingStart="24dp"
android:paddingEnd="24dp"
android:text="@string/clear_permissions" />