Revert some customization config from C10/P10

Previously ag/16573869,ag/16655971 accidently migration some
config unrelated to rounded corner / display cutout.

Test: make and flash, enable debug mode and check visual
Bug: 199468172
Bug: 199467921
Bug: 203593020
Bug: 203592814
Change-Id: Idb5ecfd6e20293c083c3e13a926eef2c48d9605d

cheetah/overlay/frameworks/base/packages/SystemUI/res/values/config.xml

@@ -20,44 +20,6 @@
 <!-- These resources are around just to allow their values to be customized
      for different hardware and product builds. -->
 <resources>
-    <!-- Type of a sensor that provides a low-power estimate of the desired display
-         brightness, suitable to listen to while the device is asleep (e.g. during
-         always-on display) -->
-    <string name="doze_brightness_sensor_type" translatable="false">com.google.sensor.binned_brightness</string>
-
-    <!-- Doze: can we assume the pickup sensor includes a proximity check? -->
-    <bool name="doze_pickup_performs_proximity_check">true</bool>
-
-    <!-- Doze: whether the double tap sensor reports 2D touch coordinates -->
-    <bool name="doze_double_tap_reports_touch_coordinates">true</bool>
-
-    <!-- Doze: only register sensors that use prox when device is in certain Display states. This
-     may delay registering sensors when device first shows dozing UI but the
-     Display & Power state hasn't changed to low-power mode yet. -->
-    <bool name="doze_selectively_register_prox">true</bool>
-
-    <!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
-               to brightness values; -1 means keeping the current brightness. -->
-    <integer-array name="config_doze_brightness_sensor_to_brightness">
-        <item>-1</item> <!-- 0: OFF -->
-        <item>5</item> <!-- 1: NIGHT -->
-        <item>5</item> <!-- 2: LOW -->
-        <item>16</item> <!-- 3: HIGH -->
-        <item>16</item> <!-- 4: SUN -->
-    </integer-array>
-
-    <!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
-               to an opacity value for a black scrim that is overlaid in AOD1.
-               Valid range is from 0 (transparent) to 255 (opaque).
-               -1 means keeping the current opacity. -->
-    <integer-array name="config_doze_brightness_sensor_to_scrim_opacity">
-        <item>-1</item> <!-- 0: OFF -->
-        <item>133</item> <!-- 1: NIGHT -->
-        <item>0</item> <!-- 2: LOW -->
-        <item>0</item> <!-- 3: HIGH -->
-        <item>0</item> <!-- 4: SUN -->
-    </integer-array>
-
     <bool name="config_roundedCornerMultipleRadius">true</bool>
 
     <!-- Configure 13px of extra protection around the front-facing camera -->

panther/overlay/frameworks/base/packages/SystemUI/res/values/config.xml

@@ -20,45 +20,6 @@
 <!-- These resources are around just to allow their values to be customized
      for different hardware and product builds. -->
 <resources>
-    <!-- Type of a sensor that provides a low-power estimate of the desired display
-         brightness, suitable to listen to while the device is asleep (e.g. during
-         always-on display) -->
-    <string name="doze_brightness_sensor_type" translatable="false">com.google.sensor.binned_brightness</string>
-
-    <!-- Doze: can we assume the pickup sensor includes a proximity check? -->
-    <bool name="doze_pickup_performs_proximity_check">true</bool>
-
-    <!-- Doze: whether the double tap sensor reports 2D touch coordinates -->
-    <bool name="doze_double_tap_reports_touch_coordinates">true</bool>
-
-    <!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
-               to brightness values; -1 means keeping the current brightness. -->
-    <integer-array name="config_doze_brightness_sensor_to_brightness">
-        <item>-1</item> <!-- 0: OFF -->
-        <item>3</item> <!-- 1: NIGHT -->
-        <item>3</item> <!-- 2: LOW -->
-        <item>16</item> <!-- 3: HIGH -->
-        <item>16</item> <!-- 4: SUN -->
-    </integer-array>
-
-    <!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
-               to an opacity value for a black scrim that is overlaid in AOD1.
-               Valid range is from 0 (transparent) to 255 (opaque).
-               -1 means keeping the current opacity. -->
-    <integer-array name="config_doze_brightness_sensor_to_scrim_opacity">
-        <item>-1</item> <!-- 0: OFF -->
-        <item>133</item> <!-- 1: NIGHT -->
-        <item>0</item> <!-- 2: LOW -->
-        <item>0</item> <!-- 3: HIGH -->
-        <item>0</item> <!-- 4: SUN -->
-    </integer-array>
-
-    <string name="proximity_sensor_type" translatable="false"></string>
-    <item name="proximity_sensor_threshold" translatable="false" format="float" type="dimen"></item>
-    <item name="proximity_sensor_threshold_latch" translatable="false" format="float" type="dimen"></item>
-    <string name="proximity_sensor_secondary_type" translatable="false"></string>
-    <item name="proximity_sensor_secondary_threshold" translatable="false" format="float" type="dimen"></item>
-
     <!-- Default rounded corner curve (a Bezier). Must match (the curved path in) rounded.xml.
          Note that while rounded.xml includes the entire path (including the horizontal and vertical
          corner edges), this pulls out just the curve.