summaryrefslogtreecommitdiff
path: root/android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java')
-rw-r--r--android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java15
1 files changed, 1 insertions, 14 deletions
diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java
index 762c49771d0c..b7964299be92 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java
@@ -19,15 +19,6 @@ public class SettingsActivity extends PreferenceActivity {
protected void onCreate(Bundle aSavedInstanceState) {
super.onCreate(aSavedInstanceState);
- setUpPreferences();
- }
-
- private void setUpPreferences() {
- // This action is deprecated
- // but we still need to target pre-Honeycomb devices.
-
- // TODO: try to use a fragment depending on platform version
-
addPreferencesFromResource(R.xml.preferences);
}
@@ -35,17 +26,13 @@ public class SettingsActivity extends PreferenceActivity {
public boolean onOptionsItemSelected(MenuItem aMenuItem) {
switch (aMenuItem.getItemId()) {
case android.R.id.home:
- navigateUp();
+ finish();
return true;
default:
return super.onOptionsItemSelected(aMenuItem);
}
}
-
- private void navigateUp() {
- finish();
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */