diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 410e59f4d..c2cb0def3 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -117,13 +117,7 @@ limitations under the License. android:name="android.app.searchable" android:resource="@xml/search" /> - - - + diff --git a/src/main/java/de/dennisguse/opentracks/AbstractActivity.java b/src/main/java/de/dennisguse/opentracks/AbstractActivity.java index c649ed60f..d981ee875 100644 --- a/src/main/java/de/dennisguse/opentracks/AbstractActivity.java +++ b/src/main/java/de/dennisguse/opentracks/AbstractActivity.java @@ -16,11 +16,9 @@ package de.dennisguse.opentracks; -import android.app.ActionBar; import android.os.Bundle; import android.speech.tts.TextToSpeech; import android.view.Menu; -import android.view.MenuItem; import androidx.fragment.app.FragmentActivity; @@ -39,15 +37,6 @@ public abstract class AbstractActivity extends FragmentActivity { setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM); setContentView(getLayoutResId()); - - // Configure action bar must be after setContentView - if (configureActionBarHomeAsUp()) { - ActionBar actionBar = this.getActionBar(); - if (actionBar != null) { - actionBar.setHomeButtonEnabled(true); - actionBar.setDisplayHomeAsUpEnabled(true); - } - } } /** @@ -55,33 +44,9 @@ public abstract class AbstractActivity extends FragmentActivity { */ protected abstract int getLayoutResId(); - /** - * Returns true to configure the action bar home button as the up button (go to previous activity). - */ - protected boolean configureActionBarHomeAsUp() { - return true; - } - @Override public boolean onCreateOptionsMenu(Menu menu) { TrackIconUtils.setMenuIconColor(menu); return super.onCreateOptionsMenu(menu); } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handles actionBar's home menu item (arrow top left corner) and triggers, up navigation to previous activity. - if (item.getItemId() == android.R.id.home) { - onHomeSelected(); - return true; - } - return super.onOptionsItemSelected(item); - } - - /** - * Callback when the home menu item is selected. E.g., setup the back stack when home is selected. - */ - protected void onHomeSelected() { - finish(); - } } diff --git a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java index 83d527602..6aa93db81 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java @@ -292,20 +292,6 @@ public class TrackDetailActivity extends AbstractTrackActivity implements Choose return R.layout.track_detail; } - @Override - protected void onHomeSelected() { - /* - * TODO: Investigate - * According to - * http://developer.android.com/training/implementing-navigation - * /ancestral.html, we should use NavUtils.shouldUpRecreateTask instead of - * always creating a new back stack. However, NavUtils.shouldUpRecreateTask - * seems to always return false. - */ - TaskStackBuilder.create(this).addParentStack(TrackDetailActivity.class).startActivities(); - finish(); - } - @Override public void onNewIntent(Intent intent) { setIntent(intent); diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java index 044a5cdef..e1c941108 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java @@ -382,11 +382,6 @@ public class TrackListActivity extends AbstractTrackActivity implements FileType return R.layout.track_list; } - @Override - protected boolean configureActionBarHomeAsUp() { - return false; - } - @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.track_list, menu); diff --git a/src/main/java/de/dennisguse/opentracks/settings/AbstractSettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/AbstractSettingsActivity.java deleted file mode 100644 index b65ebe54b..000000000 --- a/src/main/java/de/dennisguse/opentracks/settings/AbstractSettingsActivity.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2012 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package de.dennisguse.opentracks.settings; - -import android.app.ActionBar; -import android.content.Context; -import android.os.Bundle; -import android.preference.ListPreference; -import android.preference.Preference; -import android.preference.Preference.OnPreferenceChangeListener; -import android.preference.PreferenceActivity; -import android.preference.PreferenceManager; -import android.speech.tts.TextToSpeech; -import android.view.MenuItem; - -import de.dennisguse.opentracks.Constants; -import de.dennisguse.opentracks.R; - -/** - * An abstract activity for all the settings activities. - * - * @author Jimmy Shih - */ -public abstract class AbstractSettingsActivity extends PreferenceActivity { - - @Override - protected void onCreate(Bundle bundle) { - super.onCreate(bundle); - setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM); - - ActionBar actionBar = this.getActionBar(); - if (actionBar != null) { - actionBar.setHomeButtonEnabled(true); - actionBar.setDisplayHomeAsUpEnabled(true); - } - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() != android.R.id.home) { - return super.onOptionsItemSelected(item); - } - finish(); - return true; - } -} diff --git a/src/main/java/de/dennisguse/opentracks/settings/ChartSettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/ChartSettingsActivity.java index b17e494bd..516a90283 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/ChartSettingsActivity.java +++ b/src/main/java/de/dennisguse/opentracks/settings/ChartSettingsActivity.java @@ -19,6 +19,7 @@ package de.dennisguse.opentracks.settings; import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.ListPreference; +import android.preference.PreferenceActivity; import de.dennisguse.opentracks.util.PreferencesUtils; import de.dennisguse.opentracks.R; @@ -28,7 +29,7 @@ import de.dennisguse.opentracks.R; * * @author Jimmy Shih */ -public class ChartSettingsActivity extends AbstractSettingsActivity { +public class ChartSettingsActivity extends PreferenceActivity { @Override protected void onCreate(Bundle bundle) { diff --git a/src/main/java/de/dennisguse/opentracks/settings/RecordingSettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/RecordingSettingsActivity.java index 8e63bad53..1278f6772 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/RecordingSettingsActivity.java +++ b/src/main/java/de/dennisguse/opentracks/settings/RecordingSettingsActivity.java @@ -20,6 +20,7 @@ import android.app.Dialog; import android.os.Bundle; import android.preference.ListPreference; import android.preference.Preference; +import android.preference.PreferenceActivity; import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment; import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller; @@ -33,7 +34,7 @@ import de.dennisguse.opentracks.R; * * @author Jimmy Shih */ -public class RecordingSettingsActivity extends AbstractSettingsActivity +public class RecordingSettingsActivity extends PreferenceActivity implements ChooseActivityTypeCaller { private static final int DIALOG_CHOOSE_ACTIVITY = 0; diff --git a/src/main/java/de/dennisguse/opentracks/settings/SensorSettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SensorSettingsActivity.java index 3e0559cd3..bff56cc0d 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/SensorSettingsActivity.java +++ b/src/main/java/de/dennisguse/opentracks/settings/SensorSettingsActivity.java @@ -22,6 +22,7 @@ import android.os.Bundle; import android.preference.ListPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceClickListener; +import android.preference.PreferenceActivity; import android.provider.Settings; import de.dennisguse.opentracks.util.BluetoothDeviceUtils; @@ -37,7 +38,7 @@ import java.util.List; * * @author Jimmy Shih */ -public class SensorSettingsActivity extends AbstractSettingsActivity { +public class SensorSettingsActivity extends PreferenceActivity { @Override protected void onCreate(Bundle bundle) { diff --git a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java index adeec8bab..ede70ed72 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java +++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java @@ -21,6 +21,7 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.preference.Preference; import android.preference.Preference.OnPreferenceClickListener; +import android.preference.PreferenceActivity; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.util.IntentUtils; @@ -31,7 +32,7 @@ import de.dennisguse.opentracks.util.PreferencesUtils; * * @author Jimmy Shih */ -public class SettingsActivity extends AbstractSettingsActivity { +public class SettingsActivity extends PreferenceActivity { private long recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT; diff --git a/src/main/java/de/dennisguse/opentracks/settings/StatsSettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/StatsSettingsActivity.java index 9b57cb965..eda81514a 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/StatsSettingsActivity.java +++ b/src/main/java/de/dennisguse/opentracks/settings/StatsSettingsActivity.java @@ -20,6 +20,7 @@ import android.os.Bundle; import android.preference.ListPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; +import android.preference.PreferenceActivity; import de.dennisguse.opentracks.util.PreferencesUtils; import de.dennisguse.opentracks.R; @@ -30,7 +31,7 @@ import de.dennisguse.opentracks.util.StringUtils; * * @author Jimmy Shih */ -public class StatsSettingsActivity extends AbstractSettingsActivity { +public class StatsSettingsActivity extends PreferenceActivity { @Override protected void onCreate(Bundle bundle) {