From 26512da615607cdd0131f73b473e666cfc29519e Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Thu, 13 Sep 2012 14:52:51 -0700 Subject: [PATCH] Code cleanup: rename keys for save instance state --- .../android/apps/mytracks/TrackDetailActivity.java | 6 +++--- .../android/apps/mytracks/fragments/MapFragment.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java index b6c369226..3d67dc100 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java @@ -73,7 +73,7 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del public static final String EXTRA_MARKER_ID = "marker_id"; 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 private TrackRecordingServiceConnection trackRecordingServiceConnection; @@ -220,7 +220,7 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del getResources().getDrawable(R.drawable.tab_stats)); tabManager.addTab(statsTabSpec, StatsFragment.class, 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); showMarker(); @@ -249,7 +249,7 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putString(CURRENT_TAG_KEY, tabHost.getCurrentTabTag()); + outState.putString(CURRENT_TAB_TAG_KEY, tabHost.getCurrentTabTag()); } @Override diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java index 6638664e5..ba236bccf 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java +++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java @@ -66,8 +66,8 @@ public class MapFragment extends Fragment public static final String MAP_FRAGMENT_TAG = "mapFragment"; - private static final String KEY_CURRENT_LOCATION = "currentLocation"; - private static final String KEY_KEEP_MY_LOCATION_VISIBLE = "keepMyLocationVisible"; + private static final String CURRENT_LOCATION_KEY = "current_location_key"; + private static final String KEEP_MY_LOCATION_VISIBLE_KEY = "keep_my_location_visible_key"; private TrackDataHub trackDataHub; @@ -133,8 +133,8 @@ public class MapFragment extends Fragment public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); if (savedInstanceState != null) { - keepMyLocationVisible = savedInstanceState.getBoolean(KEY_KEEP_MY_LOCATION_VISIBLE, false); - currentLocation = (Location) savedInstanceState.getParcelable(KEY_CURRENT_LOCATION); + keepMyLocationVisible = savedInstanceState.getBoolean(KEEP_MY_LOCATION_VISIBLE_KEY, false); + currentLocation = (Location) savedInstanceState.getParcelable(CURRENT_LOCATION_KEY); if (currentLocation != null) { updateCurrentLocation(); } @@ -150,9 +150,9 @@ public class MapFragment extends Fragment @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putBoolean(KEY_KEEP_MY_LOCATION_VISIBLE, keepMyLocationVisible); + outState.putBoolean(KEEP_MY_LOCATION_VISIBLE_KEY, keepMyLocationVisible); if (currentLocation != null) { - outState.putParcelable(KEY_CURRENT_LOCATION, currentLocation); + outState.putParcelable(CURRENT_LOCATION_KEY, currentLocation); } }