Sunny Goyal c268148f06 resolved conflicts for merge of 9fc953b9 to ub-launcher3-master ...

Change-Id: Ia3e845a2e336c846cceefdc2d1e8c6786753f1b1

2015-08-17 14:43:41 -07:00

..

AlphabeticIndexCompat.java

Removing boot receiver.

2015-07-16 15:17:57 -07:00

AppWidgetManagerCompat.java

Version code cleanup

2015-08-17 13:26:01 -07:00

AppWidgetManagerCompatV16.java

Version code cleanup

2015-08-17 13:26:01 -07:00

AppWidgetManagerCompatVL.java

Work profile badge alignment

2015-06-15 12:26:54 -07:00

LauncherActivityInfoCompat.java

Deduping shortcuts to app-shortcuts if they have a valid intent

2015-04-10 19:01:32 -07:00

LauncherActivityInfoCompatV16.java

Use ResolveInfo for label and icon for LauncherActivityInfo

2015-02-11 11:53:44 -08:00

LauncherActivityInfoCompatVL.java

Various lint error fixes.

2015-05-14 12:28:07 -07:00

LauncherAppsCompat.java

Version code cleanup

2015-08-17 13:26:01 -07:00

LauncherAppsCompatV16.java

Version code cleanup

2015-08-17 13:26:01 -07:00

LauncherAppsCompatVL.java

Deleting empty folders based on DB state

2015-06-12 12:38:16 -07:00

PackageInstallerCompat.java

Version code cleanup

2015-08-17 13:26:01 -07:00

PackageInstallerCompatV16.java

Fixing missing updates in package install sessions

2015-04-22 10:08:14 -07:00

PackageInstallerCompatVL.java

Various lint error fixes.

2015-05-14 12:28:07 -07:00

UserHandleCompat.java

Version code cleanup

2015-08-17 13:26:01 -07:00

UserManagerCompat.java

Version code cleanup

2015-08-17 13:26:01 -07:00

UserManagerCompatV16.java

Creating a cache of users to avoid multiple calls to UserManager

2015-08-04 12:37:05 -07:00

UserManagerCompatV17.java

Using a reverse hashmap instead of indexOfValue in userManager

2015-08-05 13:23:25 -07:00

UserManagerCompatVL.java

Using a reverse hashmap instead of indexOfValue in userManager

2015-08-05 13:23:25 -07:00