diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-03 19:32:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-02-03 19:32:02 +0000 |
| commit | 0e0498031092488ff166145c12ce36cc0a80c490 (patch) | |
| tree | 2e9ed8e4e8eb9edf32cddfe6e06f1d5971f5a04f /src/com/android/launcher3 | |
| parent | 2113c9d6643a4934ed22da675cf445e464f898c2 (diff) | |
| parent | 5c556e7226d0c78b9e2747891bea5e64c1ca20df (diff) | |
| download | android_packages_apps_Trebuchet-0e0498031092488ff166145c12ce36cc0a80c490.tar.gz android_packages_apps_Trebuchet-0e0498031092488ff166145c12ce36cc0a80c490.tar.bz2 android_packages_apps_Trebuchet-0e0498031092488ff166145c12ce36cc0a80c490.zip | |
Merge "Updating folder UI when icons are normalized > Increasing padding > Making the folder label bold and lighter color" into ub-launcher3-burnaby-polish
Diffstat (limited to 'src/com/android/launcher3')
| -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 9cc94ae75..471c324fe 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -57,6 +57,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.util.Thunk; import com.android.launcher3.util.UiThreadCircularReveal; @@ -421,7 +422,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); } /** |