forked from trman/ADWLauncher2
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Livefolders cleanup and properly detect options based on
location
- Loading branch information
John Van Etten
committed
Mar 31, 2011
1 parent
7aa7a46
commit 26594a3
Showing
7 changed files
with
122 additions
and
128 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,80 +1,72 @@ | ||
| /* | ||
| * Copyright (C) 2008 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.adw.launcher2; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import org.adw.launcher2.settings.LauncherSettings; | ||
|
|
||
| import android.content.ContentValues; | ||
| import android.content.Intent; | ||
| import android.net.Uri; | ||
| import android.view.View; | ||
|
|
||
| class LiveFolderInfo extends FolderInfo { | ||
|
|
||
| /** | ||
| * The base intent, if it exists. | ||
| */ | ||
| Intent baseIntent; | ||
|
|
||
| /** | ||
| * The live folder's content uri. | ||
| */ | ||
| Uri uri; | ||
|
|
||
| /** | ||
| * The live folder's display type. | ||
| */ | ||
| int displayMode; | ||
|
|
||
| LiveFolderInfo() { | ||
| itemType = LauncherSettings.Favorites.ITEM_TYPE_LIVE_FOLDER; | ||
| } | ||
|
|
||
| @Override | ||
| void onAddToDatabase(ContentValues values) { | ||
| super.onAddToDatabase(values); | ||
| values.put(LauncherSettings.Favorites.URI, uri.toString()); | ||
| if (baseIntent != null) { | ||
| values.put(LauncherSettings.Favorites.INTENT, baseIntent.toUri(0)); | ||
| } | ||
| values.put(LauncherSettings.Favorites.DISPLAY_MODE, displayMode); | ||
| } | ||
|
|
||
| private static final int ACTION_UNINSTALL = 2; | ||
|
|
||
| @Override | ||
| public void executeAction(EditAction action, View view, Launcher launcher) { | ||
| switch(action.getId()) { | ||
| case ACTION_UNINSTALL: { | ||
| launcher.UninstallPackage(launcher.getPackageNameFromIntent(baseIntent)); | ||
| } break; | ||
| default: | ||
| super.executeAction(action, view, launcher); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public List<EditAction> getAvailableActions(View view) { | ||
| List<EditAction> result = super.getAvailableActions(view); | ||
| result.add(new EditAction(ACTION_UNINSTALL, | ||
| android.R.drawable.ic_menu_manage, | ||
| R.string.menu_uninstall)); | ||
| return result; | ||
| } | ||
| } | ||
| /* | ||
| * Copyright (C) 2008 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.adw.launcher2; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import org.adw.launcher2.settings.LauncherSettings; | ||
|
|
||
| import android.content.ContentValues; | ||
| import android.content.Intent; | ||
| import android.net.Uri; | ||
| import android.view.View; | ||
|
|
||
| class LiveFolderInfo extends FolderInfo implements ItemInfo.ItemPackage { | ||
|
|
||
| /** | ||
| * The base intent, if it exists. | ||
| */ | ||
| Intent baseIntent; | ||
|
|
||
| /** | ||
| * The live folder's content uri. | ||
| */ | ||
| Uri uri; | ||
|
|
||
| /** | ||
| * The live folder's display type. | ||
| */ | ||
| int displayMode; | ||
|
|
||
| LiveFolderInfo() { | ||
| itemType = LauncherSettings.Favorites.ITEM_TYPE_LIVE_FOLDER; | ||
| } | ||
|
|
||
| @Override | ||
| void onAddToDatabase(ContentValues values) { | ||
| super.onAddToDatabase(values); | ||
| values.put(LauncherSettings.Favorites.URI, uri.toString()); | ||
| if (baseIntent != null) { | ||
| values.put(LauncherSettings.Favorites.INTENT, baseIntent.toUri(0)); | ||
| } | ||
| values.put(LauncherSettings.Favorites.DISPLAY_MODE, displayMode); | ||
| } | ||
|
|
||
| @Override | ||
| public List<EditAction> getAvailableActions(View view, Launcher launcher) { | ||
| List<EditAction> result = super.getAvailableActions(view, launcher); | ||
| addAppInfoAction(view, result, launcher); | ||
| addMarketAction(view, result, launcher); | ||
| return result; | ||
| } | ||
|
|
||
| @Override | ||
| public String getPackageName(Launcher launcher) | ||
| { | ||
| return launcher.getPackageNameFromIntent(baseIntent); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters