Merge "Remove duplicates in overlay" into nyc-dev
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 6d5c78d..1db8134 100755
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -237,13 +237,6 @@
rather than the uevent framework. -->
<bool name="config_useDevInputEventForAudioJack">true</bool>
- <!-- Indicate whether to allow the device to suspend when the screen is off
- due to the proximity sensor. This resource should only be set to true
- if the sensor HAL correctly handles the proximity sensor as a wake-up source.
- Otherwise, the device may fail to wake out of suspend reliably.
- The default is false. -->
- <bool name="config_suspendWhenScreenOffDueToProximity">true</bool>
-
<!-- Vibrator pattern for feedback about a long screen/key press -->
<integer-array name="config_longPressVibePattern">
<item>0</item>
@@ -276,17 +269,6 @@
<!-- Boolean indicating whether or not wifi should turn off when emergency call is made -->
<bool translatable="false" name="config_wifi_turn_off_during_emergency_call">true</bool>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">Nexus6P</string>
-
- <!-- MMS user agent prolfile url -->
- <!-- TODO: add one here -->
-
- <!-- Maximum number of supported users -->
- <integer name="config_multiuserMaximumUsers">4</integer>
- <!-- Whether Multiuser UI should be shown -->
- <bool name="config_enableMultiUserUI">true</bool>
-
<!-- Enable doze mode
ComponentName of a dream to show whenever the system would otherwise have gone to sleep. -->
<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
