From cdd5863e2dc10fc434ba8709f0696e8a64870aa9 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 4 Apr 2017 13:20:43 -0700 Subject: [PATCH] Revert "Merge "Removes instant apps from certain screens" into oc-dev am: 1c956b304a" This reverts commit d7da58ade5eebc2ec664abb0afc7a8cd5e79b75d, reversing changes made to 6d539dc7a474586a8c2ebfbc56284925e1e37a70. Bad automerge of an already-present patch caused a duplicate definition of LIST_TYPES_WITH_INSTANT. Test: none Change-Id: I98e74d1c0db739dd425c945652251a1050d26c63 --- .../android/settings/applications/ManageApplications.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index 5f6c7c61b13..594786ee178 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -259,12 +259,6 @@ public class ManageApplications extends InstrumentedPreferenceFragment public static final int LIST_TYPE_MOVIES = 10; - // List types that should show instant apps. - public static final Set LIST_TYPES_WITH_INSTANT = new ArraySet<>(Arrays.asList( - LIST_TYPE_MAIN, - LIST_TYPE_STORAGE)); - - // List types that should show instant apps. public static final Set LIST_TYPES_WITH_INSTANT = new ArraySet<>(Arrays.asList( LIST_TYPE_MAIN,