commit | 8230198af081491b4d140d9ee866ae928828bc6c | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Aug 09 09:17:00 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 09 09:17:00 2017 +0000 |
tree | d10dcaad40711a5dffbd4c405b96ec6d15d5da81 | |
parent | 5be75795986da5229ec07ad8eec6a8cf0f7a19a3 [diff] | |
parent | 0b754e564b6a5fef535815467464a6abaa84d434 [diff] |
Merge "Making some methods accessible" into ub-launcher3-dorval-polish2
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index aac8005..3ebccda 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java
@@ -780,7 +780,7 @@ 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 fd708c0..a7e68ff 100644 --- a/src/com/android/launcher3/ShortcutAndWidgetContainer.java +++ b/src/com/android/launcher3/ShortcutAndWidgetContainer.java
@@ -101,7 +101,7 @@ mInvertIfRtl = invert; } - int getCellContentHeight() { + public int getCellContentHeight() { return Math.min(getMeasuredHeight(), mLauncher.getDeviceProfile().getCellHeight(mContainerType)); }