Revert "Revert "Tweaked power options, added support for WiDi""
This reverts commit 63cd50302e0a23d124e9fb723e3a84fa0e55a14b.
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 9943e0f..1e5a770 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -168,9 +168,6 @@
<!-- Default LED on time for notification LED in milliseconds. -->
<integer name="config_defaultNotificationLedOn">500</integer>
- <!-- Default LED off time for notification LED in milliseconds. -->
- <integer name="config_defaultNotificationLedOff">2000</integer>
-
<!-- reference volume index for music stream to limit headphone volume and display warning -->
<integer name="config_safe_media_volume_index">10</integer>
@@ -308,6 +305,20 @@
<!-- Whether Multiuser UI should be shown -->
<bool name="config_enableMultiUserUI">false</bool>
+ <!-- Whether WiFi display is supported by this device.
+ There are many prerequisites for this feature to work correctly.
+ Here are a few of them:
+ * The WiFi radio must support WiFi P2P.
+ * The WiFi radio must support concurrent connections to the WiFi display and
+ to an access point.
+ * The Audio Flinger audio_policy.conf file must specify a rule for the "r_submix"
+ remote submix module. This module is used to record and stream system
+ audio output to the WiFi display encoder in the media server.
+ * The remote submix module "audio.r_submix.default" must be installed on the device.
+ * The device must be provisioned with HDCP keys (for protected content).
+ -->
+ <bool name="config_enableWifiDisplay">true</bool>
+
<!-- Hardware keys present on the device, stored as a bit field.
This integer should equal the sum of the corresponding value for each
of the following keys present:
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 4bea3ce..b709948 100644
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -22,18 +22,17 @@
<value>1094400</value>
<value>998400</value>
<value>800000</value>
- <value>700000</value>
<value>600000</value>
<value>500000</value>
<value>400000</value>
</array>
<item name="cpu.idle">2.3</item>
+ <item name="wakeup.power">0.15</item>
<array name="cpu.active">
<value>169</value>
<value>141</value>
<value>129</value>
<value>94</value>
- <value>82</value>
<value>70</value>
<value>58</value>
<value>46</value>