diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ac2a4665..4a4351e6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -105,7 +105,6 @@ + android:label="@string/recovery_code_title" /> + android:permission="com.stevesoltys.seedvault.RESTORE_BACKUP"> diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsActivity.kt index 436a040b..6697e3f4 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsActivity.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsActivity.kt @@ -34,6 +34,7 @@ class SettingsActivity : RequireProvisioningActivity(), OnPreferenceStartFragmen setContentView(R.layout.activity_fragment_container) + setSupportActionBar(requireViewById(R.id.toolbar)) supportActionBar!!.setDisplayHomeAsUpEnabled(true) // always start with settings fragment as a base (when fresh start) diff --git a/app/src/main/res/layout/activity_fragment_container.xml b/app/src/main/res/layout/activity_fragment_container.xml index a9744b96..a688348d 100644 --- a/app/src/main/res/layout/activity_fragment_container.xml +++ b/app/src/main/res/layout/activity_fragment_container.xml @@ -3,7 +3,21 @@ SPDX-FileCopyrightText: 2020 The Calyx Institute SPDX-License-Identifier: Apache-2.0 --> - + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 30dbd156..0e00c947 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -13,8 +13,6 @@ @color/primary @android:color/system_neutral1_50 - - @color/primary @color/primary diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index f5e767a9..5b00ae32 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -4,7 +4,7 @@ --> - - - - -