karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Code cleanup: rename keys for save instance state

Browse Source
This commit is contained in:
Jimmy Shih
2012-09-13 14:52:51 -07:00
parent 5e7966b6e0
commit 26512da615
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+3 -3
View File
@@ -73,7 +73,7 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
public static final String EXTRA_MARKER_ID = "marker_id"; public static final String EXTRA_MARKER_ID = "marker_id";
private static final String TAG = TrackDetailActivity.class.getSimpleName(); private static final String TAG = TrackDetailActivity.class.getSimpleName();
private static final String CURRENT_TAG_KEY = "tab"; private static final String CURRENT_TAB_TAG_KEY = "current_tab_tag_key";
// The following are set in onCreate // The following are set in onCreate
private TrackRecordingServiceConnection trackRecordingServiceConnection; private TrackRecordingServiceConnection trackRecordingServiceConnection;
@@ -220,7 +220,7 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
getResources().getDrawable(R.drawable.tab_stats)); getResources().getDrawable(R.drawable.tab_stats));
tabManager.addTab(statsTabSpec, StatsFragment.class, null); tabManager.addTab(statsTabSpec, StatsFragment.class, null);
if (savedInstanceState != null) { if (savedInstanceState != null) {
tabHost.setCurrentTabByTag(savedInstanceState.getString(CURRENT_TAG_KEY)); tabHost.setCurrentTabByTag(savedInstanceState.getString(CURRENT_TAB_TAG_KEY));
} }
trackController = new TrackController(this, trackRecordingServiceConnection, false, recordListener, stopListener); trackController = new TrackController(this, trackRecordingServiceConnection, false, recordListener, stopListener);
showMarker(); showMarker();
@@ -249,7 +249,7 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
@Override @Override
protected void onSaveInstanceState(Bundle outState) { protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putString(CURRENT_TAG_KEY, tabHost.getCurrentTabTag()); outState.putString(CURRENT_TAB_TAG_KEY, tabHost.getCurrentTabTag());
} }
@Override @Override
MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java
+6 -6
View File
@@ -66,8 +66,8 @@ public class MapFragment extends Fragment
public static final String MAP_FRAGMENT_TAG = "mapFragment"; public static final String MAP_FRAGMENT_TAG = "mapFragment";
private static final String KEY_CURRENT_LOCATION = "currentLocation"; private static final String CURRENT_LOCATION_KEY = "current_location_key";
private static final String KEY_KEEP_MY_LOCATION_VISIBLE = "keepMyLocationVisible"; private static final String KEEP_MY_LOCATION_VISIBLE_KEY = "keep_my_location_visible_key";
private TrackDataHub trackDataHub; private TrackDataHub trackDataHub;
@@ -133,8 +133,8 @@ public class MapFragment extends Fragment
public void onActivityCreated(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
if (savedInstanceState != null) { if (savedInstanceState != null) {
keepMyLocationVisible = savedInstanceState.getBoolean(KEY_KEEP_MY_LOCATION_VISIBLE, false); keepMyLocationVisible = savedInstanceState.getBoolean(KEEP_MY_LOCATION_VISIBLE_KEY, false);
currentLocation = (Location) savedInstanceState.getParcelable(KEY_CURRENT_LOCATION); currentLocation = (Location) savedInstanceState.getParcelable(CURRENT_LOCATION_KEY);
if (currentLocation != null) { if (currentLocation != null) {
updateCurrentLocation(); updateCurrentLocation();
} }
@@ -150,9 +150,9 @@ public class MapFragment extends Fragment
@Override @Override
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putBoolean(KEY_KEEP_MY_LOCATION_VISIBLE, keepMyLocationVisible); outState.putBoolean(KEEP_MY_LOCATION_VISIBLE_KEY, keepMyLocationVisible);
if (currentLocation != null) { if (currentLocation != null) {
outState.putParcelable(KEY_CURRENT_LOCATION, currentLocation); outState.putParcelable(CURRENT_LOCATION_KEY, currentLocation);
} }
} }