Merge changes from topic "am-59fbdea6-e248-4df4-b415-7c55d22b5921" into ub-launcher3-master

* changes:
  [automerger] Set status bar icons to dark at correct all apps progress am: ec62522682
  Set status bar icons to dark at correct all apps progress

src/com/android/launcher3/allapps/AllAppsTransitionController.java

@@ -128,7 +128,8 @@ public class AllAppsTransitionController implements StateHandler, OnDeviceProfil
 
         // Use a light system UI (dark icons) if all apps is behind at least half of the
         // status bar.
-        boolean forceChange = shiftCurrent <= mShiftRange / 4;
+        boolean forceChange = shiftCurrent - mScrimView.getDragHandleSize()
+                <= mLauncher.getDeviceProfile().getInsets().top / 2;
         if (forceChange) {
             mLauncher.getSystemUiController().updateUiState(UI_STATE_ALL_APPS, !mIsDarkTheme);
         } else {

src/com/android/launcher3/views/ScrimView.java

@@ -397,4 +397,8 @@ public class ScrimView extends View implements Insettable, OnChangeListener,
             return false;
         }
     }
+
+    public int getDragHandleSize() {
+        return mDragHandleSize;
+    }
 }