diff options
Diffstat (limited to 'main/src/cgeo/geocaching/activity/AbstractActivity.java')
| -rw-r--r-- | main/src/cgeo/geocaching/activity/AbstractActivity.java | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/main/src/cgeo/geocaching/activity/AbstractActivity.java b/main/src/cgeo/geocaching/activity/AbstractActivity.java index 28c0cdd..6e74928 100644 --- a/main/src/cgeo/geocaching/activity/AbstractActivity.java +++ b/main/src/cgeo/geocaching/activity/AbstractActivity.java @@ -2,7 +2,7 @@ package cgeo.geocaching.activity; import butterknife.Views; -import cgeo.geocaching.cgeoapplication; +import cgeo.geocaching.CgeoApplication; import cgeo.geocaching.compatibility.Compatibility; import cgeo.geocaching.network.Cookies; import cgeo.geocaching.settings.Settings; @@ -18,7 +18,7 @@ import android.widget.EditText; public abstract class AbstractActivity extends FragmentActivity implements IAbstractActivity { - protected cgeoapplication app = null; + protected CgeoApplication app = null; protected Resources res = null; private boolean keepScreenOn = false; @@ -86,12 +86,21 @@ public abstract class AbstractActivity extends FragmentActivity implements IAbst } protected void onCreate(final Bundle savedInstanceState, final int resourceLayoutID) { + onCreate(savedInstanceState, resourceLayoutID, false); + } + + protected void onCreate(final Bundle savedInstanceState, final int resourceLayoutID, boolean useDialogTheme) { + super.onCreate(savedInstanceState); initializeCommonFields(); // non declarative part of layout - setTheme(); + if (useDialogTheme) { + setTheme(ActivityMixin.getDialogTheme()); + } else { + setTheme(); + } setContentView(resourceLayoutID); // create view variables @@ -101,7 +110,7 @@ public abstract class AbstractActivity extends FragmentActivity implements IAbst private void initializeCommonFields() { // initialize commonly used members res = this.getResources(); - app = (cgeoapplication) this.getApplication(); + app = (CgeoApplication) this.getApplication(); // only needed in some activities, but implemented in super class nonetheless Cookies.restoreCookieStore(Settings.getCookieStore()); |
