Change music name to mediaplayerflounder_5.99.1flounder/5.99.15.99.1

    HomeScreen use music as the name of mediaplayer application,
    That make two problems, and try to fix it.
    1 Can not diaplay correct mediaplayer icon in launcher.
    2 Can not switch to mediaplayer screen by click shortcut icon.

Change-Id: I99fd6ac1e5ec13f7e7933bfb5c3762cacf984d8e
Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>

7 files changed, 5 insertions, 288 deletions

diff --git a/homescreen/qml/ShortcutArea.qml b/homescreen/qml/ShortcutArea.qml
index 1698a88..150658c 100644
--- a/homescreen/qml/ShortcutArea.qml
+++ b/homescreen/qml/ShortcutArea.qml
@@ -32,7 +32,7 @@ Item {
             application: ''
         }
         ListElement {
-            name: 'Music'
+            name: 'MediaPlayer'
             application: 'mediaplayer@0.1'
         }
         ListElement {
diff --git a/homescreen/qml/images/Home/home.qrc b/homescreen/qml/images/Home/home.qrc
index 92f8501..4c89fe9 100644
--- a/homescreen/qml/images/Home/home.qrc
+++ b/homescreen/qml/images/Home/home.qrc
@@ -9,8 +9,8 @@
         <file>hvac_inactive.svg</file>
         <file>mixer_active.svg</file>
         <file>mixer_inactive.svg</file>
-        <file>music_active.svg</file>
-        <file>music_inactive.svg</file>
+        <file>mediaplayer_active.svg</file>
+        <file>mediaplayer_inactive.svg</file>
         <file>navigation_active.svg</file>
         <file>navigation_inactive.svg</file>
         <file>phone_active.svg</file>
diff --git a/homescreen/qml/images/Home/music_active.svg b/homescreen/qml/images/Home/music_active.svg
deleted file mode 100644
index d560c3a..0000000
--- a/homescreen/qml/images/Home/music_active.svg
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:i="&amp;ns_ai;"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Multimedia_Active"
-   x="0px"
-   y="0px"
-   viewBox="0 0 300 300"
-   style="enable-background:new 0 0 300 300;"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="music_active.svg"><metadata
-     id="metadata66"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs64" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1325"
-     inkscape:window-height="919"
-     id="namedview62"
-     showgrid="false"
-     inkscape:zoom="0.78666667"
-     inkscape:cx="-87.711864"
-     inkscape:cy="150"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Multimedia_Active" /><style
-     type="text/css"
-     id="style3">
-	.st0{fill:url(#SVGID_1_);}
-	.st1{opacity:0.4;fill:url(#SVGID_2_);}
-	.st2{fill:#FFFFFF;}
-	.st3{font-family:'Roboto-Regular';}
-	.st4{font-size:25px;}
-	.st5{letter-spacing:6;}
-	.st6{fill:url(#SVGID_3_);}
-	.st7{fill:url(#SVGID_4_);}
-	.st8{fill:url(#SVGID_5_);}
-</style><switch
-     id="switch5"
-     transform="matrix(1.3307804,0,0,1.3314313,-62.924861,-27.945794)"><g
-       i:extraneous="self"
-       id="g7"><linearGradient
-         id="SVGID_1_"
-         gradientUnits="userSpaceOnUse"
-         x1="116.0821"
-         y1="254.39191"
-         x2="256.53561"
-         y2="-133.31841"><stop
-           offset="0"
-           style="stop-color:#0DF9FF"
-           id="stop10" /><stop
-           offset="9.208472e-02"
-           style="stop-color:#0DF9FF;stop-opacity:0.853"
-           id="stop12" /><stop
-           offset="0.6264"
-           style="stop-color:#0DF9FF;stop-opacity:0"
-           id="stop14" /></linearGradient><circle
-         class="st0"
-         cx="159.8"
-         cy="133.60001"
-         r="101.9"
-         id="circle16"
-         style="fill:url(#SVGID_1_)" /><linearGradient
-         id="SVGID_2_"
-         gradientUnits="userSpaceOnUse"
-         x1="-55.796902"
-         y1="435.51099"
-         x2="216.9304"
-         y2="53.692902"><stop
-           offset="0.2978"
-           style="stop-color:#FFFFFF;stop-opacity:0"
-           id="stop19" /><stop
-           offset="0.3685"
-           style="stop-color:#FAFAFA;stop-opacity:0.1007"
-           id="stop21" /><stop
-           offset="0.4554"
-           style="stop-color:#EBEBEB;stop-opacity:0.2245"
-           id="stop23" /><stop
-           offset="0.5508"
-           style="stop-color:#D2D2D2;stop-opacity:0.3603"
-           id="stop25" /><stop
-           offset="0.6523"
-           style="stop-color:#AFAFAF;stop-opacity:0.5048"
-           id="stop27" /><stop
-           offset="0.7585"
-           style="stop-color:#828282;stop-opacity:0.6562"
-           id="stop29" /><stop
-           offset="0.8689"
-           style="stop-color:#4B4B4B;stop-opacity:0.8133"
-           id="stop31" /><stop
-           offset="0.9806"
-           style="stop-color:#0C0C0C;stop-opacity:0.9724"
-           id="stop33" /><stop
-           offset="1"
-           style="stop-color:#000000"
-           id="stop35" /></linearGradient><circle
-         class="st1"
-         cx="159.8"
-         cy="133.60001"
-         r="101.9"
-         id="circle37"
-         style="opacity:0.4;fill:url(#SVGID_2_)" /><g
-         id="g39"><linearGradient
-           id="SVGID_3_"
-           gradientUnits="userSpaceOnUse"
-           x1="4.0481"
-           y1="287.94919"
-           x2="320.4859"
-           y2="-15.4029"
-           gradientTransform="matrix(1,0.00546456,-0.00546456,1,-2.0192,-3.0212)"><stop
-             offset="0"
-             style="stop-color:#00ADDC"
-             id="stop42" /><stop
-             offset="1"
-             style="stop-color:#6BFBFF"
-             id="stop44" /></linearGradient><path
-           class="st6"
-           d="m 160,238.8 c -0.2,0 -0.4,0 -0.6,0 C 101.4,238.5 54.5,191.1 54.8,133.1 55.2,75.3 102.3,28.5 160,28.5 c 0.2,0 0.4,0 0.6,0 58,0.3 104.9,47.7 104.6,105.7 l 0,0 C 264.8,192 217.7,238.8 160,238.8 Z m 0,-206.6 c -55.7,0 -101.2,45.2 -101.5,100.9 -0.3,55.9 45,101.7 100.9,102 0.2,0 0.4,0 0.6,0 55.7,0 101.2,-45.2 101.5,-100.9 0.3,-55.9 -45,-101.7 -100.9,-102 -0.2,0 -0.4,0 -0.6,0 z"
-           id="path46"
-           style="fill:url(#SVGID_3_)"
-           inkscape:connector-curvature="0" /><linearGradient
-           id="SVGID_4_"
-           gradientUnits="userSpaceOnUse"
-           x1="140.72141"
-           y1="202.2363"
-           x2="187.02119"
-           y2="68.704903"><stop
-             offset="0"
-             style="stop-color:#00ADDC"
-             id="stop49" /><stop
-             offset="1"
-             style="stop-color:#6BFBFF"
-             id="stop51" /></linearGradient><path
-           class="st7"
-           d="m 114.7,190.9 c -6.4,0 -12,-2.6 -14.8,-7.5 -2.9,-4.9 -5.4,-14.5 9.6,-23.2 4.8,-2.8 17.1,-3.9 20.8,-4 l 0.1,3.6 c -4.6,0.1 -15.5,1.4 -19.1,3.5 -9.4,5.4 -12.1,11.5 -8.3,18.3 3.8,6.6 14.6,7.6 24,2.2 6.6,-3.8 10.6,-10.5 10.7,-17.9 l -0.1,-0.7 0,-69.8 71.9,-14.2 0.1,71.3 c 0,6.7 -3.3,16.4 -12.5,21.8 -11.1,6.4 -24.1,4.8 -28.9,-3.5 -2.9,-4.9 -5.4,-14.5 9.6,-23.2 4.4,-2.5 14.4,-3.8 18.8,-3.9 l 0.1,3.6 c -4.2,0.1 -13.5,1.4 -17.1,3.5 -6.4,3.7 -13.1,9.9 -8.3,18.3 3.8,6.6 14.6,7.6 24,2.2 7.9,-4.5 10.7,-12.8 10.7,-18.5 l -0.1,-0.8 0,-66.4 -64.7,12.7 0,66.8 0.1,0.7 c 0,8.7 -4.7,16.6 -12.5,21.1 -4.7,2.7 -9.6,4 -14.1,4 z"
-           id="path53"
-           style="fill:url(#SVGID_4_)"
-           inkscape:connector-curvature="0" /><linearGradient
-           id="SVGID_5_"
-           gradientUnits="userSpaceOnUse"
-           x1="145.50549"
-           y1="203.8951"
-           x2="191.8053"
-           y2="70.363701"><stop
-             offset="0"
-             style="stop-color:#00ADDC"
-             id="stop56" /><stop
-             offset="1"
-             style="stop-color:#6BFBFF"
-             id="stop58" /></linearGradient><polygon
-           class="st8"
-           points="195.6,110.2 196.5,113.7 155.8,123.3 155,119.8 "
-           id="polygon60"
-           style="fill:url(#SVGID_5_)" /></g></g></switch></svg>
\ No newline at end of file
diff --git a/homescreen/qml/images/Home/music_inactive.svg b/homescreen/qml/images/Home/music_inactive.svg
deleted file mode 100644
index b6ec056..0000000
--- a/homescreen/qml/images/Home/music_inactive.svg
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:i="&amp;ns_ai;"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Multimedia_Inactive"
-   x="0px"
-   y="0px"
-   viewBox="0 0 300 300"
-   style="enable-background:new 0 0 300 300;"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="music_inactive.svg"><metadata
-     id="metadata3511"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs3509" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1573"
-     inkscape:window-height="876"
-     id="namedview3507"
-     showgrid="false"
-     inkscape:zoom="0.78666667"
-     inkscape:cx="-90.254237"
-     inkscape:cy="150"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Multimedia_Inactive" /><style
-     type="text/css"
-     id="style3476">
-	.st0{fill:#FFFFFF;}
-	.st1{font-family:'Roboto-Regular';}
-	.st2{font-size:25px;}
-	.st3{letter-spacing:6;}
-	.st4{fill:url(#SVGID_1_);}
-	.st5{fill:url(#SVGID_2_);}
-	.st6{fill:url(#SVGID_3_);}
-</style><switch
-     id="switch3478"
-     transform="matrix(1.3307804,0,0,1.3314313,-62.924861,-27.945794)"><g
-       i:extraneous="self"
-       id="g3480"><g
-         id="g3482"><g
-           id="g3484"><linearGradient
-             id="SVGID_1_"
-             gradientUnits="userSpaceOnUse"
-             x1="4.0481"
-             y1="287.94919"
-             x2="320.4859"
-             y2="-15.4029"
-             gradientTransform="matrix(1,0.00546456,-0.00546456,1,-2.0192,-3.0212)"><stop
-               offset="0"
-               style="stop-color:#00ADDC"
-               id="stop3487" /><stop
-               offset="1"
-               style="stop-color:#6BFBFF"
-               id="stop3489" /></linearGradient><path
-             class="st4"
-             d="m 160,238.8 c -0.2,0 -0.4,0 -0.6,0 C 101.4,238.5 54.5,191.1 54.8,133.1 55.2,75.3 102.3,28.5 160,28.5 c 0.2,0 0.4,0 0.6,0 58,0.3 104.9,47.7 104.6,105.7 l 0,0 C 264.8,192 217.7,238.8 160,238.8 Z m 0,-206.6 c -55.7,0 -101.2,45.2 -101.5,100.9 -0.3,55.9 45,101.7 100.9,102 0.2,0 0.4,0 0.6,0 55.7,0 101.2,-45.2 101.5,-100.9 0.3,-55.9 -45,-101.7 -100.9,-102 -0.2,0 -0.4,0 -0.6,0 z"
-             id="path3491"
-             style="fill:url(#SVGID_1_)"
-             inkscape:connector-curvature="0" /><linearGradient
-             id="SVGID_2_"
-             gradientUnits="userSpaceOnUse"
-             x1="140.72141"
-             y1="202.2363"
-             x2="187.02119"
-             y2="68.704903"><stop
-               offset="0"
-               style="stop-color:#00ADDC"
-               id="stop3494" /><stop
-               offset="1"
-               style="stop-color:#6BFBFF"
-               id="stop3496" /></linearGradient><path
-             class="st5"
-             d="m 114.7,190.9 c -6.4,0 -12,-2.6 -14.8,-7.5 -2.9,-4.9 -5.4,-14.5 9.6,-23.2 4.8,-2.8 17.1,-3.9 20.8,-4 l 0.1,3.6 c -4.6,0.1 -15.5,1.4 -19.1,3.5 -9.4,5.4 -12.1,11.5 -8.3,18.3 3.8,6.6 14.6,7.6 24,2.2 6.6,-3.8 10.6,-10.5 10.7,-17.9 l -0.1,-0.7 0,-69.8 71.9,-14.2 0.1,71.3 c 0,6.7 -3.3,16.4 -12.5,21.8 -11.1,6.4 -24.1,4.8 -28.9,-3.5 -2.9,-4.9 -5.4,-14.5 9.6,-23.2 4.4,-2.5 14.4,-3.8 18.8,-3.9 l 0.1,3.6 c -4.2,0.1 -13.5,1.4 -17.1,3.5 -6.4,3.7 -13.1,9.9 -8.3,18.3 3.8,6.6 14.6,7.6 24,2.2 7.9,-4.5 10.7,-12.8 10.7,-18.5 l -0.1,-0.8 0,-66.4 -64.7,12.7 0,66.8 0.1,0.7 c 0,8.7 -4.7,16.6 -12.5,21.1 -4.7,2.7 -9.6,4 -14.1,4 z"
-             id="path3498"
-             style="fill:url(#SVGID_2_)"
-             inkscape:connector-curvature="0" /><linearGradient
-             id="SVGID_3_"
-             gradientUnits="userSpaceOnUse"
-             x1="145.50549"
-             y1="203.8951"
-             x2="191.8053"
-             y2="70.363701"><stop
-               offset="0"
-               style="stop-color:#00ADDC"
-               id="stop3501" /><stop
-               offset="1"
-               style="stop-color:#6BFBFF"
-               id="stop3503" /></linearGradient><polygon
-             class="st6"
-             points="196.5,113.7 155.8,123.3 155,119.8 195.6,110.2 "
-             id="polygon3505"
-             style="fill:url(#SVGID_3_)" /></g></g></g></switch></svg>
\ No newline at end of file
diff --git a/homescreen/qml/images/Shortcut/music.svg b/homescreen/qml/images/Shortcut/mediaplayer.svg
index de7448d..de7448d 100644
--- a/homescreen/qml/images/Shortcut/music.svg
+++ b/homescreen/qml/images/Shortcut/mediaplayer.svg
diff --git a/homescreen/qml/images/Shortcut/music_active.svg b/homescreen/qml/images/Shortcut/mediaplayer_active.svg
index 16e3af5..16e3af5 100644
--- a/homescreen/qml/images/Shortcut/music_active.svg
+++ b/homescreen/qml/images/Shortcut/mediaplayer_active.svg
diff --git a/homescreen/qml/images/Shortcut/shortcut.qrc b/homescreen/qml/images/Shortcut/shortcut.qrc
index 99d282e..3c691ce 100644
--- a/homescreen/qml/images/Shortcut/shortcut.qrc
+++ b/homescreen/qml/images/Shortcut/shortcut.qrc
@@ -4,8 +4,8 @@
         <file>home_active.svg</file>
         <file>hvac.svg</file>
         <file>hvac_active.svg</file>
-        <file>music.svg</file>
-        <file>music_active.svg</file>
+        <file>mediaplayer.svg</file>
+        <file>mediaplayer_active.svg</file>
         <file>navigation.svg</file>
         <file>navigation_active.svg</file>
     </qresource>