summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanesh M <daneshm90@gmail.com>2015-09-27 22:43:53 (GMT)
committerDanesh M <daneshm90@gmail.com>2015-09-27 22:43:53 (GMT)
commit6d5f97506bc6b93471d7e29bd2cbd996895cc0d7 (patch)
treed2b5d2d37a57b2c472f8ea2653df1356dd04e626
parent7d020886d2b81a8523dc9f06d2dd078e65107def (diff)
downloadandroid_packages_apps_Trebuchet-6d5f97506bc6b93471d7e29bd2cbd996895cc0d7.zip
android_packages_apps_Trebuchet-6d5f97506bc6b93471d7e29bd2cbd996895cc0d7.tar.gz
android_packages_apps_Trebuchet-6d5f97506bc6b93471d7e29bd2cbd996895cc0d7.tar.bz2
Revert "Show apps as unavailable when on unmounted storage"
This reverts commit 53b6e9dd1a97ea59a84e4c8b7172e1773d990ee5.
-rw-r--r--res/values/cm_strings.xml3
-rw-r--r--src/com/android/launcher3/Launcher.java40
-rw-r--r--src/com/android/launcher3/LauncherModel.java65
-rw-r--r--src/com/android/launcher3/Workspace.java84
4 files changed, 21 insertions, 171 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index c15a813..225e335 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -86,7 +86,4 @@
<!-- Search Manager doesn't exist -->
<string name="search_activity_not_found">A search activity could not be found!</string>
-
- <!-- App not available toast text -->
- <string name="app_not_available">App not available</string>
</resources>
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 766d3f7..382c24b 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3143,15 +3143,11 @@ public class Launcher extends Activity
final Intent intent;
if (tag instanceof ShortcutInfo) {
shortcut = (ShortcutInfo) tag;
- if (shortcut.isDisabled) {
- Toast.makeText(this, R.string.app_not_available, Toast.LENGTH_SHORT).show();
- return;
- }
intent = shortcut.intent;
int[] pos = new int[2];
v.getLocationOnScreen(pos);
- intent.setSourceBounds(
- new Rect(pos[0], pos[1], pos[0] + v.getWidth(), pos[1] + v.getHeight()));
+ intent.setSourceBounds(new Rect(pos[0], pos[1],
+ pos[0] + v.getWidth(), pos[1] + v.getHeight()));
} else if (tag instanceof AppInfo) {
shortcut = null;
@@ -5685,38 +5681,6 @@ public class Launcher extends Activity
}
/**
- * A package has become unavailable.
- *
- * Implementation of the method from LauncherModel.Callbacks.
- */
- public void bindComponentsUnavailable(final ArrayList<String> packageNames,
- final ArrayList<AppInfo> appInfos) {
- if (!packageNames.isEmpty()) {
- mWorkspace.updateUnavailableItemsByPackageName(packageNames);
- }
- // Notify the drag controller
- mDragController.onAppsRemoved(packageNames, appInfos);
-
- // Update AllApps
- if (!LauncherAppState.isDisableAllApps() &&
- mAppsCustomizeContent != null) {
- mAppsCustomizeContent.removeApps(appInfos);
- mAppDrawerAdapter.removeApps(appInfos);
- }
- }
-
- /**
- * A package has become unavailable.
- *
- * Implementation of the method from LauncherModel.Callbacks.
- */
- public void bindComponentsAvailable(final ArrayList<ItemInfo> itemInfos) {
- if (!itemInfos.isEmpty()) {
- mWorkspace.updateAvailableItems(itemInfos);
- }
- }
-
- /**
* A number of packages were updated.
*/
private ArrayList<Object> mWidgetsAndShortcuts;
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index ec705aa..54b2008 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -212,9 +212,6 @@ public class LauncherModel extends BroadcastReceiver
public void updatePackageBadge(String packageName);
public void bindComponentsRemoved(ArrayList<String> packageNames,
ArrayList<AppInfo> appInfos, UserHandleCompat user);
- public void bindComponentsUnavailable(ArrayList<String> packageNames,
- ArrayList<AppInfo> appInfos);
- public void bindComponentsAvailable(ArrayList<ItemInfo> itemInfos);
public void bindPackagesUpdated(ArrayList<Object> widgetsAndShortcuts);
public void bindSearchablesChanged();
public boolean isAllAppsButtonRank(int rank);
@@ -3374,7 +3371,6 @@ public class LauncherModel extends BroadcastReceiver
final String[] packages = mPackages;
final int N = packages.length;
- final ArrayList<String> unavailable = new ArrayList<String>();
switch (mOp) {
case OP_ADD:
for (int i=0; i<N; i++) {
@@ -3398,9 +3394,6 @@ public class LauncherModel extends BroadcastReceiver
mBgAllAppsList.removePackage(packages[i], mUser);
WidgetPreviewLoader.removePackageFromDb(
mApp.getWidgetPreviewCacheDb(), packages[i]);
- if (mOp == OP_UNAVAILABLE) {
- unavailable.add(packages[i]);
- }
}
break;
}
@@ -3429,21 +3422,12 @@ public class LauncherModel extends BroadcastReceiver
}
if (added != null) {
- final ArrayList<ItemInfo> addedInfos = new ArrayList<ItemInfo>(added);
// Ensure that we add all the workspace applications to the db
if (LauncherAppState.isDisableAllApps()) {
+ final ArrayList<ItemInfo> addedInfos = new ArrayList<ItemInfo>(added);
addAndBindAddedWorkspaceApps(context, addedInfos);
} else {
addAppsToAllApps(context, added);
- mHandler.post(new Runnable() {
- public void run() {
- Callbacks cb = mCallbacks != null ? mCallbacks.get() : null;
- if (callbacks == cb && cb != null) {
- Log.d(TAG, "bindComponentsAvailable: " + addedInfos.size());
- callbacks.bindComponentsAvailable(addedInfos);
- }
- }
- });
}
}
@@ -3516,32 +3500,6 @@ public class LauncherModel extends BroadcastReceiver
if (mOp == OP_REMOVE) {
// Mark all packages in the broadcast to be removed
removedPackageNames.addAll(Arrays.asList(packages));
- // Remove all the components associated with this package
- for (String pn : removedPackageNames) {
- deletePackageFromDatabase(context, pn, mUser);
- }
- // Remove all the specific components
- for (AppInfo a : removedApps) {
- ArrayList<ItemInfo> infos = getItemInfoForComponentName(a.componentName, mUser);
- deleteItemsFromDatabase(context, infos);
- }
- if (!removedPackageNames.isEmpty() || !removedApps.isEmpty()) {
- // Remove any queued items from the install queue
- String spKey = LauncherAppState.getSharedPreferencesKey();
- SharedPreferences sp =
- context.getSharedPreferences(spKey, Context.MODE_PRIVATE);
- InstallShortcutReceiver.removeFromInstallQueue(sp, removedPackageNames);
- // Call the components-removed callback
- mHandler.post(new Runnable() {
- public void run() {
- Callbacks cb = mCallbacks != null ? mCallbacks.get() : null;
- if (callbacks == cb && cb != null) {
- callbacks.bindComponentsRemoved(removedPackageNames, removedApps,
- mUser);
- }
- }
- });
- }
} else if (mOp == OP_UPDATE) {
// Mark disabled packages in the broadcast to be removed
final PackageManager pm = context.getPackageManager();
@@ -3550,13 +3508,28 @@ public class LauncherModel extends BroadcastReceiver
removedPackageNames.add(packages[i]);
}
}
- } else if (mOp == OP_UNAVAILABLE) {
- // Call the packages-unavailable callback
+ }
+ // Remove all the components associated with this package
+ for (String pn : removedPackageNames) {
+ deletePackageFromDatabase(context, pn, mUser);
+ }
+ // Remove all the specific components
+ for (AppInfo a : removedApps) {
+ ArrayList<ItemInfo> infos = getItemInfoForComponentName(a.componentName, mUser);
+ deleteItemsFromDatabase(context, infos);
+ }
+ if (!removedPackageNames.isEmpty() || !removedApps.isEmpty()) {
+ // Remove any queued items from the install queue
+ String spKey = LauncherAppState.getSharedPreferencesKey();
+ SharedPreferences sp =
+ context.getSharedPreferences(spKey, Context.MODE_PRIVATE);
+ InstallShortcutReceiver.removeFromInstallQueue(sp, removedPackageNames);
+ // Call the components-removed callback
mHandler.post(new Runnable() {
public void run() {
Callbacks cb = mCallbacks != null ? mCallbacks.get() : null;
if (callbacks == cb && cb != null) {
- callbacks.bindComponentsUnavailable(unavailable, removedApps);
+ callbacks.bindComponentsRemoved(removedPackageNames, removedApps, mUser);
}
}
});
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 5efe8d4..e34edf3 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4953,90 +4953,6 @@ public class Workspace extends SmoothPagedView
stripEmptyScreens();
}
- void updateUnvailableItemsInCellLayout(CellLayout parent, ArrayList<String> packages) {
- final HashSet<String> packageNames = new HashSet<String>();
- packageNames.addAll(packages);
-
- ViewGroup layout = parent.getShortcutsAndWidgets();
- int childCount = layout.getChildCount();
- for (int i = 0; i < childCount; ++i) {
- View view = layout.getChildAt(i);
- if (view instanceof BubbleTextView) {
- ItemInfo info = (ItemInfo) view.getTag();
- if (info instanceof ShortcutInfo) {
- Intent intent = info.getIntent();
- ComponentName cn = intent != null ? intent.getComponent() : null;
- if (cn != null && packageNames.contains(cn.getPackageName())) {
- ShortcutInfo shortcut = (ShortcutInfo) info;
- if (!shortcut.isDisabled) {
- shortcut.isDisabled = true;
- ((BubbleTextView) view)
- .applyFromShortcutInfo(shortcut, mIconCache, true);
- }
- }
- }
- } else if (view instanceof FolderIcon) {
- final Folder folder = ((FolderIcon)view).getFolder();
- updateUnvailableItemsInCellLayout(folder.getContent(), packages);
- folder.invalidate();
- }
- }
- }
-
- void updateUnavailableItemsByPackageName(final ArrayList<String> packages) {
- ArrayList<CellLayout> cellLayouts = getWorkspaceAndHotseatCellLayouts();
- for (CellLayout layoutParent : cellLayouts) {
- updateUnvailableItemsInCellLayout(layoutParent, packages);
- }
- }
-
- /**
- * Updates shortcuts to an app that was previously unavailable in the given cell layout
- * @param parent CellLayout to check childen for shortcuts to the available app
- * @param appInfos List of item infos. Items are assumed to be of type AppInfo
- */
- void updateAvailabeItemsInCellLayout(CellLayout parent, final ArrayList<ItemInfo> appInfos) {
- ViewGroup layout = parent.getShortcutsAndWidgets();
- int childCount = layout.getChildCount();
- for (int i = 0; i < childCount; ++i) {
- View view = layout.getChildAt(i);
- if (view instanceof BubbleTextView) {
- ItemInfo info = (ItemInfo) view.getTag();
- if (info instanceof ShortcutInfo) {
- Intent intent = info.getIntent();
- ComponentName cn = intent != null ? intent.getComponent() : null;
- for (ItemInfo itemInfo : appInfos) {
- AppInfo appInfo = (AppInfo) itemInfo;
- if (cn != null && cn.getPackageName().equals(
- appInfo.componentName.getPackageName())) {
- ShortcutInfo shortcut = (ShortcutInfo) info;
- if (shortcut.isDisabled) {
- shortcut.isDisabled = false;
- ((BubbleTextView) view)
- .applyFromShortcutInfo(shortcut, mIconCache, true);
- }
- }
- }
- }
- } else if (view instanceof FolderIcon) {
- final Folder folder = ((FolderIcon)view).getFolder();
- updateAvailabeItemsInCellLayout(folder.getContent(), appInfos);
- folder.invalidate();
- }
- }
- }
-
- /**
- * Updates shortcuts to an app that was previously unavailable
- * @param appInfos List of item infos. Items are assumed to be of type AppInfo
- */
- void updateAvailableItems(final ArrayList<ItemInfo> appInfos) {
- ArrayList<CellLayout> cellLayouts = getWorkspaceAndHotseatCellLayouts();
- for (CellLayout layoutParent : cellLayouts) {
- updateAvailabeItemsInCellLayout(layoutParent, appInfos);
- }
- }
-
interface ItemOperator {
/**
* Process the next itemInfo, possibly with side-effect on {@link ItemOperator#value}.