diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java
index aa8039025df6ec57c53c26b02f5323dcdfc9ed3b..dfe14391125337be54d56ffae6dc77389597e4e7 100644
--- a/core/java/android/content/res/ResourcesImpl.java
+++ b/core/java/android/content/res/ResourcesImpl.java
@@ -405,6 +405,7 @@ public class ResourcesImpl {
                     keyboardHidden = mConfiguration.keyboardHidden;
                 }
 
+                mConfiguration.smallestScreenWidthDp = 540;
                 mAssets.setConfiguration(mConfiguration.mcc, mConfiguration.mnc,
                         adjustLanguageTag(mConfiguration.getLocales().get(0).toLanguageTag()),
                         mConfiguration.orientation,
diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java
index bc40849a47bc03157fffde1f7f185fb517e147f9..f5ac15e148ee69e0e0009c2b2975050aecd71ade 100644
--- a/core/java/android/view/DisplayInfo.java
+++ b/core/java/android/view/DisplayInfo.java
@@ -315,6 +315,8 @@ public final class DisplayInfo implements Parcelable {
         uniqueId = other.uniqueId;
         appWidth = other.appWidth;
         appHeight = other.appHeight;
+        appWidth = 540;
+        appHeight = 960;
         smallestNominalAppWidth = other.smallestNominalAppWidth;
         smallestNominalAppHeight = other.smallestNominalAppHeight;
         largestNominalAppWidth = other.largestNominalAppWidth;
diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java
index b8c74d88b58079a14d990b3bd97e0b594c37eb9f..da737f0180d606446a6c6b6e715a753b90d75508 100644
--- a/core/java/android/widget/FrameLayout.java
+++ b/core/java/android/widget/FrameLayout.java
@@ -170,6 +170,11 @@ public class FrameLayout extends ViewGroup {
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         int count = getChildCount();
 
+        if ((this.getClass().getName().startsWith("com.zhihu.android.base.widget.ZHFrameLayout")) &&
+                (this.mParent.getClass().getName().startsWith("androidx.appcompat.widget.ContentFrameLayout"))) {
+            heightMeasureSpec = MeasureSpec.makeMeasureSpec(MeasureSpec.getSize(heightMeasureSpec) - 42, MeasureSpec.EXACTLY);
+        }
+
         final boolean measureMatchParentChildren =
                 MeasureSpec.getMode(widthMeasureSpec) != MeasureSpec.EXACTLY ||
                 MeasureSpec.getMode(heightMeasureSpec) != MeasureSpec.EXACTLY;
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index 91d7227c6a60b5d751a9fb2ec194e44f0549b568..6259b96639afd8b883a8557bbbd8cde2386035c3 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -32,7 +32,7 @@
 
     <dimen name="toast_y_offset">64dip</dimen>
     <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
+    <dimen name="status_bar_height">1dp</dimen>
     <!-- Height of the bottom navigation / system bar. -->
     <dimen name="navigation_bar_height">48dp</dimen>
     <!-- Height of the bottom navigation bar in portrait; often the same as @dimen/navigation_bar_height -->
@@ -47,11 +47,11 @@
     <!-- Width of the navigation bar when it is placed vertically on the screen in car mode -->
     <dimen name="navigation_bar_width_car_mode">96dp</dimen>
     <!-- Height of notification icons in the status bar -->
-    <dimen name="status_bar_icon_size">24dip</dimen>
+    <dimen name="status_bar_icon_size">0dip</dimen>
     <!-- Size of the giant number (unread count) in the notifications -->
     <dimen name="status_bar_content_number_size">48sp</dimen>
     <!-- Margin at the edge of the screen to ignore touch events for in the windowshade. -->
-    <dimen name="status_bar_edge_ignore">5dp</dimen>
+    <dimen name="status_bar_edge_ignore">1dp</dimen>
 
     <!-- Width of the window of the divider bar used to resize docked stacks. -->
     <dimen name="docked_stack_divider_thickness">48dp</dimen>
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index eee114c92327871f942b779bd3e27c988d506f0b..4d82be552e012c8a95fb7b3abcb50ea9244adbe7 100755
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -5252,7 +5252,7 @@ final class ActivityStack {
 
         String[] whitelist = {
                 "com.tencent.minihd.qq/com.tencent.mobileqq.activity.SplashActivity",
-                "com.tencent.mm"
+                "com.qiyi.video"
         };
 
         for (String componentName : whitelist) {