diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-02-02 16:42:47 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-02 16:42:47 +0000 |
| commit | b47ae24a17925619029500a56998860496ce308f (patch) | |
| tree | 0e604126b3cc89aaa15f4b54196470e1caf6fce8 /src | |
| parent | ce7543bef301f2a622023b2633166409de93d09e (diff) | |
| parent | 43dfbdb57dd39f24a824c9c33c8886481ba25cb9 (diff) | |
| download | southamptonuniversitymap-b47ae24a17925619029500a56998860496ce308f.tar southamptonuniversitymap-b47ae24a17925619029500a56998860496ce308f.tar.gz | |
Merge branch 'dev' of github.com:cbaines/SouthamptonUniversityMap into dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/cbaines/suma/PreferencesActivity.java | 6 | ||||
| -rw-r--r-- | src/net/cbaines/suma/SouthamptonUniversityMapActivity.java | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/net/cbaines/suma/PreferencesActivity.java b/src/net/cbaines/suma/PreferencesActivity.java index b7c1d89..d5df6a1 100644 --- a/src/net/cbaines/suma/PreferencesActivity.java +++ b/src/net/cbaines/suma/PreferencesActivity.java @@ -23,12 +23,6 @@ import android.os.Bundle; import android.preference.PreferenceActivity; public class PreferencesActivity extends PreferenceActivity { - boolean CheckboxPreference; - String ListPreference; - String editTextPreference; - String ringtonePreference; - String secondEditTextPreference; - String customPref; @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java b/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java index 927f41e..52b3e1f 100644 --- a/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java +++ b/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java @@ -138,8 +138,10 @@ public class SouthamptonUniversityMapActivity extends OrmLiteBaseActivity<Databa pastOverlays = (HashMap<String, Overlay>) getLastNonConfigurationInstance(); // SensorManager mSensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE); This code in the following constructor causes problems in - // some emulators, disable there sensors to fix. + // some emulators, disable sensors to fix. + Log.i(TAG, "Starting creating myLocationOverlay"); myLocationOverlay = new MyLocationOverlay(instance, mapView); + Log.i(TAG, "Finished creating myLocationOverlay"); while (databaseThread.isAlive()) { Thread.yield(); @@ -241,7 +243,7 @@ public class SouthamptonUniversityMapActivity extends OrmLiteBaseActivity<Databa // of your application so we are gonna be able to overwrite that database with our database. Log.i(TAG, "GetReadableDatabase"); helper.getWritableDatabase().close(); - + helper.copyDataBase(); Log.i(TAG, "Out of copy database"); } catch (IOException ioe) { |