From 12e9559e96528cf24ee4af602dd1c0ec252e0a5a Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Fri, 7 Jun 2013 13:13:59 -0700 Subject: [PATCH] Update export menu. Improve export dialog layout. Rearrange tralist list menu. Remove unused method in MenuItemTest. --- MyTracks/res/drawable-hdpi/menu_export.png | Bin 1405 -> 312 bytes MyTracks/res/drawable-mdpi/menu_export.png | Bin 1259 -> 253 bytes MyTracks/res/drawable-xhdpi/menu_export.png | Bin 1593 -> 361 bytes MyTracks/res/menu/track_list.xml | 26 ++++++++-------- MyTracks/res/values/styles.xml | 3 +- .../endtoendtest/common/MenuItemsTest.java | 28 ------------------ 6 files changed, 15 insertions(+), 42 deletions(-) diff --git a/MyTracks/res/drawable-hdpi/menu_export.png b/MyTracks/res/drawable-hdpi/menu_export.png index a1d27cec9b361d420a038617141b690b67cceb30..d919ac5ee06a53f20cf33bb97c9a57be91b117f0 100644 GIT binary patch literal 312 zcmV-80muG{P)u6oF|s(~i2_tz9B>CkijNzx!d6v)i3ugCcQZ^fJ0 zB?gq;8)E^5DxgpW6smwiS?mYf&9ZM7_h#m!K!Gh__Oe^D>_B&G*Y0A#DV0tD0000< KMNUMnLSTYT*nvv` literal 1405 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|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVi))Wpcm$=Slx$-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq1O_pUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnv1> zG!Lpb1-Dzwaq86vIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1z<}b*a#lXP$-qXb~ zq~g|_8TLBPjxxvNqZfq;*RypVZ0M*LOgiACB*Bx`?W)r2dq#}eOh~x%Xo6sl+r%3x zVnRYXVmv}lE}5&(f1i{;dD%p}+V}UerT2T=Wfr~Neee0Z^8LH3?Jk@2Ch65JKGDt5 z(EvjS>cuoJUh(73VEy`l^-hDgfObiv!3>tiZ}w#AbIv=+d4sV$kL!ob9rjrVxL&Zu zE6n>A%fNC_IfCVQt6Bi}HV5g7^Pj9$1zC+B?3o}|$Wjtf5;xUffa!B)>C**`#t}37 zB?A`k=U?UUNdN!A^PvIkZVsle<1LMMKRBb^n7HBCx#yoYM2V-yXnWetUKO0Ujniz; z2`5Lp=_fu~UVYgg|LRdrexK6qytRy?R>=$QyFKUazUgH!`D{~~d0GOOPw=5L9y51! zWo>S&KDEoQkz=!m*7e;#l|0|x*&8E$-%6}dJ=rM1IH$-@>&*{V3#RI@&AFz`i*5Aw zRF;@|r!HeO;HWy_w9RN3%^gKb1^m+_y%hBf_Pe)8GO}BpbE>_=f6G!UuBC6+Mcu~e*mld($FCj* z-gy3~ZP~3lrsX{h*Yi?7g*mafI3UoRsq&0$3_E9*YklJgx&bN>Jzf1=);T3K0RXvb B?SKFP diff --git a/MyTracks/res/drawable-mdpi/menu_export.png b/MyTracks/res/drawable-mdpi/menu_export.png index 0e06c22127f0de4a5f2a757758aa3d2135ba8a73..c50a8b61e41184edc4bc555e81a467a071d79282 100644 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf>whZ|2hM2@oHrO%9a)2#$`Uv=8-+9)`Rv%$W_3oUs;ri)IPUYQu57cg zBBwXsvN8r%hRZ_xf)1XvdQz`&bHbaoPuwR7i)VE=H1exWO7*KepB|%EIe9|$t+k(w zUhH<;t9oGX#QJ}7Dz`<8&ij5o(cQq+us@RZflTgBrX6=&mGqu!UP+m#$l;wUX`0#b yGkrVzA3KM+i#h}y#MkaLWp|Z4m@{L02HWeepYoz#32^}3&*16m=d#Wzp$P!A>s%WE literal 1259 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|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVi))Y-tz$kfo($-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq1OnfUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dR=1cK zxdE-lX&zK>3U0R;;MA)Rbc{YIYLTKECIn1BASOKF0y*%cpPC0u??u3bEgkxO8Uq7k ztfz}(NX4x;*X+Fy2Z*#kT=s9ft4xVNiO8HU%pE&!E?v>_VA+D^)!jQf6zYW4*$WHG z3j#JQ4%oPPL5D@hqHD8`d_N%A)$(nbx#{V>A9Q>#{n_#S&gH5^iL^^GH+@c>W-VZh zX}H2%a%@jM*W?$6c-IO13vZ}glf)x8ub{{I$6B@zJnkQ@$^s6D$NreZb|XK%p-^Ta z^Zoky?($}Z%T*`+*3wW9ZHj#IQL51QQuxO9IG)$f8Xn?#@V&yn!soOfPvRk!1D1Y<3v4I( zHkdqSUgzuYxLt0((l6cTd*`&d&z-i^;<&+j=Zq^#4aC duiYCM87A%u5!^fD=V4Isvd$@?2>_jG!nOba diff --git a/MyTracks/res/drawable-xhdpi/menu_export.png b/MyTracks/res/drawable-xhdpi/menu_export.png index 37d98e5dd24c44f0bd77fe9af316fff2f24121bb..34121651c0d7b135aa56ba3ca9b5b1b298e425a4 100644 GIT binary patch literal 361 zcmV-v0ha!WP)PD;8G|&jQg;A zX82RV@RR;o;Y-YY%6V;`=8g{0%w7}MIy3uNxc_Em#m+>l3xp5`GaKfvk@urGh7hi6 zpPN$sZxt_~<^|NefSMOj^8#vKKrLjRAUCV}H{b=-sxR;bYGXC{j>O%J00000NkvXX Hu0mjfG})bG literal 1593 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%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0 z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W{Q=osfm%Ble3AblYyI|p{t>#iJ_&diIcOV zo2j9>iIX8ruSMv>2~2MaLa!-Ky`aR9TL84#CABECEH%ZgC_h&L>}jh^+-@<# zX&zK>3U0R;l1hD>-3~?btIzFxeoylH zXB+kNi%*{XIe~!_D>`vkwwaVhF9J(Nf!f{`VabU*dW9baUz~k-16lm`+50n*^;b_A4Fg4 zejs4MUiWjxp2Hu(NFk!!j$E8_UR_TZw3|?TIqF3$HZv22V zWBCNT4UPAI%-wz5q+;$isRZp3ei^2t|2teJe;0c5{M^M;8LPOojJNt6k~Nqv#<=@H z?1h8-Ne$*Ew-|ue9wjxr&L!x-yZjK?uF_P3hy>ohN#CZJLofo zNh`;Eesig&KdZH_-B)de7lk*p*2E^seJm{UPI{XAY5jp2_s - + android:icon="@drawable/menu_sync_now" + android:id="@+id/track_list_sync_now" + android:title="@string/menu_sync_now"/> + + + - - - diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml index 6d0248c02..3ea3736e8 100644 --- a/MyTracks/res/values/styles.xml +++ b/MyTracks/res/values/styles.xml @@ -75,7 +75,8 @@ limitations under the License. diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/MenuItemsTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/MenuItemsTest.java index 9effad2bd..362f89697 100644 --- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/MenuItemsTest.java +++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/MenuItemsTest.java @@ -22,9 +22,6 @@ import com.google.android.maps.mytracks.R; import android.app.Instrumentation; import android.test.ActivityInstrumentationTestCase2; import android.view.KeyEvent; -import android.view.View; - -import java.util.ArrayList; /** * Tests some menu items of MyTracks. @@ -35,7 +32,6 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2 views = EndToEndTestUtils.SOLO.getViews(); - int i = 0; - for (View view : views) { - String name = view.getParent().getClass().getName(); - // Each share item is a child of a "RecycleListView" - if (name.indexOf(SHARE_ITEM_PARENT_VIEW_NAME) > 0) { - if (index == i) { - return view; - } - i++; - } - } - return null; - } - /** * Checks the voice frequency and split frequency menus during recording. When * recording, they should be in both the menu and the recording settings. When