From c2ff90af9156acdd900a6b43350e3f494432e394 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Wed, 14 Aug 2013 05:12:31 +0000
Subject: [PATCH] Fixed activity parents
---
AndroidManifest.xml.in | 8 ++++----
src/net/i2p/android/router/activity/LicenseActivity.java | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/AndroidManifest.xml.in b/AndroidManifest.xml.in
index e885b7ec3..4b807300a 100644
--- a/AndroidManifest.xml.in
+++ b/AndroidManifest.xml.in
@@ -32,11 +32,9 @@
android:label="I2P News"
android:configChanges="orientation|keyboardHidden" >
</activity>
- <activity android:name=".activity.TextResourceActivity"
- android:label="I2P Information" >
- </activity>
<activity android:name=".activity.LicenseActivity"
- android:label="I2P License Information" >
+ android:label="I2P License Information"
+ android:parentActivityName=".activity.MainActivity" >
</activity>
<activity android:name=".activity.WebActivity"
android:label="I2P Web Browser"
@@ -50,10 +48,12 @@
</activity>
<activity android:name=".activity.SettingsActivity"
android:label="I2P Settings"
+ android:parentActivityName=".activity.MainActivity"
android:launchMode="singleTop" >
</activity>
<activity android:name=".activity.AddressbookSettingsActivity"
android:label="I2P Addressbook Settings"
+ android:parentActivityName=".activity.AddressbookActivity"
android:launchMode="singleTop" >
</activity>
<activity android:name=".activity.AddressbookActivity"
diff --git a/src/net/i2p/android/router/activity/LicenseActivity.java b/src/net/i2p/android/router/activity/LicenseActivity.java
index 0a7ca334e..2e679dabf 100644
--- a/src/net/i2p/android/router/activity/LicenseActivity.java
+++ b/src/net/i2p/android/router/activity/LicenseActivity.java
@@ -8,6 +8,7 @@ public class LicenseActivity extends I2PActivityBase {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ mDrawerToggle.setDrawerIndicatorEnabled(false);
// Start with the base view
if (savedInstanceState == null) {
LicenseFragment f = new LicenseFragment();
--
GitLab