resolved conflicts for merge of bc3699b1 to lmp-dev

Change-Id: I1b219b5b48afb08ce3704a4f064a85652d2d9339

diff --cc core/res/res/values/config.xml
Simple merge

diff --cc core/res/res/values/dimens.xml
index 77b115b,40ff7c6..afe180f
--- 1/core/res/res/values/dimens.xml
--- 2/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@@ -383,5 -361,8 +383,10 @@@
      <!-- width of ImmersiveModeConfirmation (-1 for match_parent) -->
      <dimen name="immersive_mode_cling_width">-1px</dimen>
  
 +    <dimen name="resolver_max_width">480dp</dimen>
++
+      <!-- Size of the offset applied to the position of the circular mask. This is only
+      used on circular displays. In the case where there is no "chin", this will default
+      to 0 -->
+      <dimen name="circular_display_mask_offset">0px</dimen>
  </resources>

diff --cc core/res/res/values/symbols.xml
index 9f627b4,e4e4583..e9b9889
--- 1/core/res/res/values/symbols.xml
--- 2/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@@ -285,13 -290,10 +285,14 @@@
    <java-symbol type="bool" name="config_useFixedVolume" />
    <java-symbol type="bool" name="config_forceDefaultOrientation" />
    <java-symbol type="bool" name="config_wifi_batched_scan_supported" />
 +  <java-symbol type="bool" name="config_enableMultiUserUI"/>
 +  <java-symbol type="bool" name="config_disableUsbPermissionDialogs"/>
    <java-symbol type="bool" name="config_windowIsRound" />
    <java-symbol type="bool" name="config_hasRecents" />
+   <java-symbol type="bool" name="config_windowShowCircularMask" />
  
 +  <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_cursorWindowSize" />
    <java-symbol type="integer" name="config_extraFreeKbytesAdjust" />
    <java-symbol type="integer" name="config_extraFreeKbytesAbsolute" />

diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
index eac2819,2978baa..170ecbd
--- 1/services/core/java/com/android/server/wm/WindowManagerService.java
--- 2/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@@ -7246,12 -7204,11 +7287,14 @@@ public class WindowManagerService exten
          public static final int TAP_OUTSIDE_STACK = 31;
          public static final int NOTIFY_ACTIVITY_DRAWN = 32;
  
 -        public static final int REMOVE_STARTING_TIMEOUT = 33;
 +        public static final int ALL_WINDOWS_DRAWN = 33;
  
 -        public static final int SHOW_DISPLAY_MASK = 34;
 -        public static final int ALL_WINDOWS_DRAWN = 35;
 +        public static final int NEW_ANIMATOR_SCALE = 34;
 +
 +        public static final int UPDATE_SCRN_CAP = 35;
 +
++        public static final int SHOW_DISPLAY_MASK = 36;
+ 
          @Override
          public void handleMessage(Message msg) {
              if (DEBUG_WINDOW_TRACE) {