diff --git a/clients/flash/air-client/src/css/hdpi.css b/clients/flash/air-client/src/css/hdpi.css
index a93fcca0cdbdbc6773b83edcccac1f5d07218126..ffa3be5167448396b2b1b1ea0a17b26691fd91b0 100755
--- a/clients/flash/air-client/src/css/hdpi.css
+++ b/clients/flash/air-client/src/css/hdpi.css
@@ -199,6 +199,14 @@
padding: 24.00;
}
+ .audioHelpLabel {
+ fontSize: 27.00;
+ }
+
+ .audioButtonLabel {
+ fontSize: 21.00;
+ }
+
.audioButtonStyle {
iconSize: 66.00;
}
diff --git a/clients/flash/air-client/src/css/ldpi.css b/clients/flash/air-client/src/css/ldpi.css
index 778113bc313973f5c58a94577ef6e8e5f6ad72cd..6913ca3b44b931f22a43fc3025cb624d33ffafd4 100755
--- a/clients/flash/air-client/src/css/ldpi.css
+++ b/clients/flash/air-client/src/css/ldpi.css
@@ -199,6 +199,14 @@
padding: 12.000;
}
+ .audioHelpLabel {
+ fontSize: 13.500;
+ }
+
+ .audioButtonLabel {
+ fontSize: 10.500;
+ }
+
.audioButtonStyle {
iconSize: 33.000;
}
diff --git a/clients/flash/air-client/src/css/mdpi.css b/clients/flash/air-client/src/css/mdpi.css
index 4786ba615b65c9cc5301f2414e2ce9c3c3a669c9..7b156dd70acd406e2847ee73346bcdf8a911d51a 100755
--- a/clients/flash/air-client/src/css/mdpi.css
+++ b/clients/flash/air-client/src/css/mdpi.css
@@ -199,6 +199,14 @@
padding: 16.0;
}
+ .audioHelpLabel {
+ fontSize: 18.0;
+ }
+
+ .audioButtonLabel {
+ fontSize: 14.0;
+ }
+
.audioButtonStyle {
iconSize: 44.0;
}
diff --git a/clients/flash/air-client/src/css/xhdpi.css b/clients/flash/air-client/src/css/xhdpi.css
index 9c86df9b7d14ecfd2bfd3d7f25c6b08b15f58cb9..bcbdd07b3f9000ad6c865fa04f7be0ae74f4cc8e 100755
--- a/clients/flash/air-client/src/css/xhdpi.css
+++ b/clients/flash/air-client/src/css/xhdpi.css
@@ -188,6 +188,14 @@
padding : 32;
}
+ .audioHelpLabel {
+ fontSize : 36;
+ }
+
+ .audioButtonLabel {
+ fontSize : 28;
+ }
+
.audioButtonStyle {
iconSize : 88;
}
diff --git a/clients/flash/air-client/src/css/xxhdpi.css b/clients/flash/air-client/src/css/xxhdpi.css
index 7b88fcea2d4a4b2818c3624bc78dd37c9f667d6f..03118bff89d0e576bfb055b5d069e70d27d85a44 100755
--- a/clients/flash/air-client/src/css/xxhdpi.css
+++ b/clients/flash/air-client/src/css/xxhdpi.css
@@ -199,6 +199,14 @@
padding: 48.0;
}
+ .audioHelpLabel {
+ fontSize: 54.0;
+ }
+
+ .audioButtonLabel {
+ fontSize: 42.0;
+ }
+
.audioButtonStyle {
iconSize: 132.0;
}
diff --git a/clients/flash/air-client/src/css/xxxhdpi.css b/clients/flash/air-client/src/css/xxxhdpi.css
index 68b3a23cfe30e9ab870dfb24dec003990a6a8b0c..6fab6be135fba8f7eef99f9af9d62f1dcb896470 100755
--- a/clients/flash/air-client/src/css/xxxhdpi.css
+++ b/clients/flash/air-client/src/css/xxxhdpi.css
@@ -199,6 +199,14 @@
padding: 64;
}
+ .audioHelpLabel {
+ fontSize: 72;
+ }
+
+ .audioButtonLabel {
+ fontSize: 56;
+ }
+
.audioButtonStyle {
iconSize: 176;
}
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/voice/views/EchoTestViewMediator.as b/clients/flash/air-client/src/org/bigbluebutton/air/voice/views/EchoTestViewMediator.as
index 7f205fa9b80a53280c65d8ba2e48680a1a764de6..871b1757897070b8ed54297a43a979431a531e5f 100755
--- a/clients/flash/air-client/src/org/bigbluebutton/air/voice/views/EchoTestViewMediator.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/voice/views/EchoTestViewMediator.as
@@ -139,9 +139,6 @@ package org.bigbluebutton.air.voice.views {
uiSession.popPage();
uiSession.popPage();
- var audioOptions:Object = new Object();
- audioOptions.shareMic = true;
- audioOptions.listenOnly = false;
shareMicrophoneSignal.dispatch(AudioTypeEnum.WITH_MIC, conferenceParameters.webvoiceconf);
}
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/voice/views/JoinAudioView.as b/clients/flash/air-client/src/org/bigbluebutton/air/voice/views/JoinAudioView.as
index 4815c56f4e2c867c6c9e62554a5ec6bf999c74cb..83967b1777269a4f35a61fe458563322afe19e30 100644
--- a/clients/flash/air-client/src/org/bigbluebutton/air/voice/views/JoinAudioView.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/voice/views/JoinAudioView.as
@@ -17,6 +17,12 @@ package org.bigbluebutton.air.voice.views {
[Bindable]
public var microphoneButton:Button;
+ private var helpLabel:Label;
+
+ private var listenLabel:Label;
+
+ private var micLabel:Label;
+
private var _buttonsGroup:HGroup;
private var _micGroup:VGroup;
@@ -28,12 +34,22 @@ package org.bigbluebutton.air.voice.views {
var vLayout:VerticalLayout = new VerticalLayout();
vLayout.horizontalAlign = HorizontalAlign.CENTER;
+ vLayout.verticalAlign = VerticalAlign.MIDDLE;
layout = vLayout;
+ var mainGroup:VGroup = new VGroup();
+ mainGroup.verticalAlign = VerticalAlign.MIDDLE;
+ mainGroup.horizontalAlign = HorizontalAlign.CENTER;
+ mainGroup.percentHeight = 100;
+ this.addElement(mainGroup);
+
+ helpLabel = new Label();
+ helpLabel.text = "How do you want to join the audio?";
+ mainGroup.addElement(helpLabel);
+
_buttonsGroup = new HGroup();
- _buttonsGroup.percentHeight = 100;
_buttonsGroup.verticalAlign = VerticalAlign.MIDDLE;
- this.addElement(_buttonsGroup);
+ mainGroup.addElement(_buttonsGroup);
_micGroup = new VGroup();
_micGroup.horizontalAlign = HorizontalAlign.CENTER;
@@ -42,7 +58,7 @@ package org.bigbluebutton.air.voice.views {
microphoneButton = new Button();
_micGroup.addElement(microphoneButton);
- var micLabel:Label = new Label();
+ micLabel = new Label();
micLabel.text = "Microphone"
_micGroup.addElement(micLabel);
@@ -53,14 +69,17 @@ package org.bigbluebutton.air.voice.views {
listenOnlyButton = new Button();
_listenGroup.addElement(listenOnlyButton);
- var listenLabel:Label = new Label();
+ listenLabel = new Label();
listenLabel.text = "Listen Only";
_listenGroup.addElement(listenLabel);
}
override protected function updateDisplayList(w:Number, h:Number):void {
super.updateDisplayList(w, h);
-
+
+ helpLabel.styleName = "audioHelpLabel";
+ micLabel.styleName = "audioButtonLabel";
+ listenLabel.styleName = "audioButtonLabel";
_buttonsGroup.gap = getStyle("gap");
listenOnlyButton.styleName = "audioButtonStyle menuButton icon-listen";
microphoneButton.styleName = "audioButtonStyle menuButton icon-audio-on";
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/voice/views/JoinAudioViewMediator.as b/clients/flash/air-client/src/org/bigbluebutton/air/voice/views/JoinAudioViewMediator.as
index 7be4bc9921ccdef40146b7c08e66af4587fead1a..6802c6c7bea78614341a5382a4b400ce54d6d8be 100644
--- a/clients/flash/air-client/src/org/bigbluebutton/air/voice/views/JoinAudioViewMediator.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/voice/views/JoinAudioViewMediator.as
@@ -31,9 +31,6 @@ package org.bigbluebutton.air.voice.views {
}
private function listenOnlyButtonHandler(event:MouseEvent):void {
- var audioOptions:Object = new Object();
- audioOptions.shareMic = true;
- audioOptions.listenOnly = false;
shareMicrophoneSignal.dispatch(AudioTypeEnum.LISTEN_ONLY, conferenceParameters.webvoiceconf);
uiSession.popPage();
}