Skip to content

Commit 64268c7

Browse files
committed
Activity title fixes
1 parent 95749f0 commit 64268c7

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,31 +45,31 @@
4545
<activity
4646
android:name=".NewsActivity"
4747
android:configChanges="orientation|keyboardHidden"
48-
android:label="I2P News"
48+
android:label="@string/label_news"
4949
android:parentActivityName=".MainActivity">
5050
<meta-data
5151
android:name="android.support.PARENT_ACTIVITY"
5252
android:value="net.i2p.android.router.MainActivity" />
5353
</activity>
5454
<activity
5555
android:name="net.i2p.android.help.HelpActivity"
56-
android:label="Help"
56+
android:label="@string/menu_help"
5757
android:parentActivityName=".MainActivity">
5858
<meta-data
5959
android:name="android.support.PARENT_ACTIVITY"
6060
android:value="net.i2p.android.router.MainActivity" />
6161
</activity>
6262
<activity
6363
android:name="net.i2p.android.help.BrowserConfigActivity"
64-
android:label="Browser Configuration"
64+
android:label="@string/label_browser_configuration"
6565
android:parentActivityName=".MainActivity">
6666
<meta-data
6767
android:name="android.support.PARENT_ACTIVITY"
6868
android:value="net.i2p.android.router.MainActivity" />
6969
</activity>
7070
<activity
7171
android:name=".LicenseActivity"
72-
android:label="I2P License Information"
72+
android:label="@string/label_licenses"
7373
android:parentActivityName="net.i2p.android.help.HelpActivity">
7474
<meta-data
7575
android:name="android.support.PARENT_ACTIVITY"
@@ -94,7 +94,7 @@
9494
</activity>
9595
<activity
9696
android:name=".SettingsActivity"
97-
android:label="I2P Settings"
97+
android:label="@string/menu_settings"
9898
android:parentActivityName=".MainActivity">
9999
<meta-data
100100
android:name="android.support.PARENT_ACTIVITY"
@@ -111,7 +111,7 @@
111111
</activity>
112112
<activity
113113
android:name=".addressbook.AddressbookActivity"
114-
android:label="Addressbook"
114+
android:label="@string/label_addressbook"
115115
android:launchMode="singleTop">
116116
<intent-filter>
117117
<action android:name="android.intent.action.SEARCH" />

app/src/main/java/net/i2p/android/i2ptunnel/TunnelDetailActivity.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package net.i2p.android.i2ptunnel;
22

3+
import android.os.Bundle;
4+
35
import net.i2p.android.router.I2PActivityBase;
46
import net.i2p.android.router.R;
5-
import android.os.Bundle;
67

78
public class TunnelDetailActivity extends I2PActivityBase implements
89
TunnelDetailFragment.OnTunnelDeletedListener {
@@ -11,6 +12,8 @@ public void onCreate(Bundle savedInstanceState) {
1112
super.onCreate(savedInstanceState);
1213
mDrawerToggle.setDrawerIndicatorEnabled(false);
1314

15+
getSupportActionBar().setDisplayShowTitleEnabled(false);
16+
1417
if (savedInstanceState == null) {
1518
int tunnelId = getIntent().getIntExtra(TunnelDetailFragment.TUNNEL_ID, 0);
1619
TunnelDetailFragment detailFrag = TunnelDetailFragment.newInstance(tunnelId);

0 commit comments

Comments
 (0)