diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-05-18 23:02:26 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-05-18 23:02:53 +0200 |
| commit | 14ca81b117fec9febed984a5cb159dc0665753f2 (patch) | |
| tree | 5e2c3fd94fa60edcdc652d2b670f4c91950ecaf5 /main/src/cgeo/geocaching/activity | |
| parent | 916992dc8398db364927a50a8ceb46f3053fce96 (diff) | |
| download | cgeo-14ca81b117fec9febed984a5cb159dc0665753f2.zip cgeo-14ca81b117fec9febed984a5cb159dc0665753f2.tar.gz cgeo-14ca81b117fec9febed984a5cb159dc0665753f2.tar.bz2 | |
Don't let the OAuth dialogs use the Dialog theme
This fixes the crash when a OAuth dialog is shown, a correct fix would to convert the OAuth dialogs to activities/DialogFragment but that is more work and can be done later.
Diffstat (limited to 'main/src/cgeo/geocaching/activity')
| -rw-r--r-- | main/src/cgeo/geocaching/activity/AbstractActionBarActivity.java | 6 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/activity/AbstractActivity.java | 11 |
2 files changed, 2 insertions, 15 deletions
diff --git a/main/src/cgeo/geocaching/activity/AbstractActionBarActivity.java b/main/src/cgeo/geocaching/activity/AbstractActionBarActivity.java index b35f6e3..615a432 100644 --- a/main/src/cgeo/geocaching/activity/AbstractActionBarActivity.java +++ b/main/src/cgeo/geocaching/activity/AbstractActionBarActivity.java @@ -20,12 +20,6 @@ public class AbstractActionBarActivity extends AbstractActivity { showProgress(false); } - @Override - protected void onCreate(Bundle savedInstanceState, int resourceLayoutID, boolean useDialogTheme) { - super.onCreate(savedInstanceState, resourceLayoutID, useDialogTheme); - initUpAction(); - showProgress(false); - } private void initUpAction() { getSupportActionBar().setDisplayHomeAsUpEnabled(true); diff --git a/main/src/cgeo/geocaching/activity/AbstractActivity.java b/main/src/cgeo/geocaching/activity/AbstractActivity.java index 42eb825..d7d88b5 100644 --- a/main/src/cgeo/geocaching/activity/AbstractActivity.java +++ b/main/src/cgeo/geocaching/activity/AbstractActivity.java @@ -114,21 +114,14 @@ public abstract class AbstractActivity extends ActionBarActivity implements IAbs } 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 - if (useDialogTheme) { - setTheme(ActivityMixin.getDialogTheme()); - } else { - setTheme(); - } + setTheme(); + setContentView(resourceLayoutID); // create view variables |
