mirror of
https://github.com/M66B/FairEmail.git
synced 2025-01-03 13:44:40 +00:00
Merge branch 'master' into setup
This commit is contained in:
commit
2aeb37de1b
1 changed files with 2 additions and 2 deletions
|
@ -419,7 +419,7 @@ public class FragmentSetup extends FragmentBase {
|
|||
|
||||
tvDozeDone.setText(ignoring ? R.string.title_setup_done : R.string.title_setup_to_do);
|
||||
tvDozeDone.setTextColor(ignoring ? textColorPrimary : colorWarning);
|
||||
tvDozeDone.setTypeface(tvDozeDone.getTypeface(), ignoring ? Typeface.NORMAL : Typeface.BOLD);
|
||||
tvDozeDone.setTypeface(null, ignoring ? Typeface.NORMAL : Typeface.BOLD);
|
||||
tvDozeDone.setCompoundDrawablesWithIntrinsicBounds(ignoring ? check : null, null, null, null);
|
||||
|
||||
// https://developer.android.com/training/basics/network-ops/data-saver.html
|
||||
|
@ -447,7 +447,7 @@ public class FragmentSetup extends FragmentBase {
|
|||
|
||||
tvPermissionsDone.setText(granted ? R.string.title_setup_done : R.string.title_setup_to_do);
|
||||
tvPermissionsDone.setTextColor(granted ? textColorPrimary : colorWarning);
|
||||
tvPermissionsDone.setTypeface(tvPermissionsDone.getTypeface(), granted ? Typeface.NORMAL : Typeface.BOLD);
|
||||
tvPermissionsDone.setTypeface(null, granted ? Typeface.NORMAL : Typeface.BOLD);
|
||||
tvPermissionsDone.setCompoundDrawablesWithIntrinsicBounds(granted ? check : null, null, null, null);
|
||||
btnPermissions.setEnabled(!granted);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue