From 68f84c5d39ca0e3b406697c29c14d86ac0724b2f Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Wed, 8 Jan 2014 15:46:41 -0800
Subject: [PATCH] Add menu items to Help and Feedback page

---
 MyTracks/res/layout-v14/help_buttons.xml      | 29 -------
 MyTracks/res/layout/about.xml                 | 49 ------------
 MyTracks/res/layout/help.xml                  |  9 ++-
 .../help_buttons.xml => menu/help.xml}        | 26 +++---
 MyTracks/res/values/do_not_translate.xml      |  2 -
 MyTracks/res/values/strings.xml               | 60 +++++++-------
 .../android/apps/mytracks/HelpActivity.java   | 54 +++++++++----
 .../fragments/AboutDialogFragment.java        | 80 -------------------
 .../fragments/EulaDialogFragment.java         |  2 +-
 9 files changed, 87 insertions(+), 224 deletions(-)
 delete mode 100644 MyTracks/res/layout-v14/help_buttons.xml
 delete mode 100644 MyTracks/res/layout/about.xml
 rename MyTracks/res/{layout/help_buttons.xml => menu/help.xml} (57%)
 delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/fragments/AboutDialogFragment.java

diff --git a/MyTracks/res/layout-v14/help_buttons.xml b/MyTracks/res/layout-v14/help_buttons.xml
deleted file mode 100644
index c116a4d80..000000000
--- a/MyTracks/res/layout-v14/help_buttons.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2012 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <!-- In v14, postive button on the right. -->
-  <Button
-    android:id="@+id/help_about"
-    android:layout_gravity="left"
-    android:text="@string/help_about"
-    style="@style/BottomButton" />
-  <Button
-    android:id="@+id/help_ok"
-    android:layout_gravity="right"
-    android:text="@string/generic_ok"
-    style="@style/BottomButton" />
-</merge>
\ No newline at end of file
diff --git a/MyTracks/res/layout/about.xml b/MyTracks/res/layout/about.xml
deleted file mode 100644
index f6c731395..000000000
--- a/MyTracks/res/layout/about.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2008 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/ScrollView" >
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:orientation="vertical"
-    android:padding="8dp" >
-    <TextView
-      android:drawableLeft="@drawable/ic_launcher_my_tracks"
-      android:text="@string/about_copyright_notice"
-      style="@style/TextMedium.WithIcon" />
-    <TextView
-      android:text="@string/about_version"
-      style="@style/TextLarge" />
-    <TextView
-      android:id="@+id/about_version"
-      style="@style/AboutValue" />
-    <TextView
-      android:text="@string/about_support"
-      style="@style/TextLarge" />
-    <TextView
-      android:autoLink="web"
-      android:text="@string/my_tracks_support_url"
-      style="@style/AboutValue" />
-    <TextView
-      android:text="@string/about_privacy"
-      style="@style/TextLarge" />
-    <TextView
-      android:autoLink="web"
-      android:text="@string/my_tracks_privacy_url"
-      style="@style/AboutValue" />
-  </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/MyTracks/res/layout/help.xml b/MyTracks/res/layout/help.xml
index 1d11b6e53..d2cad60c8 100644
--- a/MyTracks/res/layout/help.xml
+++ b/MyTracks/res/layout/help.xml
@@ -26,6 +26,13 @@ limitations under the License.
   </ScrollView>
   <View style="@style/BottomButtonDivider" />
   <LinearLayout style="@style/BottomButtonBar" >
-    <include layout="@layout/help_buttons" />
+    <Button
+      android:id="@+id/help_feedback"
+      android:layout_gravity="center"
+      android:text="@string/menu_feedback"
+      android:textAllCaps="true"
+      android:textColor="@android:color/white"
+      android:textSize="14sp"
+      style="@style/BottomButton" />
   </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/MyTracks/res/layout/help_buttons.xml b/MyTracks/res/menu/help.xml
similarity index 57%
rename from MyTracks/res/layout/help_buttons.xml
rename to MyTracks/res/menu/help.xml
index 60e8410a0..7c44d4810 100644
--- a/MyTracks/res/layout/help_buttons.xml
+++ b/MyTracks/res/menu/help.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright 2012 Google Inc.
+Copyright 2014 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <Button
-    android:id="@+id/help_ok"
-    android:layout_gravity="left"
-    android:text="@string/generic_ok"
-    style="@style/BottomButton" />
-  <Button
-    android:id="@+id/help_about"
-    android:layout_gravity="right"
-    android:text="@string/help_about"
-    style="@style/BottomButton" />
-</merge>
\ No newline at end of file
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+  <!-- android:icon="@drawable/ic_menu_feedback" -->
+  <item
+    android:id="@+id/help_play_store"
+    android:title="@string/menu_help_play_store"/>
+  <item
+    android:id="@+id/help_eula"
+    android:title="@string/menu_help_eula"/>
+  <item
+    android:id="@+id/help_forum"
+    android:title="@string/menu_help_forum"/>
+</menu>
\ No newline at end of file
diff --git a/MyTracks/res/values/do_not_translate.xml b/MyTracks/res/values/do_not_translate.xml
index fbbb1f14e..436927b64 100644
--- a/MyTracks/res/values/do_not_translate.xml
+++ b/MyTracks/res/values/do_not_translate.xml
@@ -79,9 +79,7 @@ Google은 이용자에 대한 위치정보의 이용∙제공사실을 위치정
   <string name="marker_statistics_icon_url">http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png</string>
   <string name="marker_waypoint_icon_url">http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png</string>
   <string name="my_tracks_help_url">http://support.google.com/gmm/bin/topic.py?topic=2391064&amp;hl=%1$s</string>
-  <string name="my_tracks_privacy_url">www.google.com/policies/privacy/</string>
   <string name="my_tracks_recording_service_name">My Tracks Recording Service</string>
-  <string name="my_tracks_support_url">groups.google.com/a/googleproductforums.com/forum/#!categories/maps/mytracks</string>
   <string name="my_tracks_web_url">www.google.com/mobile/mytracks</string>
   <string name="permission_notification_value">com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS</string>
   <string name="sensor_type_value_ant">ANT</string>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index d131cd922..c498cfd74 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -16,32 +16,6 @@ limitations under the License.
 -->
 <resources>
 
-  <!-- About -->
-  <string name="about_copyright_notice"
-    translation_description="In the 'About My Tracks' page, the copyright notice.">
-    Copyright 2013 Google Inc.
-  </string>
-  <string name="about_license"
-    translation_description="In the 'About My Tracks' page, the button on the bottom to open the
-      'Terms of service' dialog.">
-    License
-  </string>
-  <string name="about_privacy"
-    translation_description="In the 'About My Tracks' page, label for the privacy link. E.g.,
-      'Privacy: m.google.com/privacy'.">
-    Privacy:
-  </string>
-  <string name="about_support"
-    translation_description="In the 'About My Tracks' page, label for the support link. E.g.,
-      'Support: mytracks.appspot.com'.">
-    Support:
-  </string>
-  <string name="about_version"
-    translation_description="In the 'About My Tracks' page, label for the version number. E.g.,
-      'Version: 1.1.11'.">
-    Version:
-  </string>
-
   <!-- Activity Type -->
   <string name="activity_type_airplane"
     translation_description="When entering an 'Activity type', in the auto-complete text box, the
@@ -601,10 +575,6 @@ limitations under the License.
     Any required attribution or notice for the third party content may be found at
     %1$s/legalnotices.
   </string>
-  <string name="eula_title"
-    translation_description="The title for the 'Terms of Service' dialog.">
-    Terms of Service
-  </string>
 
   <!-- Export -->
   <string name="export_all_option"
@@ -1027,7 +997,7 @@ limitations under the License.
   </string>
   <string name="marker_delete_all_confirm_message"
     translation_description="When deleting all markers, the confirmation message.">
-    All markers for this track will be permanently deleted from the device.    
+    All markers for this track will be permanently deleted from the device.
   </string>
   <string name="marker_delete_one_confirm_message"
     translation_description="When deleting one marker, the confirmation message.">
@@ -1039,7 +1009,7 @@ limitations under the License.
   </string>
   <string name="marker_delete_multiple_confirm_message"
     translation_description="When deleting multiple markers, the confirmation message.">
-    The selected markers will be permanently deleted from the device.    
+    The selected markers will be permanently deleted from the device.
   </string>
   <string name="marker_label_end"
     translation_description="When inserting a marker to indicate the end of a track, the marker's
@@ -1074,7 +1044,7 @@ limitations under the License.
       %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
@@ -1137,18 +1107,42 @@ 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_eula"
+    translation_description="In the menu, to go to the terms of service page.
+
+      Character limit: ~20 (1 line)">
+    Terms of service
+  </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_help_forum"
+    translation_description="In the menu, to go to the help forum.
+
+      Character limit: ~20 (1 line)">
+    Help forum
+  </string>
+  <string name="menu_help_play_store"
+    translation_description="In the menu, to go to the My Tracks Google Play Store page.
+
+      Character limit: ~20 (1 line)">
+    View in Google Play Store
+  </string>
   <string name="menu_import_all"
     translation_description="In the menu, to import all the tracks from the external storage.
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/HelpActivity.java b/MyTracks/src/com/google/android/apps/mytracks/HelpActivity.java
index 17b2f5039..1703a5880 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/HelpActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/HelpActivity.java
@@ -16,17 +16,19 @@
 
 package com.google.android.apps.mytracks;
 
-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.GoogleFeedbackUtils;
 import com.google.android.apps.mytracks.util.SystemUtils;
 import com.google.android.maps.mytracks.R;
 
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
@@ -37,7 +39,7 @@ import java.util.Locale;
  * 
  * @author Sandor Dornbush
  */
-public class HelpActivity extends AbstractMyTracksActivity implements AboutCaller, EulaCaller {
+public class HelpActivity extends AbstractMyTracksActivity implements EulaCaller {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
@@ -47,7 +49,7 @@ public class HelpActivity extends AbstractMyTracksActivity implements AboutCalle
         + 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("")) {
@@ -57,15 +59,11 @@ public class HelpActivity extends AbstractMyTracksActivity implements AboutCalle
     webView.getSettings().setJavaScriptEnabled(true);
     webView.setWebViewClient(new WebViewClient());
 
-    findViewById(R.id.help_ok).setOnClickListener(new OnClickListener() {
+    findViewById(R.id.help_feedback).setOnClickListener(new View.OnClickListener() {
+
+        @Override
       public void onClick(View v) {
-        finish();
-      }
-    });
-    findViewById(R.id.help_about).setOnClickListener(new OnClickListener() {
-      public void onClick(View v) {
-        new AboutDialogFragment().show(
-            getSupportFragmentManager(), AboutDialogFragment.ABOUT_DIALOG_TAG);
+          GoogleFeedbackUtils.bindFeedback(HelpActivity.this);
       }
     });
   }
@@ -76,9 +74,33 @@ public class HelpActivity extends AbstractMyTracksActivity implements AboutCalle
   }
 
   @Override
-  public void onAboutLicense() {
-    EulaDialogFragment.newInstance(true)
-        .show(getSupportFragmentManager(), EulaDialogFragment.EULA_DIALOG_TAG);
+  public boolean onCreateOptionsMenu(Menu menu) {
+    getMenuInflater().inflate(R.menu.help, menu);
+    return super.onCreateOptionsMenu(menu);
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    Intent intent;
+    switch (item.getItemId()) {
+      case R.id.help_play_store:
+        intent = new Intent(Intent.ACTION_VIEW);
+        intent.setData(Uri.parse("market://details?id=com.google.android.maps.mytracks"));
+        startActivity(intent);
+        return true;
+      case R.id.help_eula:
+        EulaDialogFragment.newInstance(true)
+            .show(getSupportFragmentManager(), EulaDialogFragment.EULA_DIALOG_TAG);
+        return true;
+      case R.id.help_forum:
+        intent = new Intent(Intent.ACTION_VIEW);
+        intent.setData(Uri.parse(
+            "http://groups.google.com/a/googleproductforums.com/forum/#!categories/maps/mytracks/"));
+        startActivity(intent);
+        return true;
+      default:
+        return super.onOptionsItemSelected(item);
+    }
   }
 
   @Override
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/AboutDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/AboutDialogFragment.java
deleted file mode 100644
index 8628fc26f..000000000
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/AboutDialogFragment.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.google.android.apps.mytracks.fragments;
-
-import com.google.android.apps.mytracks.util.SystemUtils;
-import com.google.android.maps.mytracks.R;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.support.v4.app.FragmentActivity;
-import android.view.View;
-import android.widget.TextView;
-
-/**
- * A DialogFragment to show information about My Tracks.
- * 
- * @author Jimmy Shih
- */
-public class AboutDialogFragment extends AbstractMyTracksDialogFragment {
-
-  /**
-   * Interface for caller of this dialog fragment.
-   * 
-   * @author Jimmy Shih
-   */
-  public interface AboutCaller {
-
-    /**
-     * Called when about license is invoked.
-     */
-    public void onAboutLicense();
-  }
-
-  public static final String ABOUT_DIALOG_TAG = "aboutDialog";
-
-  private AboutCaller caller;
-
-  @Override
-  public void onAttach(Activity activity) {
-    super.onAttach(activity);
-    try {
-      caller = (AboutCaller) activity;
-    } catch (ClassCastException e) {
-      throw new ClassCastException(
-          activity.toString() + " must implement " + AboutCaller.class.getSimpleName());
-    }
-  }
-
-  @Override
-  protected Dialog createDialog() {  
-    FragmentActivity fragmentActivity = getActivity();
-    View view = fragmentActivity.getLayoutInflater().inflate(R.layout.about, null);
-    TextView aboutVersion = (TextView) view.findViewById(R.id.about_version);
-    aboutVersion.setText(SystemUtils.getMyTracksVersion(fragmentActivity));
-    return new AlertDialog.Builder(fragmentActivity).setNegativeButton(
-        R.string.about_license, new DialogInterface.OnClickListener() {
-            @Override
-          public void onClick(DialogInterface dialog, int which) {
-            caller.onAboutLicense();
-          }
-        }).setPositiveButton(R.string.generic_ok, null).setTitle(R.string.help_about).setView(view)
-        .create();
-  }
-}
\ No newline at end of file
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/EulaDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/EulaDialogFragment.java
index 104a75560..86ea581a2 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/EulaDialogFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/EulaDialogFragment.java
@@ -90,7 +90,7 @@ public class EulaDialogFragment extends AbstractMyTracksDialogFragment {
     Linkify.addLinks(message, Linkify.WEB_URLS);
 
     AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()).setMessage(message)
-        .setTitle(R.string.eula_title);
+        .setTitle(R.string.menu_help_eula);
 
     if (hasAccepted) {
       builder.setPositiveButton(R.string.generic_ok, null);