X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fqml%2FMediaAreaBlank.qml;h=7a9e8af367dd340cdb2b09b61f8683b595b3222d;hb=a920d9537132f3778c137edee8d6741102919787;hp=60d0c925baa60c3b8b1fcdb605c42385ed9e30d6;hpb=f3de2f5cad06a772ee55f58694d559a7cb012c02;p=apps%2Fhomescreen.git diff --git a/homescreen/qml/MediaAreaBlank.qml b/homescreen/qml/MediaAreaBlank.qml index 60d0c92..7a9e8af 100644 --- a/homescreen/qml/MediaAreaBlank.qml +++ b/homescreen/qml/MediaAreaBlank.qml @@ -19,11 +19,12 @@ import QtQuick 2.2 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.0 import AGL.Demo.Controls 1.0 +/* import MasterVolume 1.0 +*/ Image { - width: parent.width - height: parent.height + anchors.fill: parent source: './images/Utility_Logo_Background-01.svg' property bool displayVolume: false; @@ -56,20 +57,18 @@ 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 } } ] transitions: Transition { NumberAnimation { property: "opacity"; duration: 500} } - +/* MasterVolume { id: mv objectName: "mv" @@ -78,7 +77,7 @@ Image { mv.open(bindingAddress); } } - +*/ Item { id: master_volume anchors.fill: parent @@ -109,8 +108,10 @@ Image { to: 100 stepSize: 1 snapMode: Slider.SnapOnRelease +/* onValueChanged: mv.volume = value Component.onCompleted: value = mv.volume +*/ onPressedChanged: { if (pressed) {volume_timer.stop()} else {volume_timer.restart()} @@ -123,12 +124,4 @@ Image { } } } - - SpeechChrome { - id: speech_chrome - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - height: parent.height - } }