commit | 33e29c8a7531fed0d83534bbaa5176bd4390aadb | [log] [tgz] |
---|---|---|
author | Sunny Goyal <sunnygoyal@google.com> | Mon Aug 07 14:43:49 2017 +0000 |
committer | Sunny Goyal <sunnygoyal@google.com> | Mon Aug 07 14:43:49 2017 +0000 |
tree | e0ebebaddcf164e3519106553f92cad6705b8f58 | |
parent | c1c54a9a18b89d0e34fdeece7ff7cba4f40d5c96 [diff] | |
parent | 0b754e564b6a5fef535815467464a6abaa84d434 [diff] |
[automerger] Making some methods accessible am: 0b754e564b Change-Id: I247430dc5eaebed47b03d0e881d97fb3d7131a27
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)); }