From 925dc14b84a0662277ec4b9630aaa1b3cb88b3ed Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Fri, 22 Feb 2013 11:23:51 -0800
Subject: [PATCH] merge branches

---
 MyTracks/res/drawable-hdpi/menu_feedback.png  | Bin 0 -> 1355 bytes
 MyTracks/res/drawable-mdpi/menu_feedback.png  | Bin 0 -> 1296 bytes
 MyTracks/res/drawable-xhdpi/menu_feedback.png | Bin 0 -> 1525 bytes
 MyTracks/res/menu/track_list.xml              |   4 ++
 MyTracks/res/values/strings.xml               |   6 +++
 .../apps/mytracks/TrackListActivity.java      |  49 ++++++++++++++++++
 6 files changed, 59 insertions(+)
 create mode 100644 MyTracks/res/drawable-hdpi/menu_feedback.png
 create mode 100644 MyTracks/res/drawable-mdpi/menu_feedback.png
 create mode 100644 MyTracks/res/drawable-xhdpi/menu_feedback.png

diff --git a/MyTracks/res/drawable-hdpi/menu_feedback.png b/MyTracks/res/drawable-hdpi/menu_feedback.png
new file mode 100644
index 0000000000000000000000000000000000000000..6725a933ca7711303dc024b216baf362f4cfdef8
GIT binary patch
literal 1355
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVi)#nRc(&A`pn$-vFf(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yuGi22r(RHE$SnZc?2=lPS(cjOR+OKs0QR(1CRVo?
z8o9U`JL5DDsy79vTMS%r>eUB2MjsTlNKp+F0;V4j6P|E^9C*@C%>$<QB4EM}5Ixt+
zz`(fI)5S5Q;?|oPyS<nlC0aKds=c_?5fPQObn4WEx2$_gwYKeR@_(p(ql-i7-hqh7
zsHH(1FO+Xc8DvGAKcLx`P^M<QnUDKFzr5nfcjtbVrKhEvpWL)2=-H|;uQ(+ICJ0)(
zZq~#9x*J$_P5fkfKzK)?Xavje2g;KUu>ANW_~YTt{!&)AnFn`rr%D-~x>0s@5&t#i
zzKd4I7Th*XW*+||mz*=Zea2veP&d0&=>pje+-V2R*~0=4hVHLte*S=~q=qHvEkl;u
z4Ly$~_CL0oeO_8Aq}Hfx!0UG)n^CFq;PV5D73{~?ZN6afp850x#yNpcru6RYn$fh{
zEc_sk|Gdv8w;n&0X0Enb;ko4aZ@2$TeJvLEM6k?fnV+-!xw65U6Kd>#Y*=^QDp|u4
zXJL@9+r%Ep&8xl0PXB<F1q1h;_cJGbf0K3ZU@U8n>y=weIn8$booi;-#PVHqgXqpH
z+jymHrZ~*=n0$BHp?6!vj4Co3_q$xV8Tasg@WN(s)eHKQK2<MYP{t*E!S%_^2o@KG
zN7++dl-(q6uZ!d`+w#@B=ev`se52U)cZTsfTWjWbrV4a7aCAV>frekA2@LvoW<=j@
S+%gSRym`9%xvX<aXaWFZ2;+(X

literal 0
HcmV?d00001

diff --git a/MyTracks/res/drawable-mdpi/menu_feedback.png b/MyTracks/res/drawable-mdpi/menu_feedback.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c701eec6a80d1075865707fe82f40cd18edb770
GIT binary patch
literal 1296
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVi)#nRc(&CuA?$-vFf(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1ObbUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnqfX
zG!Lpb1-Dy_aO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1z4)-lN#K6GV<muuV
zQgQ3ewB26JjuNfuX3bJezgUzy%%<5jsC3-ON}U+=k?~Cp(?{MT++mt;-ULOw5RQnF
zkQTJQt=f5{N4-Go+J?=Wt*v*7S${Yf_sstP&7FTX2W9J?%4yWt8Oo-`yi_`X^ZYeO
z;WJGekMqkmv46-g-oW+Efw`vAD1ce9;(U^W!N(Je8FMdrMKL?GU1@w$DyXv6WNW?2
z%z!S@<qs!hC-Qxfz2<!22=lqWmM;oZf_Zg}eu%DVWWI1JQDxo_xtJ#P4M%R6-xkSf
z;ImkILNKFQuYGf32lo%ZP5HAoGG~>p$i3S(U*tCH><4@?0Xk9>)h2(H41Qi}{_W`L
z2P`>_l^+~)C#H(`?95ejE7K4%-^BFopxN*HP1+xfrdk+D&RXUd`ONt23Bw&}`=3ua
z5-2O6$Cl%E?#I0;H&%)~H@x)dbL*bYSY99LnGb7UL@9+H6pH?_;n(!z8xssWKV0mI
zI%S~M^}{G&aomKX2c8_*@pGyCq_}C9H~i9E%M-%(Z%Zw=0YhbX`Kxa$MC?Ijl&7no
J%Q~loCIBMP%envn

literal 0
HcmV?d00001

diff --git a/MyTracks/res/drawable-xhdpi/menu_feedback.png b/MyTracks/res/drawable-xhdpi/menu_feedback.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d2248e50db27e318dcee949e0805b94fabd0db5
GIT binary patch
literal 1525
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9<K~
zz|zE0N5ROz&_LhNNZ-I**U-Sq)ZEIzPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0
z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W{Q=oi=mN=o3W#*lYyI|p{t>#iJ_&diIcOV
zo2j9>iIX8ruS<S%X>Mv>2~2MaLa!4}y`aR9TL84#CABECEH%ZgC_h&L>}jh^+-|YJ
zX&zK>3U0Sp;?%1Tbc{YIYLTKECIn1BASOKF0y*%cpPC0u??u3by=mU(R0am7bWaz@
zkcwMxW}o+FauhjUes+<HK-U7jiwm6vO5aGau!>&f*I?>y`q%v~c9Ff3hGy3(JyzMK
zb+S_zIJdt@n$Fjl_GDEp`}_?Zk9y9&+x52kgX4+F*+2JeKgWMnXR4Rm1mzSKn+OK(
z1V)_()(s3|2bdrng$aVwa?IJTt*l-Be!g!)WAKDastF8d8u<dgIEMajV4us>^<`08
zKZ{7|JtnrPbtl=kHw4L7iUm|8bN<YUS?0%Rxof>r*Y;lV%~37CW=%e|=E=$p0;Wu6
z2Shq9*=uYIIJWzM`VRKv4<eV<rwJc_^f-a{OhewL+{zh+hNkHUWG$FIm%1L7w-c9O
zHSE_~Wc9f4!<8$mJcACf%wT!`;OgP72`7IDL@aH+uy|dm1OMIs-VeA`4shE}SMifs
z!%=-K|5ZxOj9=S*Iz3KGP37!nQ;Dl!Khqo?mA^kw`r^Xav!aRTf4I)=;lE^;D)!}e
z8iV)p1}_nZX<A9rIt|(ET288uyBCN*S(&dGdibo%ynvM*nOXT4w{BfD_t%t#ji*!o
zNY_~ImAw`y*q*R-)nnGI%WPH$tvmN@iM_A!c-<WK7b`dn7t~74sZ~(2TX9C%lx>~q
zV?WM-l^h={9G>p=the6OS!D9qj~gViBm8lcyYahe3{$%bOdscQXM_kAR@prZJGNIS
zV71b=o==vGJM3o3ZPxpKeDmJgrAmvoeP%nqZE~F3L4Eh6|7Nh5W3ddm#<;9EjBlx3
zo2b^(!ynEce|+hxuC_w%l>QZezOZ&~2}%BUkmWoRYAl1JTwu=+(F6w9@bee6F8<91
O6~vydelF{r5}E+X2`j1q

literal 0
HcmV?d00001

diff --git a/MyTracks/res/menu/track_list.xml b/MyTracks/res/menu/track_list.xml
index 9f8034117..b95646da5 100644
--- a/MyTracks/res/menu/track_list.xml
+++ b/MyTracks/res/menu/track_list.xml
@@ -74,6 +74,10 @@ limitations under the License.
     android:icon="@drawable/menu_settings"
     android:id="@+id/track_list_settings"
     android:title="@string/menu_settings"/>
+  <item 
+    android:icon="@drawable/menu_feedback"
+    android:id="@+id/track_list_feedback"
+    android:title="@string/menu_feedback"/>
   <item
     android:icon="@drawable/menu_help"
     android:id="@+id/track_list_help"
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 130371334..f9264830e 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -974,6 +974,12 @@ limitations under the License.
       Character limit: ~20 (1 line)">
     Edit
   </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.
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
index 2b461a545..733c6a201 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
@@ -55,17 +55,27 @@ import com.google.android.apps.mytracks.util.TrackRecordingServiceConnectionUtil
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GooglePlayServicesUtil;
 import com.google.android.maps.mytracks.R;
+import com.google.userfeedback.android.api.UserFeedback;
+import com.google.userfeedback.android.api.UserFeedbackSpec;
 
 import android.app.Dialog;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.database.Cursor;
 import android.location.Location;
+import android.os.Binder;
 import android.os.Bundle;
+import android.os.IBinder;
+import android.os.Parcel;
 import android.os.Parcelable;
+import android.os.RemoteException;
 import android.provider.Settings;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
@@ -87,6 +97,7 @@ import android.widget.ListView;
 import android.widget.Toast;
 
 import java.util.EnumSet;
+import java.util.List;
 import java.util.Locale;
 
 /**
@@ -607,6 +618,32 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
         intent = IntentUtils.newIntent(this, SettingsActivity.class);
         startActivity(intent);
         return true;
+      case R.id.track_list_feedback:
+        if (isFeedbackAvailable()) {
+          intent = new Intent(Intent.ACTION_BUG_REPORT);
+          ServiceConnection conn = new ServiceConnection() {
+  
+            public void onServiceDisconnected(ComponentName name) {}
+  
+              @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {
+              try {
+                service.transact(Binder.FIRST_CALL_TRANSACTION, Parcel.obtain(), null, 0);
+              } catch (RemoteException e) {
+                // TODO(jshih): Auto-generated catch block
+                e.printStackTrace();
+              }
+            }
+          };
+          // Bind to the service after creating it if necessary
+          bindService(intent, conn, BIND_AUTO_CREATE);
+        } else {
+          UserFeedbackSpec spec = new UserFeedbackSpec(this, "com.google.android.maps.mytracks:V *:S", 
+              "com.google.android.maps.mytracks.USER_INITIATED_FEEDBACK_REPORT");          
+          UserFeedback userFeedback = new UserFeedback();
+          userFeedback.startFeedback(spec);
+        }
+        return true;
       case R.id.track_list_help:
         intent = IntentUtils.newIntent(this, HelpActivity.class);
         startActivity(intent);
@@ -616,6 +653,18 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
     }
   }
 
+  private boolean isFeedbackAvailable() {
+    List<ResolveInfo> infos = getPackageManager().queryIntentServices(
+      new Intent(Intent.ACTION_BUG_REPORT), PackageManager.MATCH_DEFAULT_ONLY);
+    for (ResolveInfo info : infos) {
+      if (info.serviceInfo != null && info.serviceInfo.packageName != null
+          && info.serviceInfo.packageName.equals("com.google.android.feedback")) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
   @Override
   public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
     super.onCreateContextMenu(menu, v, menuInfo);