From 39433f94cb9641456742973d5c82fc35052e9243 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Thu, 18 Jul 2019 06:39:51 +0200
Subject: [PATCH] Removed unused sharing and seach icons.

---
 .../android/apps/mytracks/TrackListActivity.java |   3 +--
 .../apps/mytracks/util/TrackIconUtils.java       |   4 +++-
 .../main/res/drawable-hdpi/ic_menu_search.png    | Bin 1764 -> 0 bytes
 .../main/res/drawable-mdpi/ic_menu_search.png    | Bin 1394 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_menu_search.png   | Bin 2127 -> 0 bytes
 myTracks/src/main/res/menu/marker_list.xml       |   1 -
 myTracks/src/main/res/menu/search_list.xml       |   1 -
 myTracks/src/main/res/menu/track_list.xml        |   1 -
 8 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 myTracks/src/main/res/drawable-hdpi/ic_menu_search.png
 delete mode 100644 myTracks/src/main/res/drawable-mdpi/ic_menu_search.png
 delete mode 100644 myTracks/src/main/res/drawable-xhdpi/ic_menu_search.png

diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
index 612d87da1..9022318d3 100644
--- a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
@@ -593,8 +593,7 @@ public class TrackListActivity extends AbstractTrackActivity implements FileType
       startGpsMenuItem.setVisible(!isRecording);
       if (!isRecording) {
         startGpsMenuItem.setTitle(isGpsStarted ? R.string.menu_stop_gps : R.string.menu_start_gps);
-        startGpsMenuItem.setIcon(
-            isGpsStarted ? R.drawable.ic_menu_stop_gps : R.drawable.ic_menu_start_gps);
+        startGpsMenuItem.setIcon(isGpsStarted ? R.drawable.ic_menu_stop_gps : R.drawable.ic_menu_start_gps);
         TrackIconUtils.setMenuIconColor(startGpsMenuItem);        
       }
     }
diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java b/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java
index ea39f54f9..bb91b2906 100644
--- a/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java
+++ b/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java
@@ -238,6 +238,8 @@ public class TrackIconUtils {
    */
   private static void revertMenuIconColor(MenuItem menuitem) {
     Drawable drawable = menuitem.getIcon();
-    drawable.setColorFilter(new ColorMatrixColorFilter(REVERT_COLOR_MATRIX));
+    if (drawable != null) {
+      drawable.setColorFilter(new ColorMatrixColorFilter(REVERT_COLOR_MATRIX));
+    }
   }
 }
diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_search.png b/myTracks/src/main/res/drawable-hdpi/ic_menu_search.png
deleted file mode 100644
index f12e005ebe835c1dd2f6ae324224c3ee296d2d68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1764
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)(9*=*)zHG!$-vFf5X3XIbTx5uc62i}
zG&gZFgz0t3PcF?(%`1WFO+o0j#HkmQ7;+1MHoK%2WtOF;xE1B+Du6w0m5J3Y2F^}y
zE>1YjgX&Ge>K3qGXPkQVfsWA!MJ-ZP!-Rn82gHOYTp$OY^i%VI>AeV;uyg*O2mt1n
zFi#i9kcwMxX5P*g4iq?MeqHUBR%njnmW0b3zm{-xi3cqC%GT9Y-=L)QsQBYTjiwL*
zQ5VNm{=WiPYXt*!emv`4R1xlT_0eA;?zI_Pugq9?|H1YREUD%vZ%*cYbAZ3>_M3U1
z=gu@XR_C0#EHh+tYp>RJ2L}ZOfq<uCp&$Ar6QpMFygI1xgDI}rzfR0Rcnw4Mff4~_
zO9Q63rr8gSBtCdKtY~pk)7~q)=IK_^uKkYlx`h~%9pe7U&0$>rb7mLU4AyVWH|NY*
zQ^IzKO}@fjZcD>Y1y@7G0?{|jH@!F~c*?W)&e`MhOJ&F54VqgD7x3n=W>&q_yTREu
zMN@!LZw0&f0pkxMTbg&APM3BRKha=UAkh+Q_qyY@$*$&y%G&i@GA#RJ?6egx^Q|lF
zU&Hpg<XWSM`I?gjmO+Os?jMZ%Fflog(NmTwg?U}#Hpz!_C#G6V^Z6$uu5|Rv>zxdm
z0o;{y7qXw)*u936b3;UXgPPb%gU#n6W<IWc=F}lR>t&)pt4V_e_XTU$-|uu^H+{|X
zXZ1-)Ju5!3bk3Po7q(j27@Y8x4xMV6U@BAY;hOzWMd9=t;Y8C=!?><EiGYWp>Wu3T
zaP#eOXcUji;r<xm7*z1IF?!pYi($_yULSNZ;92*2)sgTULf#U&o3~y#dP`<Q=XL%A
z&aq5KxbOPZ3Ng)Hu<k_RvQ1OhJ$+_->ddmYK6lR6#qHU^Ba<|-IJx*BXInxa_oeX8
z&koGeJ1b*sU*?``_TFR0-M1>UY_9anjWV7ajPD**^MBo$BXol|>{7KF|A+GjrSBb|
zsdf3zhA`WcMl9}<UXLzr=2>4?5PyAUL=N+fGo5O0o-4l-eZBPXoi)cTJa5{sjrl3T
zJ#)!3`Is4Uu}nOCds^;h89V!&I~*UmWL|^xgL%65uYdH}JLO?Y=hl5^UucB6cwD^x
zTCmM;im;^a4dJrMhwH@u=l}0{I&qPUi>PX|O*EhRHJA5)b$(R$DOpwCUu@L7YD?X1
zIfH+SN?wAi|7baEIxBa(%es@}w{L@}oNUj}|D7F%#=74ZGngx_5wSkHo@tJYN~A({
zY0APPSBajVQf>Z|uKs2?ud?r}!$S3aAOB7K_}x0>_&22|o9}l<OMc$#r~N*hao${Z
kCdS4FVA?(){ag6}gZ$aD-@h06CxPl6Pgg&ebxsLQ0F3jZx&QzG

diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_search.png b/myTracks/src/main/res/drawable-mdpi/ic_menu_search.png
deleted file mode 100644
index 587d9e0bf392fc928947f04293ba009f7fc77b29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1394
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)(9*=*)zI10$-vFf5X3XIbTx5uc62i}
zG&gZFgz0t3PcF?(%`1WFO+n~&!KoLN7;+1MHoK%2WtOF;xE1B+Du6w0m5JLejyTPO
z>P^Az7AKr~^?{Dj2SqJXRKtXT=?BDwCtM&0p7c}mfa$#mn6M+i2Q6b@V0_}~;uunK
z>&^AE+Ae`I$3E`tm@-`{zx9(?>dU1k*tm~+ZG0%dVMD+vFR`R_eQ9k~)lEW^HhtI?
zB&0NvW8=gpsXg!4y8B+<@$PBQ%`+>{C%wC~^SkBqd7pQuuW?X#(4E%(*>&epCKp?W
zrqiE|F7`;J9G<r`{Kf&Pd3DkUiZ*gtUF=S>c@U;Ny}9H~GSBM$UJ2|47y7x^EaYbO
zm=^RUfnEK@zlTwYmbEt*&h}S4{%}u`&SQ?!WlSjvv9{-n3Kw#{NfhghW2)KCHS6mc
z^@8V*Jmr$4uC6fJ$dg^zU&?<y>d@|$3_EuOa%?|q_h0a*8dJ>+>(i$vUCaNY#uTIE
zul#VEs1omUHKv?ZC$?1V2%BBCKXsA7(geZX8pRvuyee!cJTg<urFT_9*~FD47V8~N
zA4~YgabNU*-;~GmP|`T!nCYXhXQD5zJD+diYOnVp>s9KN2D`QS`=`xX%9*}?nyAhK
z_Nf-Z4{Ui>oBh!|a6Nmso8l+YBlF(g-ZfEwMbWdDrE^;>d8}GD@Z@>D4V>xD8CRkc
zdVC*mVv&1FrpctHKHIFmo)(#Y4~A;Ho~#?e&Q2v6MQ%0zKUO`Q$Im5rVUFgn)AKHP
zSBG=VuX=ZVUZK&Y$p$gc*{*!{ocg_<SKxQD5ch*swOj@arXR!o`_?fY2bF@Ju6{1-
HoD!M<zQ6%U

diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_search.png b/myTracks/src/main/res/drawable-xhdpi/ic_menu_search.png
deleted file mode 100644
index 3549f84dd8f5e38665849b46e252bc34f29be027..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2127
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
Sm2^Y%i>Lbp((0&jng0SYa%AcN

diff --git a/myTracks/src/main/res/menu/marker_list.xml b/myTracks/src/main/res/menu/marker_list.xml
index 435d09b13..6f7737b74 100644
--- a/myTracks/src/main/res/menu/marker_list.xml
+++ b/myTracks/src/main/res/menu/marker_list.xml
@@ -21,7 +21,6 @@ limitations under the License.
         android:showAsAction="ifRoom" />
     <item
         android:id="@+id/marker_list_search"
-        android:icon="@drawable/ic_menu_search"
         android:title="@string/menu_search"
         android:actionViewClass="android.widget.SearchView"
         android:showAsAction="ifRoom|collapseActionView" />
diff --git a/myTracks/src/main/res/menu/search_list.xml b/myTracks/src/main/res/menu/search_list.xml
index d77269b31..424c4cfbb 100644
--- a/myTracks/src/main/res/menu/search_list.xml
+++ b/myTracks/src/main/res/menu/search_list.xml
@@ -17,7 +17,6 @@ limitations under the License.
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/search_list_search"
-        android:icon="@drawable/ic_menu_search"
         android:title="@string/menu_search"
         android:actionViewClass="android.widget.SearchView"
         app:showAsAction="ifRoom|collapseActionView" />
diff --git a/myTracks/src/main/res/menu/track_list.xml b/myTracks/src/main/res/menu/track_list.xml
index 011794bdc..03b6a1121 100644
--- a/myTracks/src/main/res/menu/track_list.xml
+++ b/myTracks/src/main/res/menu/track_list.xml
@@ -16,7 +16,6 @@ limitations under the License.
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/track_list_search"
-        android:icon="@drawable/ic_menu_search"
         android:title="@string/menu_search"
         android:actionViewClass="android.widget.SearchView"
         android:showAsAction="ifRoom" />