diff options
author | Winson Chung <winsonc@google.com> | 2015-05-20 15:03:13 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2015-05-21 00:37:50 +0000 |
commit | c393b0765df8d2d34b3b996b71700a705b7d0106 (patch) | |
tree | a082b4b71c6eadb86009a11c6c27c88bc572a783 /src/com/android/launcher3/Hotseat.java | |
parent | db092a331ceb9b6cc72fd9b1a593cd77068bb66a (diff) | |
download | android_packages_apps_Trebuchet-c393b0765df8d2d34b3b996b71700a705b7d0106.tar.gz android_packages_apps_Trebuchet-c393b0765df8d2d34b3b996b71700a705b7d0106.tar.bz2 android_packages_apps_Trebuchet-c393b0765df8d2d34b3b996b71700a705b7d0106.zip |
Fixing issue where the prediction bar apps are not focused.
- Also fixes issue where all apps is not accessible by keyboard
when there are no other apps in the hotseat.
Bug: 21334471
Diffstat (limited to 'src/com/android/launcher3/Hotseat.java')
-rw-r--r-- | src/com/android/launcher3/Hotseat.java | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java index b614bc628..b8337b6a4 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -65,6 +65,13 @@ public class Hotseat extends FrameLayout { } /** + * Returns whether there are other icons than the all apps button in the hotseat. + */ + public boolean hasIcons() { + return mContent.getShortcutsAndWidgets().getChildCount() > 1; + } + + /** * Registers the specified listener on the cell layout of the hotseat. */ @Override @@ -98,25 +105,6 @@ public class Hotseat extends FrameLayout { return rank == mAllAppsButtonRank; } - /** This returns the coordinates of an app in a given cell, relative to the DragLayer */ - Rect getCellCoordinates(int cellX, int cellY) { - Rect coords = new Rect(); - mContent.cellToRect(cellX, cellY, 1, 1, coords); - int[] hotseatInParent = new int[2]; - Utilities.getDescendantCoordRelativeToParent(this, mLauncher.getDragLayer(), - hotseatInParent, false); - coords.offset(hotseatInParent[0], hotseatInParent[1]); - - // Center the icon - int cWidth = mContent.getShortcutsAndWidgets().getCellContentWidth(); - int cHeight = mContent.getShortcutsAndWidgets().getCellContentHeight(); - int cellPaddingX = (int) Math.max(0, ((coords.width() - cWidth) / 2f)); - int cellPaddingY = (int) Math.max(0, ((coords.height() - cHeight) / 2f)); - coords.offset(cellPaddingX, cellPaddingY); - - return coords; - } - @Override protected void onFinishInflate() { super.onFinishInflate(); |