PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Updating the folder cell dimensions to be closer to a square" into ub-launcher3-calgary-polish

Browse Source
This commit is contained in:
Sunny Goyal
2016-10-10 20:37:51 +00:00
committed by Android (Google) Code Review
parent 215a2ea0e1 68f240eb54
commit 327f7b7125
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/layout/user_folder.xml
+5 -5
View File
@@ -26,9 +26,9 @@
android:id="@+id/folder_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:paddingTop="4dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="6dp"
launcher:pageIndicator="@+id/folder_page_indicator" />
<LinearLayout
@@ -51,8 +51,8 @@
android:gravity="center_horizontal"
android:hint="@string/folder_hint_text"
android:imeOptions="flagNoExtractUi"
android:paddingBottom="@dimen/folder_label_padding"
android:paddingTop="@dimen/folder_label_padding"
android:paddingBottom="@dimen/folder_label_padding_bottom"
android:paddingTop="@dimen/folder_label_padding_top"
android:singleLine="true"
android:textColor="#ff777777"
android:includeFontPadding="false"
res/layout/user_folder_icon_normalized.xml
+5 -5
View File
@@ -26,9 +26,9 @@
android:id="@+id/folder_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:paddingTop="4dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="6dp"
launcher:pageIndicator="@+id/folder_page_indicator" />
<LinearLayout
@@ -52,8 +52,8 @@
android:gravity="center_horizontal"
android:hint="@string/folder_hint_text"
android:imeOptions="flagNoExtractUi"
android:paddingBottom="@dimen/folder_label_padding"
android:paddingTop="@dimen/folder_label_padding"
android:paddingBottom="@dimen/folder_label_padding_bottom"
android:paddingTop="@dimen/folder_label_padding_top"
android:singleLine="true"
android:textColor="#EE777777"
android:textColorHighlight="#ffCCCCCC"
res/values/dimens.xml
+3 -2
View File
@@ -138,9 +138,10 @@
<dimen name="page_indicator_dot_size">8dp</dimen>
<dimen name="folder_cell_x_padding">9dp</dimen>
<dimen name="folder_cell_y_padding">8dp</dimen>
<dimen name="folder_cell_y_padding">6dp</dimen>
<dimen name="folder_child_text_size">13sp</dimen>
<dimen name="folder_label_padding">12dp</dimen>
<dimen name="folder_label_padding_top">4dp</dimen>
<dimen name="folder_label_padding_bottom">12dp</dimen>
<dimen name="folder_label_text_size">14sp</dimen>
<!-- Sizes for managed profile badges -->
src/com/android/launcher3/DeviceProfile.java
+2 -1
View File
@@ -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.