commit 0d34cdf0d9f18591fe9c6276bb2788f694eb74a1
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 54d79635b0fd03fed56ce844d212d875bce2583b
parent 463b04cfe159b0550adb2e2218ab79600c6badb5
parent 33e29c8a7531fed0d83534bbaa5176bd4390aadb

Merge changes from topic 'public-methods' into ub-launcher3-master

* changes:
  [automerger] Making some methods accessible am: 0b754e564b
  Making some methods accessible

src/com/android/launcher3/CellLayout.java

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;
     }
 

src/com/android/launcher3/ShortcutAndWidgetContainer.java

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));
     }