Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename DensityMap to DensityMapping per API review" into tm-dev

Browse Source
This commit is contained in:
Brian Lindahl
2022-04-01 21:05:24 +00:00
committed by Android (Google) Code Review
parent 431f988122 d53661bc0f
commit 2dcae95133
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/display/DisplayDeviceConfig.java
View File

@@ -741,11 +741,11 @@ public class DisplayDeviceConfig {
}
private void loadDensityMapping(DisplayConfiguration config) {
if (config.getDensityMap() == null) {
if (config.getDensityMapping() == null) {
return;
}
final List<Density> entriesFromXml = config.getDensityMap().getDensity();
final List<Density> entriesFromXml = config.getDensityMapping().getDensity();
final DensityMapping.Entry[] entries =
new DensityMapping.Entry[entriesFromXml.size()];

4
services/core/xsd/display-device-config/display-device-config.xsd
View File

@@ -26,7 +26,7 @@
<xs:element name="displayConfiguration">
<xs:complexType>
<xs:sequence>
<xs:element type="densityMap" name="densityMap" minOccurs="0" maxOccurs="1">
<xs:element type="densityMapping" name="densityMapping" minOccurs="0" maxOccurs="1">
<xs:annotation name="nullable"/>
<xs:annotation name="final"/>
</xs:element>
@@ -281,7 +281,7 @@
</xs:sequence>
</xs:complexType>
<xs:complexType name="densityMap">
<xs:complexType name="densityMapping">
<xs:sequence>
<xs:element name="density" type="density" maxOccurs="unbounded" minOccurs="1">
</xs:element>

8
services/core/xsd/display-device-config/schema/current.txt
View File

@@ -30,8 +30,8 @@ package com.android.server.display.config {
method public final void setWidth(@NonNull java.math.BigInteger);
}
public class DensityMap {
ctor public DensityMap();
public class DensityMapping {
ctor public DensityMapping();
method public java.util.List<com.android.server.display.config.Density> getDensity();
}
@@ -40,7 +40,7 @@ package com.android.server.display.config {
method @NonNull public final com.android.server.display.config.Thresholds getAmbientBrightnessChangeThresholds();
method public final java.math.BigInteger getAmbientLightHorizonLong();
method public final java.math.BigInteger getAmbientLightHorizonShort();
method @Nullable public final com.android.server.display.config.DensityMap getDensityMap();
method @Nullable public final com.android.server.display.config.DensityMapping getDensityMapping();
method @NonNull public final com.android.server.display.config.Thresholds getDisplayBrightnessChangeThresholds();
method public com.android.server.display.config.HighBrightnessMode getHighBrightnessMode();
method public final com.android.server.display.config.SensorDetails getLightSensor();
@@ -56,7 +56,7 @@ package com.android.server.display.config {
method public final void setAmbientBrightnessChangeThresholds(@NonNull com.android.server.display.config.Thresholds);
method public final void setAmbientLightHorizonLong(java.math.BigInteger);
method public final void setAmbientLightHorizonShort(java.math.BigInteger);
method public final void setDensityMap(@Nullable com.android.server.display.config.DensityMap);
method public final void setDensityMapping(@Nullable com.android.server.display.config.DensityMapping);
method public final void setDisplayBrightnessChangeThresholds(@NonNull com.android.server.display.config.Thresholds);
method public void setHighBrightnessMode(com.android.server.display.config.HighBrightnessMode);
method public final void setLightSensor(com.android.server.display.config.SensorDetails);