From e31550c524e69e222c800b651dbbd72a1c4dfcfa Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Fri, 13 Dec 2013 15:19:33 -0800
Subject: [PATCH] Update marker list and marker detail title

---
 MyTracks/AndroidManifest.xml                     |  4 +++-
 MyTracks/res/values/strings.xml                  |  7 +++++++
 .../apps/mytracks/MarkerDetailActivity.java      |  3 ++-
 .../mytracks/fragments/MarkerDetailFragment.java | 16 +++++++++++++---
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 950993282..6ceded19d 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -175,7 +175,9 @@ limitations under the License.
     </activity>
     <activity android:name="com.google.android.apps.mytracks.MarkerEditActivity" />
     <activity android:name="com.google.android.apps.mytracks.MarkerDetailActivity" />
-    <activity android:name="com.google.android.apps.mytracks.MarkerListActivity" >
+    <activity
+      android:label="@string/menu_markers"
+      android:name="com.google.android.apps.mytracks.MarkerListActivity" >
       <meta-data
         android:name="android.app.default_searchable"
         android:value="com.google.android.apps.mytracks.SearchListActivity" />
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index e00746b28..2674e4fc8 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -1084,7 +1084,14 @@ limitations under the License.
       %1$d number. E.g., '1'.">
     Split %1$d
   </string>
+  <string name="marker_title"
+    translation_description="The title of the marker detail page.
 
+      %1$d position. E.g., '1'.
+      %1$d totalt. E.g., '5'.">
+    %1$d of %2$d
+  </string>
+  
   <!-- Marker Detail -->
   <string name="marker_detail_statistics_title"
     translation_description="In the marker detail page, the title for the statistics section
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MarkerDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MarkerDetailActivity.java
index ea9f009b9..be7c2d35a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MarkerDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MarkerDetailActivity.java
@@ -130,7 +130,8 @@ public class MarkerDetailActivity extends AbstractMyTracksActivity implements De
 
     @Override
     public Fragment getItem(int position) {
-      return MarkerDetailFragment.newInstance(markerIds.get(position));
+      String title = getString(R.string.marker_title, position + 1, getCount());
+      return MarkerDetailFragment.newInstance(markerIds.get(position), title);
     }
 
     @Override
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java
index a401a479e..d6cc30455 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java
@@ -61,9 +61,10 @@ import android.widget.TextView;
  */
 public class MarkerDetailFragment extends Fragment {
 
-  public static MarkerDetailFragment newInstance(long markerId) {
+  public static MarkerDetailFragment newInstance(long markerId, String title) {
     Bundle bundle = new Bundle();
     bundle.putLong(KEY_MARKER_ID, markerId);
+    bundle.putString(KEY_TITLE, title);
 
     MarkerDetailFragment fragment = new MarkerDetailFragment();
     fragment.setArguments(bundle);
@@ -72,6 +73,7 @@ public class MarkerDetailFragment extends Fragment {
 
   private static final String TAG = MarkerDetailFragment.class.getSimpleName();
   private static final String KEY_MARKER_ID = "markerId";
+  private static final String KEY_TITLE = "title";
   private static final long HIDE_TEXT_DELAY = 4000L; // 4 seconds
 
   private MyTracksProviderUtils myTracksProviderUtils;
@@ -158,6 +160,14 @@ public class MarkerDetailFragment extends Fragment {
     handler.removeCallbacks(hideText);
   }
 
+  @Override
+  public void setUserVisibleHint(boolean isVisibleToUser) {
+    super.setUserVisibleHint(isVisibleToUser);
+    if (isVisibleToUser) {
+      getActivity().setTitle(getArguments().getString(KEY_TITLE));
+    }
+  }
+
   @Override
   public void setMenuVisibility(boolean menuVisible) {
     super.setMenuVisibility(menuVisible);
@@ -190,10 +200,10 @@ public class MarkerDetailFragment extends Fragment {
     String photoUrl = waypoint.getPhotoUrl();
     boolean hasPhoto = photoUrl != null && !photoUrl.equals("");
     menu.findItem(R.id.marker_detail_view_photo).setVisible(hasPhoto);
-    
+
     TrackIconUtils.setMenuIconColor(menu);
   }
-  
+
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     long markerId = getArguments().getLong(KEY_MARKER_ID);