diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-07-28 19:37:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-28 19:37:00 +0000 |
| commit | 5e758cae9a9f4348ab519082e3b54fd3ff70de3c (patch) | |
| tree | 17620279943966538dc6d308a2bb3cf8a9a02326 /src/com/android/launcher3/CellLayout.java | |
| parent | c7860f383b0d33e9d4567a944bbb10a84f49bcf4 (diff) | |
| parent | 6c56c68555dcb3d99b05d5faecd582a1f683cc92 (diff) | |
| download | android_packages_apps_Trebuchet-5e758cae9a9f4348ab519082e3b54fd3ff70de3c.tar.gz android_packages_apps_Trebuchet-5e758cae9a9f4348ab519082e3b54fd3ff70de3c.tar.bz2 android_packages_apps_Trebuchet-5e758cae9a9f4348ab519082e3b54fd3ff70de3c.zip | |
Merge "Changing the dogfood check to a static boolean to better handle proguard optimizations" into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
| -rw-r--r-- | src/com/android/launcher3/CellLayout.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index e96768f39..31e2a7f56 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -54,6 +54,7 @@ import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.accessibility.DragAndDropAccessibilityDelegate; import com.android.launcher3.accessibility.FolderAccessibilityHelper; import com.android.launcher3.accessibility.WorkspaceAccessibilityHelper; +import com.android.launcher3.config.ProviderConfig; import com.android.launcher3.util.Thunk; import com.android.launcher3.widget.PendingAddWidgetInfo; @@ -564,7 +565,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { try { dispatchRestoreInstanceState(states); } catch (IllegalArgumentException ex) { - if (LauncherAppState.isDogfoodBuild()) { + if (ProviderConfig.IS_DOGFOOD_BUILD) { throw ex; } // Mismatched viewId / viewType preventing restore. Skip restore on production builds. |