From 5fdcf0ecaf8152441015014dc70de2ff92987973 Mon Sep 17 00:00:00 2001
From: milad <milad@miladnazeri.com>
Date: Wed, 4 Sep 2019 12:59:17 -0700
Subject: [PATCH] updated setting name and changed default value to true for
 show tray

---
 .../hifi/simplifiedUI/settingsApp/general/General.qml  |  8 ++++----
 .../ui/qml/SimplifiedEmoteIndicator.qml                | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
index c74a01f31d..24fff2dae4 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
@@ -136,17 +136,17 @@ Flickable {
                     Layout.preferredHeight: 18
                     Layout.preferredWidth: parent.width
                     labelTextOn: "Show Emote UI"
-                    checked: Settings.getValue("simplifiedUI/showEmoteUI", true)
+                    checked: Settings.getValue("simplifiedUI/allowEmoteDrawerExpansion", true)
                     onClicked: {
-                        var currentSetting = Settings.getValue("simplifiedUI/showEmoteUI", true);
-                        Settings.setValue("simplifiedUI/showEmoteUI", !currentSetting);
+                        var currentSetting = Settings.getValue("simplifiedUI/allowEmoteDrawerExpansion", true);
+                        Settings.setValue("simplifiedUI/allowEmoteDrawerExpansion", !currentSetting);
                     }                    
 
                     Connections {
                         target: Settings
 
                         onValueChanged: {
-                            if (setting === "simplifiedUI/showEmoteUI") {
+                            if (setting === "simplifiedUI/allowEmoteDrawerExpansion") {
                                 emoteSwitch.checked = value;
                             }
                         }
diff --git a/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml b/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
index 8032edce84..787ccadd62 100644
--- a/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
+++ b/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
@@ -25,7 +25,7 @@ Rectangle {
     property int expandedWidth: mainEmojiContainer.width + drawerContainer.width
     // For the below to work, the Repeater's Item's second child must be the individual button's `MouseArea`
     property int requestedWidth: (
-        root.showEmoteUI && (
+        root.allowEmoteDrawerExpansion && (
             drawerContainer.keepDrawerExpanded ||
             emoteIndicatorMouseArea.containsMouse ||
             emoteButtonsRepeater.itemAt(0).hovered ||
@@ -37,7 +37,7 @@ Rectangle {
         ) ? expandedWidth : originalWidth;
     readonly property int totalEmojiDurationMS: 7000 // Must match `TOTAL_EMOJI_DURATION_MS` in `simplifiedEmoji.js`
     readonly property string emoteIconSource: "images/emote_Icon.svg"
-    property bool showEmoteUI: Settings.getValue("simplifiedUI/showEmoteUI", false)
+    property bool allowEmoteDrawerExpansion: Settings.getValue("simplifiedUI/allowEmoteDrawerExpansion", true)
 
 
     onRequestedWidthChanged: {
@@ -53,8 +53,8 @@ Rectangle {
         target: Settings
 
         onValueChanged: {
-            if (setting === "simplifiedUI/showEmoteUI") {
-                root.showEmoteUI = value;
+            if (setting === "simplifiedUI/allowEmoteDrawerExpansion") {
+                root.allowEmoteDrawerExpansion = value;
             }
         }
     }
@@ -172,7 +172,7 @@ Rectangle {
             anchors.fill: lockIcon
             source: lockIcon
             color: "#ffffff"
-            visible: root.showEmoteUI && drawerContainer.keepDrawerExpanded
+            visible: root.allowEmoteDrawerExpansion && drawerContainer.keepDrawerExpanded
         }
 
         MouseArea {