diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-12-12 20:45:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-12 20:45:17 +0000 |
| commit | 776ca257cefcf2a94e06bf89df6267c945708afe (patch) | |
| tree | cac47db17673d314669327d41ec8baabdcc6baba /src/com/android/launcher3/Hotseat.java | |
| parent | 177bb5a9ba7c94a0ba5bfca842b2abf883b02bb7 (diff) | |
| parent | c13403c612748bfdf06436510600230c4c4b55ec (diff) | |
| download | android_packages_apps_Trebuchet-776ca257cefcf2a94e06bf89df6267c945708afe.tar.gz android_packages_apps_Trebuchet-776ca257cefcf2a94e06bf89df6267c945708afe.tar.bz2 android_packages_apps_Trebuchet-776ca257cefcf2a94e06bf89df6267c945708afe.zip | |
Merge "Defining various modes for CellLayout: Workspace, Hotseat & Folder" into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/Hotseat.java')
| -rw-r--r-- | src/com/android/launcher3/Hotseat.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java index 5c96dde43..2c9ebba4b 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -113,12 +113,11 @@ public class Hotseat extends FrameLayout super.onFinishInflate(); DeviceProfile grid = mLauncher.getDeviceProfile(); mContent = (CellLayout) findViewById(R.id.layout); - if (grid.isLandscape && !grid.isLargeTablet) { - mContent.setGridSize(1, (int) grid.inv.numHotseatIcons); + if (grid.isVerticalBarLayout()) { + mContent.setGridSize(1, grid.inv.numHotseatIcons); } else { - mContent.setGridSize((int) grid.inv.numHotseatIcons, 1); + mContent.setGridSize(grid.inv.numHotseatIcons, 1); } - mContent.setIsHotseat(true); resetLayout(); } |