Remove ENABLE_OVERVIEW_GRID feature flag
- Use isTablet directly instead of overviewShowAsGrid - Tablet/landscape resoruces can now be overriden via xml - Use Landscape resources in tablet in additional to vertical bar layout - For resources overwritten in values-land that was intended for vertical bar layout, override them in sw600dp for tablet landscape Bug: 210597891 Test: manual Change-Id: I19eac935a5fb1a420485408aa8b4774632726af1
This commit is contained in:
@@ -1322,7 +1322,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
||||
* required to focus the task in grid.
|
||||
*/
|
||||
public void moveFocusedTaskToFront() {
|
||||
if (!mActivity.getDeviceProfile().overviewShowAsGrid) {
|
||||
if (!mActivity.getDeviceProfile().isTablet) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1795,7 +1795,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
||||
|
||||
@Override
|
||||
protected int getDestinationPage(int scaledScroll) {
|
||||
if (!mActivity.getDeviceProfile().overviewShowAsGrid) {
|
||||
if (!mActivity.getDeviceProfile().isTablet) {
|
||||
return super.getDestinationPage(scaledScroll);
|
||||
}
|
||||
|
||||
@@ -3264,7 +3264,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
||||
return;
|
||||
}
|
||||
mActionsView.setSplitButtonVisible(
|
||||
mActivity.getDeviceProfile().overviewShowAsGrid && getTaskViewCount() > 1);
|
||||
mActivity.getDeviceProfile().isTablet && getTaskViewCount() > 1);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -3986,7 +3986,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
||||
if (mSplitHiddenTaskViewIndex == -1) {
|
||||
return;
|
||||
}
|
||||
if (!mActivity.getDeviceProfile().overviewShowAsGrid) {
|
||||
if (!mActivity.getDeviceProfile().isTablet) {
|
||||
int pageToSnapTo = mCurrentPage;
|
||||
if (mSplitHiddenTaskViewIndex <= pageToSnapTo) {
|
||||
pageToSnapTo += 1;
|
||||
|
||||
Reference in New Issue
Block a user