Merge help and feedback into one menu item

MyTracks/res/menu/track_detail.xml

@@ -86,13 +86,8 @@ limitations under the License.
     android:orderInCategory="14"
     android:title="@string/menu_settings"/>
   <item
-    android:icon="@drawable/ic_menu_feedback"
-    android:id="@+id/track_detail_feedback"
+    android:icon="@drawable/ic_menu_help_feedback"
+    android:id="@+id/track_detail_help_feedback"
     android:orderInCategory="15"
-    android:title="@string/menu_feedback"/>
-  <item
-    android:icon="@drawable/ic_menu_help"
-    android:id="@+id/track_detail_help"
-    android:orderInCategory="16"
-    android:title="@string/menu_help"/>
+    android:title="@string/menu_help_feedback"/>
 </menu>

MyTracks/res/menu/track_list.xml

@@ -55,11 +55,7 @@ limitations under the License.
     android:id="@+id/track_list_settings"
     android:title="@string/menu_settings"/>
   <item
-    android:icon="@drawable/ic_menu_feedback"
-    android:id="@+id/track_list_feedback"
-    android:title="@string/menu_feedback"/>
-  <item
-    android:icon="@drawable/ic_menu_help"
-    android:id="@+id/track_list_help"
-    android:title="@string/menu_help"/>
+    android:icon="@drawable/ic_menu_help_feedback"
+    android:id="@+id/track_list_help_feedback"
+    android:title="@string/menu_help_feedback"/>
 </menu>

MyTracks/res/values/strings.xml

@@ -1137,18 +1137,18 @@ limitations under the License.
       Character limit: ~20 (1 line)">
     Export all
   </string>
-  <string name="menu_feedback"
-    translation_description="In the menu, to enter feedback.
-
-      Character limit: ~20 (1 line)">
-    Feedback
-  </string>
   <string name="menu_help"
     translation_description="In the menu, to go to the help page.
 
       Character limit: ~20 (1 line)">
     Help
   </string>
+  <string name="menu_help_feedback"
+    translation_description="In the menu, to go to the help and feedback page.
+
+      Character limit: ~20 (1 line)">
+    Help &amp; feedback
+  </string>
   <string name="menu_import_all"
     translation_description="In the menu, to import all the tracks from the external storage.
 

MyTracks/src/com/google/android/apps/mytracks/HelpActivity.java

@@ -20,6 +20,8 @@ import com.google.android.apps.mytracks.fragments.AboutDialogFragment;
 import com.google.android.apps.mytracks.fragments.AboutDialogFragment.AboutCaller;
 import com.google.android.apps.mytracks.fragments.EulaDialogFragment;
 import com.google.android.apps.mytracks.fragments.EulaDialogFragment.EulaCaller;
+import com.google.android.apps.mytracks.util.ApiAdapterFactory;
+import com.google.android.apps.mytracks.util.SystemUtils;
 import com.google.android.maps.mytracks.R;
 
 import android.os.Bundle;
@@ -41,6 +43,11 @@ public class HelpActivity extends AbstractMyTracksActivity implements AboutCalle
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
+    String subtitle = getString(R.string.my_tracks_app_name) + " v"
+        + SystemUtils.getMyTracksVersion(this);
+    ApiAdapterFactory.getApiAdapter()
+        .setTitleAndSubtitle(this, getString(R.string.menu_help), subtitle);
+    
     WebView webView = (WebView) findViewById(R.id.help_webview);
     String language = Locale.getDefault().getLanguage();
     if (language == null || language.equals("")) {

MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java

@@ -42,7 +42,6 @@ import com.google.android.apps.mytracks.util.ApiAdapterFactory;
 import com.google.android.apps.mytracks.util.CalorieUtils;
 import com.google.android.apps.mytracks.util.CalorieUtils.ActivityType;
 import com.google.android.apps.mytracks.util.FileUtils;
-import com.google.android.apps.mytracks.util.GoogleFeedbackUtils;
 import com.google.android.apps.mytracks.util.IntentUtils;
 import com.google.android.apps.mytracks.util.PreferencesUtils;
 import com.google.android.apps.mytracks.util.TrackIconUtils;
@@ -362,9 +361,10 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
     Track track = myTracksProviderUtils.getTrack(trackId);
     boolean isSharedWithMe = track != null ? track.isSharedWithMe() : true;
 
-    menu.findItem(R.id.track_detail_edit).setVisible(!isSharedWithMe);
-    menu.findItem(R.id.track_detail_feedback)
-        .setVisible(ApiAdapterFactory.getApiAdapter().isGoogleFeedbackAvailable());
+    menu.findItem(R.id.track_detail_edit).setVisible(!isSharedWithMe);  
+    menu.findItem(R.id.track_detail_help_feedback).setTitle(
+        ApiAdapterFactory.getApiAdapter().isGoogleFeedbackAvailable() ? R.string.menu_help_feedback
+            : R.string.menu_help);
 
     insertMarkerMenuItem = menu.findItem(R.id.track_detail_insert_marker);
     insertPhotoMenuItem = menu.findItem(R.id.track_detail_insert_photo);
@@ -461,10 +461,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
         intent = IntentUtils.newIntent(this, SettingsActivity.class);
         startActivity(intent);
         return true;
-      case R.id.track_detail_feedback:
-        GoogleFeedbackUtils.bindFeedback(this);
-        return true;
-      case R.id.track_detail_help:
+      case R.id.track_detail_help_feedback:
         intent = IntentUtils.newIntent(this, HelpActivity.class);
         startActivity(intent);
         return true;

MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java

@@ -40,7 +40,6 @@ import com.google.android.apps.mytracks.settings.SettingsActivity;
 import com.google.android.apps.mytracks.util.AnalyticsUtils;
 import com.google.android.apps.mytracks.util.ApiAdapterFactory;
 import com.google.android.apps.mytracks.util.EulaUtils;
-import com.google.android.apps.mytracks.util.GoogleFeedbackUtils;
 import com.google.android.apps.mytracks.util.GoogleLocationUtils;
 import com.google.android.apps.mytracks.util.IntentUtils;
 import com.google.android.apps.mytracks.util.ListItemUtils;
@@ -466,8 +465,9 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
   public boolean onCreateOptionsMenu(Menu menu) {
     getMenuInflater().inflate(R.menu.track_list, menu);
 
-    menu.findItem(R.id.track_list_feedback)
-        .setVisible(ApiAdapterFactory.getApiAdapter().isGoogleFeedbackAvailable());
+    menu.findItem(R.id.track_list_help_feedback).setTitle(
+        ApiAdapterFactory.getApiAdapter().isGoogleFeedbackAvailable() ? R.string.menu_help_feedback
+            : R.string.menu_help);
 
     searchMenuItem = menu.findItem(R.id.track_list_search);
     ApiAdapterFactory.getApiAdapter().configureSearchWidget(this, searchMenuItem, trackController);
@@ -568,10 +568,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
         intent = IntentUtils.newIntent(this, SettingsActivity.class);
         startActivity(intent);
         return true;
-      case R.id.track_list_feedback:
-        GoogleFeedbackUtils.bindFeedback(this);
-        return true;
-      case R.id.track_list_help:
+      case R.id.track_list_help_feedback:
         intent = IntentUtils.newIntent(this, HelpActivity.class);
         startActivity(intent);
         return true;

MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java

@@ -172,4 +172,11 @@ public class Api11Adapter extends Api10Adapter {
   public boolean hasDialogTitleDivider() {
     return true;
   }
+  
+  @Override
+  public void setTitleAndSubtitle(Activity activity, String title, String subtitle) {
+    ActionBar actionBar = activity.getActionBar();
+    actionBar.setTitle(title);
+    actionBar.setSubtitle(subtitle);
+  }  
 }

MyTracks/src/com/google/android/apps/mytracks/util/Api8Adapter.java

@@ -155,6 +155,11 @@ public class Api8Adapter implements ApiAdapter {
     return false;
   }
 
+  @Override
+  public void setTitleAndSubtitle(Activity activity, String title, String subtitle) {
+    activity.setTitle(title + " " + subtitle);
+  }
+
   @Override
   public boolean handleSearchKey(MenuItem menuItem) {
     // Return false and allow the framework to handle the search key.

MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java

@@ -192,6 +192,13 @@ public interface ApiAdapter {
    */
   public boolean hasDialogTitleDivider();
 
+  /**
+   * Sets title and subtitle.
+   * <p>
+   * Due to changes in API level 11;
+   */
+  public void setTitleAndSubtitle(Activity activity, String title, String subtitle);
+  
   /**
    * Handles the search key press. Returns true if handled.
    * <p>