Merge "Compilation fix :remove proprieties from resource xml files for bring up"

device/overlay/frameworks/base/core/res/res/values/config.xml

@@ -110,7 +110,7 @@
     <bool name="config_useDevInputEventForAudioJack">true</bool>
 
     <!-- Is the device capable of hot swapping an ICC Card -->
-    <bool name="config_hotswapCapable">true</bool>
+    <!--bool name="config_hotswapCapable">true</bool-->
 
     <!-- Set to true if the wifi display supports compositing content stored
          in gralloc protected buffers.  For this to be true, there must exist
@@ -188,8 +188,9 @@
 
     <!-- Configuration to restart radio upon PDP_DEACTIVATE with
          error cause as Regular deactivation(36). -->
+    <!--
     <bool name="config_radio_reset_on_regular_deactivation">false</bool>
-
+    -->
     <!-- Flag indicating if the speed up audio on mt call code should be executed -->
     <bool name="config_speed_up_audio_on_mt_calls">true</bool>
 
@@ -197,6 +198,7 @@
     <bool name="config_camera_sound_forced">true</bool>
 
     <!-- Configuration to enable non-default PDP during IWLAN -->
+    <!--
     <bool name="config_feature_iwlan_enabled">true</bool>
-
+    -->
 </resources>

device/overlay/frameworks/base/core/res/res/xml/storage_list.xml

@@ -48,7 +48,7 @@
             android:emulated="false"
             android:removable="true"
             android:allowMassStorage="true" />
-        <storage android:mountPoint="/storage/uicc0"
+        <!--storage android:mountPoint="/storage/uicc0"
             android:storageDescription="@string/storage_uicc"
             android:primary="false"
             android:emulated="false"
@@ -59,7 +59,7 @@
             android:primary="false"
             android:emulated="false"
             android:removable="true"
-            android:allowMassStorage="false" />
+            android:allowMassStorage="false" /-->
         <storage android:mountPoint="/storage/usbotg"
             android:storageDescription="@string/storage_usb"
             android:primary="false"

device/overlay/packages/apps/Camera2/res/layout-land/camera_controls.xml

@@ -28,12 +28,12 @@
             android:layout_width="@dimen/switcher_size"
             android:layout_gravity="right" />
 
-        <include layout="@layout/menu_indicators"
+        <!--include layout="@layout/menu_indicators"
             android:layout_width="64dip"
             android:layout_height="64dip"
             android:layout_marginTop="-8dip"
             android:layout_marginRight="8dip"
-            android:layout_gravity="top|right"/>
+            android:layout_gravity="top|right"/-->
 
         <com.android.camera.ui.PieMenuButton
             android:id="@+id/menu"

device/overlay/packages/apps/Camera2/res/layout-port/camera_controls.xml

@@ -28,12 +28,12 @@
             android:layout_height="@dimen/switcher_size"
             android:layout_gravity="bottom" />
 
-        <include layout="@layout/menu_indicators"
+        <!--include layout="@layout/menu_indicators"
             android:layout_width="64dip"
             android:layout_height="64dip"
             android:layout_gravity="bottom|right"
             android:layout_marginBottom="8dip"
-            android:layout_marginRight="-8dip" />
+            android:layout_marginRight="-8dip" /-->
 
         <com.android.camera.ui.PieMenuButton
             android:id="@+id/menu"

device/overlay/packages/apps/CellBroadcastReceiver/res/values/config.xml

@@ -25,5 +25,5 @@
     <!-- Whether to enable channel 50 settings (Brazil) -->
     <bool name="show_brazil_settings">true</bool>
     <!-- Whether to enable channel 50 and 60 settings (India) -->
-    <bool name="show_india_settings">true</bool>
+    <!--bool name="show_india_settings">true</bool-->
 </resources>