diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-03 11:41:36 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-02-03 11:41:36 -0800 |
| commit | bda3ff8f20b30412d8e7c6d3a48a26078e66d6b2 (patch) | |
| tree | 6000309e49b8319b1760c7bf7934db97ef20ff9a /src/com | |
| parent | 3c4906949f9d7a978caa5ffe9dfe8e6e153876ef (diff) | |
| parent | 0e0498031092488ff166145c12ce36cc0a80c490 (diff) | |
| download | android_packages_apps_Trebuchet-bda3ff8f20b30412d8e7c6d3a48a26078e66d6b2.tar.gz android_packages_apps_Trebuchet-bda3ff8f20b30412d8e7c6d3a48a26078e66d6b2.tar.bz2 android_packages_apps_Trebuchet-bda3ff8f20b30412d8e7c6d3a48a26078e66d6b2.zip | |
resolve merge conflicts of 0e04980310 to ub-launcher3-calgary.
Change-Id: Ic4526dfc388590aa0288936d827f19060922529f
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index abb9f3d92..5f080aa41 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -56,6 +56,7 @@ import com.android.launcher3.FolderInfo.FolderListener; import com.android.launcher3.UninstallDropTarget.UninstallSource; import com.android.launcher3.Workspace.ItemOperator; import com.android.launcher3.accessibility.LauncherAccessibilityDelegate.AccessibilityDragSource; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dragndrop.DragController; import com.android.launcher3.dragndrop.DragController.DragListener; import com.android.launcher3.dragndrop.DragLayer; @@ -439,7 +440,9 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList */ @SuppressLint("InflateParams") static Folder fromXml(Launcher launcher) { - return (Folder) launcher.getLayoutInflater().inflate(R.layout.user_folder, null); + return (Folder) launcher.getLayoutInflater().inflate( + FeatureFlags.LAUNCHER3_ICON_NORMALIZATION + ? R.layout.user_folder_icon_normalized : R.layout.user_folder, null); } /** |