commit 4da15639c351eb98462553a85425d27a2c5505fe
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 09 13:55:18 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 09 13:55:18 2017 +0000
tree 73f37c68bebcf5d56024463f304fd678ac41016d
parent 8230198af081491b4d140d9ee866ae928828bc6c
parent f4085ff7cc56228825894e417b1165a235361a39

Merge "Import translations. DO NOT MERGE" into ub-launcher3-dorval-polish2

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