diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-08-09 09:17:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-09 09:17:00 +0000 |
| commit | 8230198af081491b4d140d9ee866ae928828bc6c (patch) | |
| tree | d10dcaad40711a5dffbd4c405b96ec6d15d5da81 | |
| parent | 5be75795986da5229ec07ad8eec6a8cf0f7a19a3 (diff) | |
| parent | 0b754e564b6a5fef535815467464a6abaa84d434 (diff) | |
| download | android_packages_apps_Trebuchet-8230198af081491b4d140d9ee866ae928828bc6c.tar.gz android_packages_apps_Trebuchet-8230198af081491b4d140d9ee866ae928828bc6c.tar.bz2 android_packages_apps_Trebuchet-8230198af081491b4d140d9ee866ae928828bc6c.zip | |
Merge "Making some methods accessible" into ub-launcher3-dorval-polish2
| -rw-r--r-- | src/com/android/launcher3/CellLayout.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/ShortcutAndWidgetContainer.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index aac80052e..3ebccda9e 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -780,7 +780,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { return mCellWidth; } - int getCellHeight() { + public int getCellHeight() { return mCellHeight; } diff --git a/src/com/android/launcher3/ShortcutAndWidgetContainer.java b/src/com/android/launcher3/ShortcutAndWidgetContainer.java index fd708c0fd..a7e68ff14 100644 --- a/src/com/android/launcher3/ShortcutAndWidgetContainer.java +++ b/src/com/android/launcher3/ShortcutAndWidgetContainer.java @@ -101,7 +101,7 @@ public class ShortcutAndWidgetContainer extends ViewGroup { mInvertIfRtl = invert; } - int getCellContentHeight() { + public int getCellContentHeight() { return Math.min(getMeasuredHeight(), mLauncher.getDeviceProfile().getCellHeight(mContainerType)); } |