diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2014-05-18 07:57:12 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2014-05-18 07:57:12 +0200 |
| commit | 5fcce648e200669f1ae0875c7aea9dc3a4a37574 (patch) | |
| tree | f3741fdf0c8fcb6e6728fa49d61af7ea6c7f1aaa /main/src/cgeo/geocaching/AbstractLoggingActivity.java | |
| parent | 6b2972bfd1fdc14cd84f78e3674e97b46675345d (diff) | |
| parent | 786eccacbb285696d504d08ba02c61400ce063a2 (diff) | |
| download | cgeo-5fcce648e200669f1ae0875c7aea9dc3a4a37574.zip cgeo-5fcce648e200669f1ae0875c7aea9dc3a4a37574.tar.gz cgeo-5fcce648e200669f1ae0875c7aea9dc3a4a37574.tar.bz2 | |
Merge remote-tracking branch 'schwabe/actionbar_pullrequest'
Conflicts:
main/res/values/preference_keys.xml
main/src/cgeo/geocaching/CgeoApplication.java
Diffstat (limited to 'main/src/cgeo/geocaching/AbstractLoggingActivity.java')
| -rw-r--r-- | main/src/cgeo/geocaching/AbstractLoggingActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/AbstractLoggingActivity.java b/main/src/cgeo/geocaching/AbstractLoggingActivity.java index c3ba7d2..3b0f78d 100644 --- a/main/src/cgeo/geocaching/AbstractLoggingActivity.java +++ b/main/src/cgeo/geocaching/AbstractLoggingActivity.java @@ -1,6 +1,6 @@ package cgeo.geocaching; -import cgeo.geocaching.activity.AbstractActivity; +import cgeo.geocaching.activity.AbstractActionBarActivity; import cgeo.geocaching.activity.ActivityMixin; import cgeo.geocaching.connector.ConnectorFactory; import cgeo.geocaching.connector.gc.GCConnector; @@ -19,7 +19,7 @@ import android.view.MenuItem; import android.view.SubMenu; import android.widget.EditText; -public abstract class AbstractLoggingActivity extends AbstractActivity { +public abstract class AbstractLoggingActivity extends AbstractActionBarActivity { @Override public boolean onCreateOptionsMenu(final Menu menu) { |