Merge "WM: Split portrait and landscape status bar size"

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

diff --cc core/res/res/values/symbols.xml
index 47abd04,1055471..3b96861
--- 1/core/res/res/values/symbols.xml
--- 2/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@@ -3239,12 -3233,10 +3239,15 @@@
    <java-symbol type="string" name="unsupported_compile_sdk_check_update" />
  
    <java-symbol type="string" name="battery_saver_warning_title" />
 +  <java-symbol type="string" name="keyguard_accessibility_pattern_unlock" />
 +  <java-symbol type="string" name="keyguard_accessibility_pin_unlock" />
 +  <java-symbol type="string" name="keyguard_accessibility_sim_pin_unlock" />
 +  <java-symbol type="string" name="keyguard_accessibility_sim_puk_unlock" />
 +  <java-symbol type="string" name="keyguard_accessibility_password_unlock" />
  
+   <java-symbol type="dimen" name="status_bar_height_portrait" />
+   <java-symbol type="dimen" name="status_bar_height_landscape" />
+ 
    <java-symbol type="string" name="global_action_logout" />
    <java-symbol type="string" name="config_mainBuiltInDisplayCutout" />
    <java-symbol type="drawable" name="messaging_user" />

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge

diff --cc services/core/java/com/android/server/policy/PhoneWindowManager.java
Simple merge