diff --git a/core/java/com/android/internal/widget/DecorCaptionView.java b/core/java/com/android/internal/widget/DecorCaptionView.java
index 9a7fb610116745136f96025f1b592e1db71a3e47..5206296b80b422e88b5f55b30f5ee6f5fc707d2b 100644
--- a/core/java/com/android/internal/widget/DecorCaptionView.java
+++ b/core/java/com/android/internal/widget/DecorCaptionView.java
@@ -122,7 +122,10 @@ public class DecorCaptionView extends ViewGroup implements View.OnTouchListener,
     static {
         propertyMap = new HashMap<>();
         propertyMap.put("QQ音乐", WindowProperty.HIDE_BACK);
-	propertyMap.put("喜马拉雅", WindowProperty.HIDE_MAXIMIZE);
+<<<<<<< master
+        propertyMap.put("喜马拉雅", WindowProperty.HIDE_MAXIMIZE);
+        propertyMap.put("i深圳", WindowProperty.HIDE_MAXIMIZE);
+>>>>>>> master
     }
 
     public DecorCaptionView(Context context) {