PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Hotseat] Fix hotseat migration in landscape mode" into sc-v2-dev

Browse Source
This commit is contained in:
Samuel Fufa
2021-09-21 06:24:37 +00:00
committed by Android (Google) Code Review
parent 414f17138f ef5ee36e90
commit cf175820c4
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
+7 -4
View File
@@ -15,8 +15,7 @@
*/ */
package com.android.launcher3.hybridhotseat; package com.android.launcher3.hybridhotseat;
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_EDU_ONLY_TIP;
.LAUNCHER_HOTSEAT_EDU_ONLY_TIP;
import android.content.Intent; import android.content.Intent;
import android.view.View; import android.view.View;
@@ -188,8 +187,12 @@ public class HotseatEduController {
.getInt(LauncherSettings.Settings.EXTRA_VALUE); .getInt(LauncherSettings.Settings.EXTRA_VALUE);
mNewScreens = IntArray.wrap(pageId); mNewScreens = IntArray.wrap(pageId);
} }
for (int i = 0; i < mLauncher.getDeviceProfile().numShownHotseatIcons; i++) { boolean isPortrait = !mLauncher.getDeviceProfile().isVerticalBarLayout();
View child = mHotseat.getChildAt(i, 0); int hotseatItemsNum = mLauncher.getDeviceProfile().numShownHotseatIcons;
for (int i = 0; i < hotseatItemsNum; i++) {
int x = isPortrait ? i : 0;
int y = isPortrait ? 0 : hotseatItemsNum - i - 1;
View child = mHotseat.getChildAt(x, y);
if (child == null || child.getTag() == null) continue; if (child == null || child.getTag() == null) continue;
ItemInfo tag = (ItemInfo) child.getTag(); ItemInfo tag = (ItemInfo) child.getTag();
if (tag.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION) continue; if (tag.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION) continue;