aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 19:28:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts of 0c2f0700a5 to ub-launcher3-master.

Browse Source 
Change-Id: I92f38e9f4ac4d9b6c5a3000e0971d2bc417bd3c6
This commit is contained in:
Sunny Goyal
2015-11-30 10:19:02 -08:00
parent b23bb416d0 0c2f0700a5
commit dc893151f0
3 changed files with 32 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/launcher3/ShortcutInfo.java
View File

@@ -51,7 +51,7 @@ public class ShortcutInfo extends ItemInfo {
public static final int FLAG_AUTOINTALL_ICON = 2; //0B10;
/**
* The icon is being installed. If {@link FLAG_RESTORED_ICON} or {@link FLAG_AUTOINTALL_ICON}
* The icon is being installed. If {@link #FLAG_RESTORED_ICON} or {@link #FLAG_AUTOINTALL_ICON}
* is set, then the icon is either being installed or is in a broken state.
*/
public static final int FLAG_INSTALL_SESSION_ACTIVE = 4; // 0B100;
@@ -125,19 +125,14 @@ public class ShortcutInfo extends ItemInfo {
private int mInstallProgress;
/**
* Refer {@link AppInfo#firstInstallTime}.
*/
public long firstInstallTime;
/**
* TODO move this to {@link status}
* TODO move this to {@link #status}
*/
int flags = 0;
/**
* If this shortcut is a placeholder, then intent will be a market intent for the package, and
* this will hold the original intent from the database. Otherwise, null.
* Refer {@link #FLAG_RESTORE_PENDING}, {@link #FLAG_INSTALL_PENDING}
* Refer {@link #FLAG_RESTORED_ICON}, {@link #FLAG_AUTOINTALL_ICON}
*/
Intent promisedIntent;
@@ -171,7 +166,6 @@ public class ShortcutInfo extends ItemInfo {
mIcon = info.mIcon; // TODO: should make a copy here. maybe we don't need this ctor at all
customIcon = info.customIcon;
flags = info.flags;
firstInstallTime = info.firstInstallTime;
user = info.user;
status = info.status;
}
@@ -183,7 +177,6 @@ public class ShortcutInfo extends ItemInfo {
intent = new Intent(info.intent);
customIcon = false;
flags = info.flags;
firstInstallTime = info.firstInstallTime;
}
public void setIcon(Bitmap b) {
@@ -283,7 +276,6 @@ public class ShortcutInfo extends ItemInfo {
shortcut.intent = AppInfo.makeLaunchIntent(context, info, info.getUser());
shortcut.itemType = LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
shortcut.flags = AppInfo.initFlags(info);
shortcut.firstInstallTime = info.getFirstInstallTime();
return shortcut;
}
}