diff options
author | Kenny Guy <kennyguy@google.com> | 2014-06-30 12:30:31 +0100 |
---|---|---|
committer | Kenny Guy <kennyguy@google.com> | 2014-06-30 12:30:31 +0100 |
commit | c2bd8101b8e26b9ebb2c079ae6867229dad3f196 (patch) | |
tree | a959a1cb19ea9b5b1f2b606a0b4a70cff9f8ed8f /src/com/android/launcher3/compat/LauncherActivityInfoCompat.java | |
parent | 40c5ed303909c4df71037be3429aa1423e59585f (diff) | |
download | android_packages_apps_Trebuchet-c2bd8101b8e26b9ebb2c079ae6867229dad3f196.tar.gz android_packages_apps_Trebuchet-c2bd8101b8e26b9ebb2c079ae6867229dad3f196.tar.bz2 android_packages_apps_Trebuchet-c2bd8101b8e26b9ebb2c079ae6867229dad3f196.zip |
Revert "Revert Cls stopping now-master running on googlefood"
This reverts commit 7bc272a11b701a32d2ed91277341c382cbd84aeb.
Conflicts:
src/com/android/launcher3/BubbleTextView.java
Change-Id: Id1fb2e1249e72658ce5477165c9bcacba9de2b04
Diffstat (limited to 'src/com/android/launcher3/compat/LauncherActivityInfoCompat.java')
-rw-r--r-- | src/com/android/launcher3/compat/LauncherActivityInfoCompat.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/compat/LauncherActivityInfoCompat.java b/src/com/android/launcher3/compat/LauncherActivityInfoCompat.java index 3ba93ea91..90a4d1a1f 100644 --- a/src/com/android/launcher3/compat/LauncherActivityInfoCompat.java +++ b/src/com/android/launcher3/compat/LauncherActivityInfoCompat.java @@ -17,6 +17,7 @@ package com.android.launcher3.compat; import android.content.ComponentName; +import android.content.pm.ApplicationInfo; import android.graphics.drawable.Drawable; public abstract class LauncherActivityInfoCompat { @@ -28,7 +29,7 @@ public abstract class LauncherActivityInfoCompat { public abstract UserHandleCompat getUser(); public abstract CharSequence getLabel(); public abstract Drawable getIcon(int density); - public abstract int getApplicationFlags(); + public abstract ApplicationInfo getApplicationInfo(); public abstract long getFirstInstallTime(); public abstract Drawable getBadgedIcon(int density); } |