bugfix: Compilation fails because of merge

Tencent · Aug 2, 2018 · f579f52 · f579f52
1 parent 9f977ec
commit f579f52
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 24 deletions.
diff --git a/qmui/src/main/java/com/qmuiteam/qmui/widget/QMUIAppBarLayout.java b/qmui/src/main/java/com/qmuiteam/qmui/widget/QMUIAppBarLayout.java
@@ -76,9 +76,4 @@ public int getSystemWindowInsetTop() {
     public boolean applySystemWindowInsets21(Object insets) {
         return true;
     }
-
-    @Override
-    public boolean applySystemWindowInsets(WindowInsets insets) {
-        return true;
-    }
 }
diff --git a/qmui/src/main/java/com/qmuiteam/qmui/widget/QMUICollapsingTopBarLayout.java b/qmui/src/main/java/com/qmuiteam/qmui/widget/QMUICollapsingTopBarLayout.java
@@ -1068,11 +1068,6 @@ public boolean applySystemWindowInsets21(Object insets) {
         return true;
     }
 
-    @Override
-    public boolean applySystemWindowInsets(WindowInsets insets) {
-        return true;
-    }
-
     public static class LayoutParams extends FrameLayout.LayoutParams {
 
         private static final float DEFAULT_PARALLAX_MULTIPLIER = 0.5f;

diff --git a/qmui/src/main/java/com/qmuiteam/qmui/widget/QMUINotchConsumeLayout.java b/qmui/src/main/java/com/qmuiteam/qmui/widget/QMUINotchConsumeLayout.java
@@ -38,12 +38,13 @@ protected void onConfigurationChanged(Configuration newConfig) {
     }
 
     @Override
-    public void notifyInsetMaybeChanged() {
+    public boolean notifyInsetMaybeChanged() {
         setPadding(
                 QMUINotchHelper.getSafeInsetLeft(this),
                 QMUINotchHelper.getSafeInsetTop(this),
                 QMUINotchHelper.getSafeInsetRight(this),
                 QMUINotchHelper.getSafeInsetBottom(this)
         );
+        return true;
     }
 }
diff --git a/qmui/src/main/java/com/qmuiteam/qmui/widget/QMUIViewPager.java b/qmui/src/main/java/com/qmuiteam/qmui/widget/QMUIViewPager.java
@@ -108,11 +108,6 @@ public boolean applySystemWindowInsets21(Object insets) {
         return mQMUIWindowInsetHelper.defaultApplySystemWindowInsets21(this, insets);
     }
 
-    @Override
-    public boolean applySystemWindowInsets(WindowInsets insets) {
-        return mQMUIWindowInsetHelper.defaultApplySystemWindowInsets(this, insets);
-    }
-
     @Override
     public void setAdapter(PagerAdapter adapter) {
         if (adapter instanceof QMUIPagerAdapter) {

diff --git a/qmui/src/main/java/com/qmuiteam/qmui/widget/QMUIWindowInsetLayout.java b/qmui/src/main/java/com/qmuiteam/qmui/widget/QMUIWindowInsetLayout.java
@@ -1,13 +1,10 @@
 package com.qmuiteam.qmui.widget;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Rect;
 import android.os.Build;
 import android.support.v4.view.ViewCompat;
-import android.support.v4.view.WindowInsetsCompat;
 import android.util.AttributeSet;
-import android.view.WindowInsets;
 import android.widget.FrameLayout;
 
 import com.qmuiteam.qmui.util.QMUIWindowInsetHelper;
@@ -59,11 +56,6 @@ public boolean applySystemWindowInsets21(Object insets) {
         return mQMUIWindowInsetHelper.defaultApplySystemWindowInsets21(this, insets);
     }
 
-    @Override
-    public boolean applySystemWindowInsets(WindowInsets insets) {
-        return mQMUIWindowInsetHelper.defaultApplySystemWindowInsets(this, insets);
-    }
-
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();