Merge "Calculate taskbar content size for edu" into tm-qpr-dev (b1d991b3) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/taskbar/TaskbarEduController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -219,7 +219,7 @@ public class TaskbarEduController implements TaskbarControllers.LoggableTaskbarC
		}

		int getIconLayoutBoundsWidth() {
		return mControllers.taskbarViewController.getIconLayoutBounds().width();
		return mControllers.taskbarViewController.getIconLayoutWidth();
		}
		}
		}

+13 −5

Original line number	Diff line number	Diff line
		@@ -293,12 +293,8 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
		@Override
		protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
		int count = getChildCount();
		int countExcludingQsb = count;
		DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
		if (deviceProfile.isQsbInline) {
		countExcludingQsb--;
		}
		int spaceNeeded = countExcludingQsb * (mItemMarginLeftRight * 2 + mIconTouchSize);
		int spaceNeeded = getIconLayoutWidth();
		int navSpaceNeeded = deviceProfile.hotseatBarEndOffset;
		boolean layoutRtl = isLayoutRtl();
		int iconEnd = right - (right - left - spaceNeeded) / 2;
		@@ -388,6 +384,18 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
		return mIconLayoutBounds;
		}

		/**
		* Returns the space used by the icons
		*/
		public int getIconLayoutWidth() {
		int countExcludingQsb = getChildCount();
		DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
		if (deviceProfile.isQsbInline) {
		countExcludingQsb--;
		}
		return countExcludingQsb * (mItemMarginLeftRight * 2 + mIconTouchSize);
		}

		/**
		* Returns the app icons currently shown in the taskbar.
		*/

+4 −0

Original line number	Diff line number	Diff line
		@@ -199,6 +199,10 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
		return mTaskbarView.getIconLayoutBounds();
		}

		public int getIconLayoutWidth() {
		return mTaskbarView.getIconLayoutWidth();
		}

		public View[] getIconViews() {
		return mTaskbarView.getIconViews();
		}