PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Merge "Removes instant apps from certain screens" into oc-dev am: 1c956b304a"

Browse Source 
This reverts commit d7da58ade5, reversing
changes made to 6d539dc7a4.

Bad automerge of an already-present patch caused a duplicate definition
of LIST_TYPES_WITH_INSTANT.

Test: none
Change-Id: I98e74d1c0db739dd425c945652251a1050d26c63
This commit is contained in:
Colin Cross
2017-04-04 13:20:43 -07:00
parent 7ca25cf04e
commit cdd5863e2d
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/applications/ManageApplications.java
View File

@@ -259,12 +259,6 @@ public class ManageApplications extends InstrumentedPreferenceFragment
public static final int LIST_TYPE_MOVIES = 10; public static final int LIST_TYPE_MOVIES = 10;
// List types that should show instant apps.
public static final Set<Integer> LIST_TYPES_WITH_INSTANT = new ArraySet<>(Arrays.asList(
LIST_TYPE_MAIN,
LIST_TYPE_STORAGE));
// List types that should show instant apps. // List types that should show instant apps.
public static final Set<Integer> LIST_TYPES_WITH_INSTANT = new ArraySet<>(Arrays.asList( public static final Set<Integer> LIST_TYPES_WITH_INSTANT = new ArraySet<>(Arrays.asList(
LIST_TYPE_MAIN, LIST_TYPE_MAIN,