Merge "Set status bar icons to dark at correct all apps progress" into ub-launcher3-edmonton
This commit is contained in:
commit
2c27df5b5d
|
@ -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
|
// Use a light system UI (dark icons) if all apps is behind at least half of the
|
||||||
// status bar.
|
// status bar.
|
||||||
boolean forceChange = shiftCurrent <= mShiftRange / 4;
|
boolean forceChange = shiftCurrent - mScrimView.getDragHandleSize()
|
||||||
|
<= mLauncher.getDeviceProfile().getInsets().top / 2;
|
||||||
if (forceChange) {
|
if (forceChange) {
|
||||||
mLauncher.getSystemUiController().updateUiState(UI_STATE_ALL_APPS, !mIsDarkTheme);
|
mLauncher.getSystemUiController().updateUiState(UI_STATE_ALL_APPS, !mIsDarkTheme);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -397,4 +397,8 @@ public class ScrimView extends View implements Insettable, OnChangeListener,
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getDragHandleSize() {
|
||||||
|
return mDragHandleSize;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue