Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1720-add-up-button-to-feedback-activity' into 'master'

Browse Source 
Add "up navigation" button to FeedbackActivity

See merge request briar/briar!1325
This commit is contained in:
Torsten Grote
2020-12-16 16:52:34 +00:00
parent 04485e58da c6ba2b037a
commit 002feb8e29
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
briar-android/src/main/AndroidManifest.xml
View File

@@ -65,7 +65,7 @@
<service
android:name="org.briarproject.briar.android.NotificationCleanupService"
android:exported="false"></service>
android:exported="false" />
<activity
android:name="org.briarproject.briar.android.reporting.CrashReportActivity"
@@ -77,25 +77,31 @@
android:process=":briar_error_handler"
android:theme="@style/BriarTheme.NoActionBar"
android:windowSoftInputMode="adjustResize|stateHidden" />
<activity
android:name="org.briarproject.briar.android.reporting.FeedbackActivity"
android:exported="false"
android:label="@string/feedback_title"
android:parentActivityName="org.briarproject.briar.android.settings.SettingsActivity"
android:theme="@style/BriarTheme.NoActionBar"
android:windowSoftInputMode="adjustResize|stateHidden" />
android:windowSoftInputMode="adjustResize|stateHidden">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="org.briarproject.briar.android.settings.SettingsActivity" />
</activity>
<activity
android:name="org.briarproject.briar.android.splash.ExpiredActivity"
android:label="@string/app_name"></activity>
android:label="@string/app_name" />
<activity
android:name="org.briarproject.briar.android.login.StartupActivity"
android:label="@string/app_name"></activity>
android:label="@string/app_name" />
<activity
android:name="org.briarproject.briar.android.account.SetupActivity"
android:label="@string/setup_title"
android:windowSoftInputMode="adjustResize|stateAlwaysVisible"></activity>
android:windowSoftInputMode="adjustResize|stateAlwaysVisible" />
<activity
android:name="org.briarproject.briar.android.splash.SplashScreenActivity"
@@ -353,7 +359,7 @@
<activity
android:name="org.briarproject.briar.android.StartupFailureActivity"
android:label="@string/startup_failed_activity_title"></activity>
android:label="@string/startup_failed_activity_title" />
<activity
android:name="org.briarproject.briar.android.settings.SettingsActivity"
@@ -419,11 +425,11 @@
<activity
android:name="org.briarproject.briar.android.logout.ExitActivity"
android:theme="@android:style/Theme.NoDisplay"></activity>
android:theme="@android:style/Theme.NoDisplay" />
<activity
android:name=".android.logout.HideUiActivity"
android:theme="@android:style/Theme.NoDisplay"></activity>
android:theme="@android:style/Theme.NoDisplay" />
<activity
android:name=".android.account.UnlockActivity"

18
briar-android/src/main/java/org/briarproject/briar/android/reporting/FeedbackActivity.java
View File

@@ -1,6 +1,20 @@
package org.briarproject.briar.android.reporting;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBar;
public class FeedbackActivity extends CrashReportActivity {
// this is used so it can run in the app process,
// while CrashReportActivity runs in a dedicated process
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
actionBar.setHomeButtonEnabled(true);
actionBar.setDisplayHomeAsUpEnabled(true);
}
}
}