Merge "Entity header: When screen scrolls, there should be shadow under the header." into pi-dev

2018-03-28 20:12:46 +00:00
parent 8482455df7 4092b2193c
commit 00a2dcb8f9
4 changed files with 94 additions and 26 deletions
--- a/src/com/android/settings/core/BasePreferenceController.java
+++ b/src/com/android/settings/core/BasePreferenceController.java
@@ -72,8 +72,6 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl

    protected final String mPreferenceKey;

-    protected Lifecycle mLifecycle;
-
    /**
     * Instantiate a controller as specified controller type and user-defined key.
     * <p/>