diff options
| author | Tony Wickham <twickham@google.com> | 2016-08-04 16:34:49 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2016-08-05 10:40:12 -0700 |
| commit | 4efffc5ba69fdf44be1bf2b540e24cd2bd85d18c (patch) | |
| tree | bae8d1d185903ca0fdfdee744a38cd796a2ed739 /src/com/android/launcher3/Launcher.java | |
| parent | 960a7fe15eb5145237f6d7aca64b469be835b70a (diff) | |
| download | android_packages_apps_Trebuchet-4efffc5ba69fdf44be1bf2b540e24cd2bd85d18c.tar.gz android_packages_apps_Trebuchet-4efffc5ba69fdf44be1bf2b540e24cd2bd85d18c.tar.bz2 android_packages_apps_Trebuchet-4efffc5ba69fdf44be1bf2b540e24cd2bd85d18c.zip | |
Use shortcut disabled message if available.
Bug: 30681210
Change-Id: Ibb5fd58e5fc9557b63730bc1e3c3977133769466
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index d76d3e290..adf07a1ca 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2668,6 +2668,12 @@ public class Launcher extends Activity // If the app is only disabled because of the above flags, launch activity anyway. // Framework will tell the user why the app is suspended. } else { + if (!TextUtils.isEmpty(shortcut.disabledMessage)) { + // Use a message specific to this shortcut, if it has one. + Toast.makeText(this, shortcut.disabledMessage, Toast.LENGTH_SHORT).show(); + return; + } + // Otherwise just use a generic error message. int error = R.string.activity_not_available; if ((shortcut.isDisabled & ShortcutInfo.FLAG_DISABLED_SAFEMODE) != 0) { error = R.string.safemode_shortcut_error; |