diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-10-10 20:37:51 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-10 20:37:51 +0000 |
commit | 327f7b712538f5a4c8488cefb1a2e764674495eb (patch) | |
tree | dffba08b05f4698437b593a3a387c5d99b904235 /src | |
parent | 215a2ea0e1ca84fa2c36802b2b96a522578c933a (diff) | |
parent | 68f240eb54891c264031c644a5e5aa4e4fd0c060 (diff) | |
download | android_packages_apps_Trebuchet-327f7b712538f5a4c8488cefb1a2e764674495eb.tar.gz android_packages_apps_Trebuchet-327f7b712538f5a4c8488cefb1a2e764674495eb.tar.bz2 android_packages_apps_Trebuchet-327f7b712538f5a4c8488cefb1a2e764674495eb.zip |
Merge "Updating the folder cell dimensions to be closer to a square" into ub-launcher3-calgary-polish
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index c4e6ed119..f9f8e80ca 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -284,7 +284,8 @@ public class DeviceProfile { Utilities.calculateTextHeight(res.getDimension(R.dimen.folder_child_text_size)); final int folderBottomPanelSize = - 2 * res.getDimensionPixelSize(R.dimen.folder_label_padding) + res.getDimensionPixelSize(R.dimen.folder_label_padding_top) + + res.getDimensionPixelSize(R.dimen.folder_label_padding_bottom) + Utilities.calculateTextHeight(res.getDimension(R.dimen.folder_label_text_size)); // Don't let the folder get too close to the edges of the screen. |