diff options
author | Filip Gruszczynski <gruszczy@google.com> | 2015-02-25 21:30:07 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-25 21:31:53 +0000 |
commit | 1e74b5d6b0e964b7a9e58e64b45f50aec15b1178 (patch) | |
tree | 91e563909e2b441cadda884c79ad38206153fd6d /core | |
parent | aeffc9cebd4e97889f5b2f61de38c60b83535ffa (diff) | |
parent | d2e8640c2c1972d4f2e92d48660fa9e17d9291c4 (diff) | |
download | frameworks_base-1e74b5d6b0e964b7a9e58e64b45f50aec15b1178.zip frameworks_base-1e74b5d6b0e964b7a9e58e64b45f50aec15b1178.tar.gz frameworks_base-1e74b5d6b0e964b7a9e58e64b45f50aec15b1178.tar.bz2 |
Merge "Burn in protection." into lmp-mr1-modular-dev
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/hardware/display/DisplayManagerInternal.java | 13 | ||||
-rw-r--r-- | core/res/AndroidManifest.xml | 2 | ||||
-rwxr-xr-x | core/res/res/values/config.xml | 19 | ||||
-rwxr-xr-x | core/res/res/values/symbols.xml | 6 |
4 files changed, 40 insertions, 0 deletions
diff --git a/core/java/android/hardware/display/DisplayManagerInternal.java b/core/java/android/hardware/display/DisplayManagerInternal.java index bb162153..adab9be 100644 --- a/core/java/android/hardware/display/DisplayManagerInternal.java +++ b/core/java/android/hardware/display/DisplayManagerInternal.java @@ -132,6 +132,19 @@ public abstract class DisplayManagerInternal { float requestedRefreshRate, boolean inTraversal); /** + * Applies an offset to the contents of a display, for example to avoid burn-in. + * <p> + * TODO: Technically this should be associated with a physical rather than logical + * display but this is good enough for now. + * </p> + * + * @param displayId The logical display id to update. + * @param x The X offset by which to shift the contents of the display. + * @param y The Y offset by which to shift the contents of the display. + */ + public abstract void setDisplayOffsets(int displayId, int x, int y); + + /** * Describes the requested power state of the display. * * This object is intended to describe the general characteristics of the diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index ccdb5db..59dafed 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -303,6 +303,8 @@ <protected-broadcast android:name="android.intent.action.ACTION_SET_RADIO_CAPABILITY_DONE" /> <protected-broadcast android:name="android.intent.action.ACTION_SET_RADIO_CAPABILITY_FAILED" /> + <protected-broadcast android:name="android.internal.policy.action.BURN_IN_PROTECTION" /> + <!-- ====================================== --> <!-- Permissions for things that cost money --> <!-- ====================================== --> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 17b87d6..15eb095 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2066,4 +2066,23 @@ <!-- Scale factor threshold used by the screen magnifier to determine when to switch from panning to scaling the magnification viewport. --> <item name="config_screen_magnification_scaling_threshold" format="float" type="dimen">0.3</item> + + <!-- If true, the display will be shifted around in ambient mode. --> + <bool name="config_enableBurnInProtection">false</bool> + + <!-- Specifies the maximum burn-in offset displacement from the center. If -1, no maximum value + will be used. --> + <integer name="config_burnInProtectionMaxRadius">-1</integer> + + <!-- Specifies the minimum burn-in offset horizontally. --> + <integer name="config_burnInProtectionMinHorizontalOffset">0</integer> + + <!-- Specifies the maximum burn-in offset horizontally. --> + <integer name="config_burnInProtectionMaxHorizontalOffset">0</integer> + + <!-- Specifies the minimum burn-in offset vertically. --> + <integer name="config_burnInProtectionMinVerticalOffset">0</integer> + + <!-- Specifies the maximum burn-in offset vertically. --> + <integer name="config_burnInProtectionMaxVerticalOffset">0</integer> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 390661c..1f00dbe 100755 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -254,6 +254,7 @@ <java-symbol type="bool" name="config_duplicate_port_omadm_wappush" /> <java-symbol type="bool" name="config_enable_emergency_call_while_sim_locked" /> <java-symbol type="bool" name="config_enable_puk_unlock_screen" /> + <java-symbol type="bool" name="config_enableBurnInProtection" /> <java-symbol type="bool" name="config_hotswapCapable" /> <java-symbol type="bool" name="config_mms_content_disposition_support" /> <java-symbol type="bool" name="config_networkSamplingWakesDevice" /> @@ -344,6 +345,11 @@ <java-symbol type="integer" name="config_wifi_framework_current_network_boost" /> <java-symbol type="integer" name="config_bluetooth_max_advertisers" /> <java-symbol type="integer" name="config_bluetooth_max_scan_filters" /> + <java-symbol type="integer" name="config_burnInProtectionMinHorizontalOffset" /> + <java-symbol type="integer" name="config_burnInProtectionMaxHorizontalOffset" /> + <java-symbol type="integer" name="config_burnInProtectionMinVerticalOffset" /> + <java-symbol type="integer" name="config_burnInProtectionMaxVerticalOffset" /> + <java-symbol type="integer" name="config_burnInProtectionMaxRadius" /> <java-symbol type="integer" name="config_cursorWindowSize" /> <java-symbol type="integer" name="config_drawLockTimeoutMillis" /> <java-symbol type="integer" name="config_doublePressOnPowerBehavior" /> |