nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-12-23 11:21:29 +00:00
Code Releases Activity

Add ActionBar back button to settings.

Browse source
This commit is contained in:
Felix Ableitner 2014-05-14 14:59:05 +02:00
parent 33840d22ea
commit aa82330c94
2 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/AndroidManifest.xml
View file

@ -26,7 +26,13 @@
<activity <activity
android:name=".SettingsActivity" android:name=".SettingsActivity"
android:label="@string/settings_title" /> android:label="@string/settings_title" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".WebGuiActivity" />
</activity>
<service android:name=".service.SyncthingService" /> <service android:name=".service.SyncthingService" />

25
src/main/java/com/nutomic/syncthingandroid/SettingsActivity.java
View file

@ -2,13 +2,15 @@ package com.nutomic.syncthingandroid;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.support.v4.app.NavUtils;
import android.view.MenuItem;
import com.nutomic.syncthingandroid.service.GetTask; import com.nutomic.syncthingandroid.service.GetTask;
import com.nutomic.syncthingandroid.service.SyncthingService;
public class SettingsActivity extends PreferenceActivity { public class SettingsActivity extends PreferenceActivity {
@ -20,6 +22,12 @@ public class SettingsActivity extends PreferenceActivity {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
// There is currently no way to get ActionBar in PreferenceActivity on pre-honeycomb with
// compatibility library, so we'll have to do a version check.
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
getActionBar().setDisplayHomeAsUpEnabled(true);
}
addPreferencesFromResource(R.xml.settings); addPreferencesFromResource(R.xml.settings);
final PreferenceScreen screen = getPreferenceScreen(); final PreferenceScreen screen = getPreferenceScreen();
final Preference version = screen.findPreference(SYNCTHING_VERSION_KEY); final Preference version = screen.findPreference(SYNCTHING_VERSION_KEY);
@ -46,4 +54,19 @@ public class SettingsActivity extends PreferenceActivity {
} }
return super.onPreferenceTreeClick(preferenceScreen, preference); return super.onPreferenceTreeClick(preferenceScreen, preference);
} }
/**
* Handles ActionBar back selected.
*/
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
NavUtils.navigateUpFromSameTask(this);
return true;
default:
return super.onOptionsItemSelected(item);
}
}
} }