From 66d06cd76dd25c5074383e63ac8497dd1235cf70 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 26 Oct 2015 14:00:48 +0100
Subject: [PATCH] Settings: do not display debug stuff in production

---
 Classes/Base.lproj/CallView.xib          | 4 +++-
 Classes/LinphoneUI/UIIconButton.m        | 6 ++++++
 Classes/SettingsView.m                   | 2 ++
 Settings/InAppSettings.bundle/Root.plist | 2 ++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Classes/Base.lproj/CallView.xib b/Classes/Base.lproj/CallView.xib
index 0588b8de0..dec08d1d5 100644
--- a/Classes/Base.lproj/CallView.xib
+++ b/Classes/Base.lproj/CallView.xib
@@ -230,7 +230,7 @@
                                 <outlet property="delegate" destination="162" id="169"/>
                             </connections>
                         </tableView>
-                        <view hidden="YES" contentMode="scaleToFill" id="ukG-i4-YMY" userLabel="numpadView">
+                        <view hidden="YES" alpha="0.79999999999999982" contentMode="scaleToFill" id="ukG-i4-YMY" userLabel="numpadView">
                             <rect key="frame" x="0.0" y="75" width="375" height="428"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
@@ -572,6 +572,7 @@
                                                 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                             </state>
                                             <state key="disabled" image="footer_dialer_disabled.png"/>
+                                            <state key="selected" image="dialer_alt_back_default.png"/>
                                             <state key="highlighted" backgroundImage="color_L.png"/>
                                             <connections>
                                                 <action selector="onNumpadClick:" destination="-1" eventType="touchUpInside" id="pFD-jh-GhK"/>
@@ -626,6 +627,7 @@
         <image name="color_L.png" width="2" height="2"/>
         <image name="conference_start_default.png" width="33" height="33"/>
         <image name="conference_start_disabled.png" width="33" height="33"/>
+        <image name="dialer_alt_back_default.png" width="26" height="26"/>
         <image name="footer_chat_default.png" width="27" height="27"/>
         <image name="footer_dialer_default.png" width="27" height="27"/>
         <image name="footer_dialer_disabled.png" width="27" height="27"/>
diff --git a/Classes/LinphoneUI/UIIconButton.m b/Classes/LinphoneUI/UIIconButton.m
index 04c422dd7..b10a24947 100644
--- a/Classes/LinphoneUI/UIIconButton.m
+++ b/Classes/LinphoneUI/UIIconButton.m
@@ -13,6 +13,12 @@
 @implementation UIIconButton
 
 - (id)fixBackgroundImageForState {
+
+	[super setImage:[self imageForState:UIControlStateSelected]
+		   forState:(UIControlStateHighlighted | UIControlStateSelected)];
+	[super setImage:[self imageForState:UIControlStateDisabled]
+		   forState:(UIControlStateDisabled | UIControlStateSelected)];
+
 	[self setBackgroundImage:[self backgroundImageForState:UIControlStateHighlighted]
 					forState:(UIControlStateHighlighted | UIControlStateSelected)];
 	[self setBackgroundImage:[self backgroundImageForState:UIControlStateDisabled]
diff --git a/Classes/SettingsView.m b/Classes/SettingsView.m
index 2b838926b..278b16b7a 100644
--- a/Classes/SettingsView.m
+++ b/Classes/SettingsView.m
@@ -545,9 +545,11 @@ static UICompositeViewDescription *compositeDescription = nil;
 	}
 
 #ifndef DEBUG
+	[hiddenKeys addObject:@"debug_actions_group"];
 	[hiddenKeys addObject:@"release_button"];
 	[hiddenKeys addObject:@"clear_cache_button"];
 	[hiddenKeys addObject:@"battery_alert_button"];
+	[hiddenKeys addObject:@"enable_auto_answer_preference"];
 #endif
 
 	if (![[LinphoneManager instance] lpConfigBoolForKey:@"debugenable_preference"]) {
diff --git a/Settings/InAppSettings.bundle/Root.plist b/Settings/InAppSettings.bundle/Root.plist
index a9ccc6e41..8f5f7d015 100644
--- a/Settings/InAppSettings.bundle/Root.plist
+++ b/Settings/InAppSettings.bundle/Root.plist
@@ -145,6 +145,8 @@
 		<dict>
 			<key>Title</key>
 			<string>Development debug actions</string>
+			<key>Key</key>
+			<string>debug_actions_group</string>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>