diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-03-06 16:56:39 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-03-07 09:30:51 -0800 |
commit | 3d706ad70365052e3224fc4f4b0e7d1f5e8abf22 (patch) | |
tree | aad84ca3eddb76da58a7d1cc8ac9ccff84c01393 /src/com/android/launcher3/CellLayout.java | |
parent | 36f5876d01a25f9a8e0a65422ff193cacd35284f (diff) | |
download | android_packages_apps_Trebuchet-3d706ad70365052e3224fc4f4b0e7d1f5e8abf22.tar.gz android_packages_apps_Trebuchet-3d706ad70365052e3224fc4f4b0e7d1f5e8abf22.tar.bz2 android_packages_apps_Trebuchet-3d706ad70365052e3224fc4f4b0e7d1f5e8abf22.zip |
Separating the config and flags in different directories so that
it is easier to override one or the other
Bug: 36001650
Change-Id: I713f4f5dbcf902614ce9f6c7a73bdace7bdf1ea0
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
-rw-r--r-- | src/com/android/launcher3/CellLayout.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 8179dad29..70137aa7c 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -51,7 +51,7 @@ import com.android.launcher3.accessibility.DragAndDropAccessibilityDelegate; import com.android.launcher3.accessibility.FolderAccessibilityHelper; import com.android.launcher3.accessibility.WorkspaceAccessibilityHelper; import com.android.launcher3.anim.PropertyListBuilder; -import com.android.launcher3.config.ProviderConfig; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.graphics.DragPreviewProvider; import com.android.launcher3.util.CellAndSpan; @@ -568,7 +568,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { try { dispatchRestoreInstanceState(states); } catch (IllegalArgumentException ex) { - if (ProviderConfig.IS_DOGFOOD_BUILD) { + if (FeatureFlags.IS_DOGFOOD_BUILD) { throw ex; } // Mismatched viewId / viewType preventing restore. Skip restore on production builds. |