diff options
author | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-11-08 11:08:35 +0000 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-11-08 11:08:35 +0000 |
commit | 0bdd39b247661c1a0406d450d578d4ff3fd171b0 (patch) | |
tree | 43b6f217b728042fd7848b96d7574e07800611b1 /homescreen/qml | |
parent | f3de2f5cad06a772ee55f58694d559a7cb012c02 (diff) |
Revert "Add push to talk support to homescreen"
It turned out the homescreen won't show. So we need to revisit this patch.
https://gerrit.automotivelinux.org/gerrit/#/c/apps/homescreen/+/21182/
This reverts commit f3de2f5cad06a772ee55f58694d559a7cb012c02.
Change-Id: Ic8829e5009e9fb74b49ad1dd79125b45a872a838
Diffstat (limited to 'homescreen/qml')
-rw-r--r-- | homescreen/qml/MediaArea.qml | 4 | ||||
-rw-r--r-- | homescreen/qml/MediaAreaBlank.qml | 18 | ||||
-rw-r--r-- | homescreen/qml/SpeechChrome.qml | 120 | ||||
-rw-r--r-- | homescreen/qml/images/SpeechChrome/bar.png | bin | 23826 -> 0 bytes | |||
-rw-r--r-- | homescreen/qml/images/SpeechChrome/push_to_talk.svg | 322 | ||||
-rw-r--r-- | homescreen/qml/images/SpeechChrome/speechchrome.qrc | 6 | ||||
-rw-r--r-- | homescreen/qml/main.qml | 2 | ||||
-rw-r--r-- | homescreen/qml/qml.qrc | 1 |
8 files changed, 7 insertions, 466 deletions
diff --git a/homescreen/qml/MediaArea.qml b/homescreen/qml/MediaArea.qml index 3b6d18a..0447589 100644 --- a/homescreen/qml/MediaArea.qml +++ b/homescreen/qml/MediaArea.qml @@ -20,8 +20,8 @@ import QtQuick.Controls 2.0 StackView { id: root - width: parent.width - height: parent.height + width: 1080 + height: 215 initialItem: blank diff --git a/homescreen/qml/MediaAreaBlank.qml b/homescreen/qml/MediaAreaBlank.qml index 60d0c92..ebddb0c 100644 --- a/homescreen/qml/MediaAreaBlank.qml +++ b/homescreen/qml/MediaAreaBlank.qml @@ -22,8 +22,8 @@ import AGL.Demo.Controls 1.0 import MasterVolume 1.0 Image { - width: parent.width - height: parent.height + width: 1080 + height: 215 source: './images/Utility_Logo_Background-01.svg' property bool displayVolume: false; @@ -40,14 +40,14 @@ Image { } Image { - id: logo_image + id: logo_image anchors.centerIn: parent source: './images/Utility_Logo_Grey-01.svg' } Timer { id: volume_timer - interval: 3000; running: false; repeat: false + interval: 5000; running: false; repeat: false onTriggered: displayVolume = false } @@ -56,13 +56,11 @@ Image { PropertyChanges { target: master_volume; opacity: 1.0 } PropertyChanges { target: slider; enabled: true } PropertyChanges { target: logo_image; opacity: 0.0 } - PropertyChanges { target: speech_chrome; visible: false } }, State { when: !displayVolume; PropertyChanges { target: master_volume; opacity: 0.0 } PropertyChanges { target: slider; enabled: false } PropertyChanges { target: logo_image; opacity: 1.0 } - PropertyChanges { target: speech_chrome; visible: speech_chrome.agentPresent } } ] @@ -123,12 +121,4 @@ Image { } } } - - SpeechChrome { - id: speech_chrome - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - height: parent.height - } } diff --git a/homescreen/qml/SpeechChrome.qml b/homescreen/qml/SpeechChrome.qml deleted file mode 100644 index 911d481..0000000 --- a/homescreen/qml/SpeechChrome.qml +++ /dev/null @@ -1,120 +0,0 @@ -import QtQuick 2.0 -import SpeechChrome 1.0 - -Item { - id: root - - clip: true - - property bool agentPresent: speechChromeController.agentPresent - - visible: agentPresent - - Image { - id: chromeBarImage - - anchors.top: parent.top - source: "./images/SpeechChrome/bar.png" - - Behavior on x { - NumberAnimation { duration: 250 } - } - Behavior on opacity { - NumberAnimation { duration: 250 } - } - } - - Image { - id: pushToTalk - - height: parent.height * 0.80 - width: height - - anchors.left: parent.left - anchors.leftMargin: parent.width / 128 - anchors.verticalCenter: parent.verticalCenter - source: "./images/SpeechChrome/push_to_talk.svg" - - MouseArea { - anchors.fill: parent - onPressed: speechChromeController.pushToTalk() - } - - Behavior on opacity { - NumberAnimation { duration: 250 } - } - } - - states: [ - State { - name: "Idle" - when: speechChromeController.chromeState == SpeechChromeController.Idle - PropertyChanges { - target: chromeBarImage - opacity: 0.0 - x: 0 - } - PropertyChanges { - target: pushToTalk - opacity: 1.0 - enabled: true - } - }, - State { - name: "Listening" - when: speechChromeController.chromeState == SpeechChromeController.Listening - PropertyChanges { - target: chromeBarImage - opacity: 1.0 - x: 0 - } - PropertyChanges { - target: pushToTalk - opacity: 0.0 - enabled: false - } - }, - State { - name: "Thinking" - when: speechChromeController.chromeState == SpeechChromeController.Thinking - PropertyChanges { - target: chromeBarImage - opacity: 1.0 - x: root.width - chromeBarImage.width - } - PropertyChanges { - target: pushToTalk - opacity: 0.0 - enabled: false - } - }, - State { - name: "Speaking" - when: speechChromeController.chromeState == SpeechChromeController.Speaking - PropertyChanges { - target: chromeBarImage - opacity: 1.0 - x: (root.width - chromeBarImage.width) * 0.5 - } - PropertyChanges { - target: pushToTalk - opacity: 0.0 - enabled: false - } - }, - State { - name: "MicrophoneOff" - when: speechChromeController.chromeState == SpeechChromeController.MicrophoneOff - PropertyChanges { - target: chromeBarImage - opacity: 0.0 - x: 0 - } - PropertyChanges { - target: pushToTalk - opacity: 1.0 - enabled: true - } - } - ] -} diff --git a/homescreen/qml/images/SpeechChrome/bar.png b/homescreen/qml/images/SpeechChrome/bar.png Binary files differdeleted file mode 100644 index caabde1..0000000 --- a/homescreen/qml/images/SpeechChrome/bar.png +++ /dev/null diff --git a/homescreen/qml/images/SpeechChrome/push_to_talk.svg b/homescreen/qml/images/SpeechChrome/push_to_talk.svg deleted file mode 100644 index 0c775a1..0000000 --- a/homescreen/qml/images/SpeechChrome/push_to_talk.svg +++ /dev/null @@ -1,322 +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="&#38;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="Radio_Inactive" - x="0px" - y="0px" - viewBox="0 0 280 280" - xml:space="preserve" - inkscape:version="0.92.4 (unknown)" - sodipodi:docname="mic2.svg" - width="280" - height="280"><metadata - id="metadata5319"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs5317" /><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1910" - inkscape:window-height="899" - id="namedview5315" - showgrid="false" - inkscape:zoom="2" - inkscape:cx="166.88636" - inkscape:cy="140" - inkscape:window-x="0" - inkscape:window-y="27" - inkscape:window-maximized="0" - inkscape:current-layer="Radio_Inactive" /><style - type="text/css" - id="style5192"> - .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_);} - .st7{fill:url(#SVGID_4_);} - .st8{fill:url(#SVGID_5_);} - .st9{fill:url(#SVGID_6_);} - .st10{fill:url(#SVGID_7_);} - .st11{fill:url(#SVGID_8_);} - .st12{fill:url(#SVGID_9_);} - .st13{fill:url(#SVGID_10_);} - .st14{fill:url(#SVGID_11_);} - .st15{fill:url(#SVGID_12_);} - .st16{fill:url(#SVGID_13_);} -</style><switch - id="switch5194" - transform="matrix(1.3307804,0,0,1.3314313,-72.924861,-37.945792)"><g - i:extraneous="self" - id="g5196"><g - id="g5198"><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="stop5201" /><stop - offset="1" - style="stop-color:#6BFBFF" - id="stop5203" /></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 v 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="path5205" - style="fill:url(#SVGID_1_)" - inkscape:connector-curvature="0" /><g - id="g5207"><linearGradient - id="SVGID_2_" - gradientUnits="userSpaceOnUse" - x1="-11.0561" - y1="273.63409" - x2="354.8013" - y2="-51.979"><stop - offset="0" - style="stop-color:#00ADDC" - id="stop5210" /><stop - offset="1" - style="stop-color:#6BFBFF" - id="stop5212" /></linearGradient><path - class="st5" - d="m 168.2,162.4 -1.2,-3.5 c 7.9,-2.6 13.3,-9.6 13.3,-17.3 v -40.5 c 0,-10.2 -9.1,-18.4 -20.2,-18.4 -11.1,0 -20.2,8.3 -20.2,18.4 v 40.5 c 0,7.7 5.3,14.6 13.2,17.3 l -1.2,3.5 c -9.4,-3.2 -15.7,-11.5 -15.7,-20.8 v -40.5 c 0,-12.2 10.7,-22.1 23.9,-22.1 13.2,0 23.9,9.9 23.9,22.1 v 40.5 c 0,9.3 -6.4,17.6 -15.8,20.8 z" - id="path5214" - style="fill:url(#SVGID_2_)" - inkscape:connector-curvature="0" /></g><g - id="g5216"><linearGradient - id="SVGID_3_" - gradientUnits="userSpaceOnUse" - x1="3.6219001" - y1="290.12631" - x2="369.4794" - y2="-35.486801"><stop - offset="0" - style="stop-color:#00ADDC" - id="stop5219" /><stop - offset="1" - style="stop-color:#6BFBFF" - id="stop5221" /></linearGradient><path - class="st6" - d="m 160,172.9 c -18.3,0 -33.1,-12.2 -33.1,-27.3 h 3.7 c 0,13 13.2,23.6 29.5,23.6 16.3,0 29.5,-10.6 29.5,-23.6 h 3.7 c -0.2,15.1 -15,27.3 -33.3,27.3 z" - id="path5223" - style="fill:url(#SVGID_3_)" - inkscape:connector-curvature="0" /></g><g - id="g5225"><linearGradient - id="SVGID_4_" - gradientUnits="userSpaceOnUse" - x1="19.325199" - y1="307.77039" - x2="385.18259" - y2="-17.8428"><stop - offset="0" - style="stop-color:#00ADDC" - id="stop5228" /><stop - offset="1" - style="stop-color:#6BFBFF" - id="stop5230" /></linearGradient><rect - x="158.2" - y="178.5" - class="st7" - width="3.7" - height="8" - id="rect5232" - style="fill:url(#SVGID_4_)" /></g><g - id="g5234"><linearGradient - id="SVGID_5_" - gradientUnits="userSpaceOnUse" - x1="-22.1502" - y1="261.16879" - x2="343.70721" - y2="-64.444397"><stop - offset="0" - style="stop-color:#00ADDC" - id="stop5237" /><stop - offset="1" - style="stop-color:#6BFBFF" - id="stop5239" /></linearGradient><rect - x="138.10001" - y="110.3" - class="st8" - width="14.3" - height="3.7" - id="rect5241" - style="fill:url(#SVGID_5_)" /></g><g - id="g5243"><linearGradient - id="SVGID_6_" - gradientUnits="userSpaceOnUse" - x1="-27.6269" - y1="255.0152" - x2="338.23059" - y2="-70.5979"><stop - offset="0" - style="stop-color:#00ADDC" - id="stop5246" /><stop - offset="1" - style="stop-color:#6BFBFF" - id="stop5248" /></linearGradient><rect - x="138.10001" - y="99.300003" - class="st9" - width="14.3" - height="3.7" - id="rect5250" - style="fill:url(#SVGID_6_)" /></g><g - id="g5252"><linearGradient - id="SVGID_7_" - gradientUnits="userSpaceOnUse" - x1="-16.6164" - y1="267.3866" - x2="349.241" - y2="-58.226601"><stop - offset="0" - style="stop-color:#00ADDC" - id="stop5255" /><stop - offset="1" - style="stop-color:#6BFBFF" - id="stop5257" /></linearGradient><rect - x="138.10001" - y="121.4" - class="st10" - width="14.3" - height="3.7" - id="rect5259" - style="fill:url(#SVGID_7_)" /></g><g - id="g5261"><linearGradient - id="SVGID_8_" - gradientUnits="userSpaceOnUse" - x1="-11.1393" - y1="273.54059" - x2="354.71811" - y2="-52.072498"><stop - offset="0" - style="stop-color:#00ADDC" - id="stop5264" /><stop - offset="1" - style="stop-color:#6BFBFF" - id="stop5266" /></linearGradient><rect - x="138.10001" - y="132.5" - class="st11" - width="14.3" - height="3.7" - id="rect5268" - style="fill:url(#SVGID_8_)" /></g><g - id="g5270"><linearGradient - id="SVGID_9_" - gradientUnits="userSpaceOnUse" - x1="-9.1322002" - y1="275.7959" - x2="356.72531" - y2="-49.817299"><stop - offset="0" - style="stop-color:#00ADDC" - id="stop5273" /><stop - offset="1" - style="stop-color:#6BFBFF" - id="stop5275" /></linearGradient><rect - x="167.60001" - y="110.3" - class="st12" - width="14.3" - height="3.7" - id="rect5277" - style="fill:url(#SVGID_9_)" /></g><g - id="g5279"><linearGradient - id="SVGID_10_" - gradientUnits="userSpaceOnUse" - x1="-14.6088" - y1="269.6423" - x2="351.2486" - y2="-55.970798"><stop - offset="0" - style="stop-color:#00ADDC" - id="stop5282" /><stop - offset="1" - style="stop-color:#6BFBFF" - id="stop5284" /></linearGradient><rect - x="167.60001" - y="99.300003" - class="st13" - width="14.3" - height="3.7" - id="rect5286" - style="fill:url(#SVGID_10_)" /></g><g - id="g5288"><linearGradient - id="SVGID_11_" - gradientUnits="userSpaceOnUse" - x1="-3.5984001" - y1="282.01361" - x2="362.25909" - y2="-43.599499"><stop - offset="0" - style="stop-color:#00ADDC" - id="stop5291" /><stop - offset="1" - style="stop-color:#6BFBFF" - id="stop5293" /></linearGradient><rect - x="167.60001" - y="121.4" - class="st14" - width="14.3" - height="3.7" - id="rect5295" - style="fill:url(#SVGID_11_)" /></g><g - id="g5297"><linearGradient - id="SVGID_12_" - gradientUnits="userSpaceOnUse" - x1="1.8788" - y1="288.16769" - x2="367.73621" - y2="-37.445499"><stop - offset="0" - style="stop-color:#00ADDC" - id="stop5300" /><stop - offset="1" - style="stop-color:#6BFBFF" - id="stop5302" /></linearGradient><rect - x="167.60001" - y="132.5" - class="st15" - width="14.3" - height="3.7" - id="rect5304" - style="fill:url(#SVGID_12_)" /></g><g - id="g5306"><linearGradient - id="SVGID_13_" - gradientUnits="userSpaceOnUse" - x1="24.376101" - y1="313.44559" - x2="390.23361" - y2="-12.1676"><stop - offset="0" - style="stop-color:#00ADDC" - id="stop5309" /><stop - offset="1" - style="stop-color:#6BFBFF" - id="stop5311" /></linearGradient><path - class="st16" - d="m 182.1,195 h -3.7 c 0,-4.6 -2.3,-5.4 -8.8,-5.4 h -19.2 c -6.5,0 -8.8,0.8 -8.8,5.4 h -3.7 c 0,-9.1 7.8,-9.1 12.5,-9.1 h 19.2 c 4.7,0 12.5,0 12.5,9.1 z" - id="path5313" - style="fill:url(#SVGID_13_)" - inkscape:connector-curvature="0" /></g></g></g></switch></svg>
\ No newline at end of file diff --git a/homescreen/qml/images/SpeechChrome/speechchrome.qrc b/homescreen/qml/images/SpeechChrome/speechchrome.qrc deleted file mode 100644 index 42357f1..0000000 --- a/homescreen/qml/images/SpeechChrome/speechchrome.qrc +++ /dev/null @@ -1,6 +0,0 @@ -<RCC> - <qresource prefix="/images/SpeechChrome"> - <file>bar.png</file> - <file>push_to_talk.svg</file> - </qresource> -</RCC> diff --git a/homescreen/qml/main.qml b/homescreen/qml/main.qml index 233ee4f..7d40276 100644 --- a/homescreen/qml/main.qml +++ b/homescreen/qml/main.qml @@ -99,7 +99,7 @@ Window { } } - Timer { + Timer { id:notificationTimer interval: 3000 running: false diff --git a/homescreen/qml/qml.qrc b/homescreen/qml/qml.qrc index d901481..e60ea63 100644 --- a/homescreen/qml/qml.qrc +++ b/homescreen/qml/qml.qrc @@ -10,6 +10,5 @@ <file>StatusArea.qml</file> <file>TopArea.qml</file> <file>IconItem.qml</file> - <file>SpeechChrome.qml</file> </qresource> </RCC> |