diff options
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher2/AllAppsView.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher2/CellLayout.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher2/Folder.java | 13 | ||||
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 233 | ||||
| -rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 20 | ||||
| -rw-r--r-- | src/com/android/launcher2/LauncherProvider.java | 162 | ||||
| -rw-r--r-- | src/com/android/launcher2/Search.java | 380 | ||||
| -rw-r--r-- | src/com/android/launcher2/Widget.java | 36 | ||||
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 48 |
9 files changed, 122 insertions, 775 deletions
diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java index fe9518b93..cf752509e 100644 --- a/src/com/android/launcher2/AllAppsView.java +++ b/src/com/android/launcher2/AllAppsView.java @@ -31,6 +31,7 @@ import android.renderscript.ProgramFragment; import android.renderscript.ProgramStore; import android.renderscript.ProgramVertex; import android.renderscript.RSSurfaceView; +import android.renderscript.RenderScriptGL; import android.renderscript.RenderScript; import android.renderscript.Sampler; import android.renderscript.Script; @@ -84,7 +85,7 @@ public class AllAppsView extends RSSurfaceView private int mMaxFlingVelocity; private Defines mDefines = new Defines(); - private RenderScript mRS; + private RenderScriptGL mRS; private RolloRS mRollo; private ArrayList<ApplicationInfo> mAllAppsList; diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index 9bf9a465b..8b141a41c 100644 --- a/src/com/android/launcher2/CellLayout.java +++ b/src/com/android/launcher2/CellLayout.java @@ -904,7 +904,7 @@ out: for (int i = x; i < x + spanX - 1 && x < xCount; i++) { } public LayoutParams(int cellX, int cellY, int cellHSpan, int cellVSpan) { - super(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT); + super(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); this.cellX = cellX; this.cellY = cellY; this.cellHSpan = cellHSpan; diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index 7c35f7997..435004d33 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -17,6 +17,7 @@ package com.android.launcher2; import android.content.Context; +import android.graphics.Rect; import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; @@ -47,7 +48,6 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL * Which item is being dragged */ protected ShortcutInfo mDragItem; - private boolean mCloneInfo; /** * Used to inflate the Workspace from XML. @@ -75,6 +75,10 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL public void onItemClick(AdapterView parent, View v, int position, long id) { ShortcutInfo app = (ShortcutInfo) parent.getItemAtPosition(position); + int[] pos = new int[2]; + v.getLocationOnScreen(pos); + app.intent.setSourceBounds(new Rect(pos[0], pos[1], + pos[0] + v.getWidth(), pos[1] + v.getHeight())); mLauncher.startActivitySafely(app.intent); } @@ -94,9 +98,6 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL } ShortcutInfo app = (ShortcutInfo) parent.getItemAtPosition(position); - if (mCloneInfo) { - app = new ShortcutInfo(app); - } mDragController.startDrag(view, this, app, DragController.DRAG_ACTION_COPY); mLauncher.closeFolder(this); @@ -105,10 +106,6 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL return true; } - void setCloneInfo(boolean cloneInfo) { - mCloneInfo = cloneInfo; - } - public void setDragController(DragController dragController) { mDragController = dragController; } diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 924ef7413..11b26c54f 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -16,6 +16,8 @@ package com.android.launcher2; +import com.android.common.Search; + import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -42,14 +44,11 @@ import android.graphics.Rect; import android.graphics.Canvas; import android.graphics.drawable.Drawable; import android.graphics.drawable.ColorDrawable; -import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.os.Parcelable; import android.os.SystemProperties; -import android.provider.ContactsContract; import android.provider.LiveFolders; -import android.telephony.PhoneNumberUtils; import android.text.Selection; import android.text.SpannableStringBuilder; import android.text.TextUtils; @@ -116,9 +115,6 @@ public final class Launcher extends Activity static final String EXTRA_SHORTCUT_DUPLICATE = "duplicate"; - static final String EXTRA_CUSTOM_WIDGET = "custom_widget"; - static final String SEARCH_WIDGET = "search_widget"; - static final int SCREEN_COUNT = 5; static final int DEFAULT_SCREEN = 2; static final int NUMBER_CELLS_X = 4; @@ -186,8 +182,6 @@ public final class Launcher extends Activity private SpannableStringBuilder mDefaultKeySsb = null; - private boolean mIsNewIntent; - private boolean mWorkspaceLoading = true; private boolean mPaused = true; @@ -204,7 +198,6 @@ public final class Launcher extends Activity private ImageView mPreviousView; private ImageView mNextView; - private boolean mUtsTestMode; @Override protected void onCreate(Bundle savedInstanceState) { @@ -376,7 +369,7 @@ public final class Launcher extends Activity completeAddApplication(this, data, mAddItemCellInfo); break; case REQUEST_PICK_SHORTCUT: - processShortcut(data, REQUEST_PICK_APPLICATION, REQUEST_CREATE_SHORTCUT); + processShortcut(data); break; case REQUEST_CREATE_SHORTCUT: completeAddShortcut(data, mAddItemCellInfo); @@ -413,28 +406,12 @@ public final class Launcher extends Activity super.onResume(); mPaused = false; - mUtsTestMode = SystemProperties.getInt("persist.sys.uts-test-mode", 0) == 1; if (mRestoring) { mWorkspaceLoading = true; mModel.startLoader(this, true); mRestoring = false; } - - // If this was a new intent (i.e., the mIsNewIntent flag got set to true by - // onNewIntent), then close the search dialog if needed, because it probably - // came from the user pressing 'home' (rather than, for example, pressing 'back'). - if (mIsNewIntent) { - // Post to a handler so that this happens after the search dialog tries to open - // itself again. - mWorkspace.post(new Runnable() { - public void run() { - stopSearch(); - } - }); - } - - mIsNewIntent = false; } @Override @@ -485,10 +462,6 @@ public final class Launcher extends Activity @Override public boolean onKeyDown(int keyCode, KeyEvent event) { - if (mUtsTestMode) { - return handleUtsTestModeKeyDown(keyCode, event); - } - boolean handled = super.onKeyDown(keyCode, event); if (!handled && acceptFilter() && keyCode != KeyEvent.KEYCODE_ENTER) { boolean gotKey = TextKeyListener.getInstance().onKeyDown(mWorkspace, mDefaultKeySsb, @@ -512,52 +485,6 @@ public final class Launcher extends Activity return handled; } - public boolean handleUtsTestModeKeyDown(int keyCode, KeyEvent event) { - Log.d(TAG, "UTS-TEST-MODE"); - boolean handled = super.onKeyDown(keyCode, event); - if (!handled && acceptFilter() && keyCode != KeyEvent.KEYCODE_ENTER) { - boolean gotKey = TextKeyListener.getInstance().onKeyDown(mWorkspace, mDefaultKeySsb, - keyCode, event); - if (gotKey && mDefaultKeySsb != null && mDefaultKeySsb.length() > 0) { - // something usable has been typed - dispatch it now. - final String str = mDefaultKeySsb.toString(); - - boolean isDialable = true; - final int count = str.length(); - for (int i = 0; i < count; i++) { - if (!PhoneNumberUtils.isReallyDialable(str.charAt(i))) { - isDialable = false; - break; - } - } - Intent intent; - if (isDialable) { - intent = new Intent(Intent.ACTION_DIAL, Uri.fromParts("tel", str, null)); - } else { - intent = new Intent(ContactsContract.Intents.UI.FILTER_CONTACTS_ACTION); - intent.putExtra(ContactsContract.Intents.UI.FILTER_TEXT_EXTRA_KEY, str); - } - - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK - | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); - - try { - startActivity(intent); - } catch (android.content.ActivityNotFoundException ex) { - // Oh well... no one knows how to filter/dial. Life goes on. - } - - mDefaultKeySsb.clear(); - mDefaultKeySsb.clearSpans(); - Selection.setSelection(mDefaultKeySsb, 0); - - return true; - } - } - - return handled; - } - private String getTypedText() { return mDefaultKeySsb.toString(); } @@ -849,11 +776,6 @@ public final class Launcher extends Activity // also will cancel mWaitingForResult. closeSystemDialogs(); - // Set this flag so that onResume knows to close the search dialog if it's open, - // because this was a new intent (thus a press of 'home' or some such) rather than - // for example onResume being called when the user pressed the 'back' button. - mIsNewIntent = true; - boolean alreadyOnHome = ((intent.getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT); boolean allAppsVisible = isAllAppsVisible(); @@ -956,26 +878,6 @@ public final class Launcher extends Activity closeAllApps(true); - // Slide the search widget to the top, if it's on the current screen, - // otherwise show the search dialog immediately. - Search searchWidget = mWorkspace.findSearchWidgetOnCurrentScreen(); - if (searchWidget == null) { - showSearchDialog(initialQuery, selectInitialQuery, appSearchData, globalSearch); - } else { - searchWidget.startSearch(initialQuery, selectInitialQuery, appSearchData, globalSearch); - // show the currently typed text in the search widget while sliding - searchWidget.setQuery(getTypedText()); - } - } - - /** - * Show the search dialog immediately, without changing the search widget. - * - * @see Activity#startSearch(String, boolean, android.os.Bundle, boolean) - */ - void showSearchDialog(String initialQuery, boolean selectInitialQuery, - Bundle appSearchData, boolean globalSearch) { - if (initialQuery == null) { // Use any text typed in the launcher as the initial query initialQuery = getTypedText(); @@ -983,42 +885,15 @@ public final class Launcher extends Activity } if (appSearchData == null) { appSearchData = new Bundle(); - appSearchData.putString(SearchManager.SOURCE, "launcher-search"); + appSearchData.putString(Search.SOURCE, "launcher-search"); } final SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE); - - final Search searchWidget = mWorkspace.findSearchWidgetOnCurrentScreen(); - if (searchWidget != null) { - // This gets called when the user leaves the search dialog to go back to - // the Launcher. - searchManager.setOnCancelListener(new SearchManager.OnCancelListener() { - public void onCancel() { - searchManager.setOnCancelListener(null); - stopSearch(); - } - }); - } - searchManager.startSearch(initialQuery, selectInitialQuery, getComponentName(), appSearchData, globalSearch); } - /** - * Cancel search dialog if it is open. - */ - void stopSearch() { - // Close search dialog - SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE); - searchManager.stopSearch(); - // Restore search widget to its normal position - Search searchWidget = mWorkspace.findSearchWidgetOnCurrentScreen(); - if (searchWidget != null) { - searchWidget.stopSearch(false); - } - } - @Override public boolean onCreateOptionsMenu(Menu menu) { if (isWorkspaceLocked()) { @@ -1118,52 +993,22 @@ public final class Launcher extends Activity void addAppWidget(Intent data) { // TODO: catch bad widget exception when sent int appWidgetId = data.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1); + AppWidgetProviderInfo appWidget = mAppWidgetManager.getAppWidgetInfo(appWidgetId); - String customWidget = data.getStringExtra(EXTRA_CUSTOM_WIDGET); - if (SEARCH_WIDGET.equals(customWidget)) { - // We don't need this any more, since this isn't a real app widget. - mAppWidgetHost.deleteAppWidgetId(appWidgetId); - // add the search widget - addSearch(); - } else { - AppWidgetProviderInfo appWidget = mAppWidgetManager.getAppWidgetInfo(appWidgetId); - - if (appWidget.configure != null) { - // Launch over to configure widget, if needed - Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_CONFIGURE); - intent.setComponent(appWidget.configure); - intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId); + if (appWidget.configure != null) { + // Launch over to configure widget, if needed + Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_CONFIGURE); + intent.setComponent(appWidget.configure); + intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId); - startActivityForResult(intent, REQUEST_CREATE_APPWIDGET); - } else { - // Otherwise just add it - onActivityResult(REQUEST_CREATE_APPWIDGET, Activity.RESULT_OK, data); - } + startActivityForResult(intent, REQUEST_CREATE_APPWIDGET); + } else { + // Otherwise just add it + onActivityResult(REQUEST_CREATE_APPWIDGET, Activity.RESULT_OK, data); } } - void addSearch() { - final Widget info = Widget.makeSearch(); - final CellLayout.CellInfo cellInfo = mAddItemCellInfo; - - final int[] xy = mCellCoordinates; - final int spanX = info.spanX; - final int spanY = info.spanY; - - if (!findSlot(cellInfo, xy, spanX, spanY)) return; - - LauncherModel.addItemToDatabase(this, info, LauncherSettings.Favorites.CONTAINER_DESKTOP, - mWorkspace.getCurrentScreen(), xy[0], xy[1], false); - - final View view = mInflater.inflate(info.layoutResource, null); - view.setTag(info); - Search search = (Search) view.findViewById(R.id.widget_search); - search.setLauncher(this); - - mWorkspace.addInCurrentScreen(view, xy[0], xy[1], info.spanX, spanY); - } - - void processShortcut(Intent intent, int requestCodeApplication, int requestCodeShortcut) { + void processShortcut(Intent intent) { // Handle case where user selected "Applications" String applicationName = getResources().getString(R.string.group_applications); String shortcutName = intent.getStringExtra(Intent.EXTRA_SHORTCUT_NAME); @@ -1174,9 +1019,9 @@ public final class Launcher extends Activity Intent pickIntent = new Intent(Intent.ACTION_PICK_ACTIVITY); pickIntent.putExtra(Intent.EXTRA_INTENT, mainIntent); - startActivityForResult(pickIntent, requestCodeApplication); + startActivityForResult(pickIntent, REQUEST_PICK_APPLICATION); } else { - startActivityForResult(intent, requestCodeShortcut); + startActivityForResult(intent, REQUEST_CREATE_SHORTCUT); } } @@ -1413,11 +1258,11 @@ public final class Launcher extends Activity Object tag = v.getTag(); if (tag instanceof ShortcutInfo) { // Open shortcut - final Intent intent = ((ShortcutInfo)tag).intent; + final Intent intent = ((ShortcutInfo) tag).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())); startActivitySafely(intent); } else if (tag instanceof FolderInfo) { handleFolderClick((FolderInfo) tag); @@ -1734,7 +1579,7 @@ public final class Launcher extends Activity showDialog(DIALOG_CREATE_SHORTCUT); } - private void pickShortcut(int requestCode, int title) { + private void pickShortcut() { Bundle bundle = new Bundle(); ArrayList<String> shortcutNames = new ArrayList<String>(); @@ -1748,10 +1593,10 @@ public final class Launcher extends Activity Intent pickIntent = new Intent(Intent.ACTION_PICK_ACTIVITY); pickIntent.putExtra(Intent.EXTRA_INTENT, new Intent(Intent.ACTION_CREATE_SHORTCUT)); - pickIntent.putExtra(Intent.EXTRA_TITLE, getText(title)); + pickIntent.putExtra(Intent.EXTRA_TITLE, getText(R.string.title_select_shortcut)); pickIntent.putExtras(bundle); - startActivityForResult(pickIntent, requestCode); + startActivityForResult(pickIntent, REQUEST_PICK_SHORTCUT); } private class RenameFolder { @@ -1956,7 +1801,7 @@ public final class Launcher extends Activity switch (which) { case AddAdapter.ITEM_SHORTCUT: { // Insert extra item to handle picking application - pickShortcut(REQUEST_PICK_SHORTCUT, R.string.title_select_shortcut); + pickShortcut(); break; } @@ -1965,22 +1810,6 @@ public final class Launcher extends Activity Intent pickIntent = new Intent(AppWidgetManager.ACTION_APPWIDGET_PICK); pickIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId); - // add the search widget - ArrayList<AppWidgetProviderInfo> customInfo = - new ArrayList<AppWidgetProviderInfo>(); - AppWidgetProviderInfo info = new AppWidgetProviderInfo(); - info.provider = new ComponentName(getPackageName(), "XXX.YYY"); - info.label = getString(R.string.group_search); - info.icon = R.drawable.ic_search_widget; - customInfo.add(info); - pickIntent.putParcelableArrayListExtra( - AppWidgetManager.EXTRA_CUSTOM_INFO, customInfo); - ArrayList<Bundle> customExtras = new ArrayList<Bundle>(); - Bundle b = new Bundle(); - b.putString(EXTRA_CUSTOM_WIDGET, SEARCH_WIDGET); - customExtras.add(b); - pickIntent.putParcelableArrayListExtra( - AppWidgetManager.EXTRA_CUSTOM_EXTRAS, customExtras); // start the pick activity startActivityForResult(pickIntent, REQUEST_PICK_APPWIDGET); break; @@ -2121,19 +1950,6 @@ public final class Launcher extends Activity workspace.addInScreen(newLiveFolder, item.screen, item.cellX, item.cellY, 1, 1, false); break; - case LauncherSettings.Favorites.ITEM_TYPE_WIDGET_SEARCH: - final int screen = workspace.getCurrentScreen(); - final View view = mInflater.inflate(R.layout.widget_search, - (ViewGroup) workspace.getChildAt(screen), false); - - Search search = (Search) view.findViewById(R.id.widget_search); - search.setLauncher(this); - - final Widget widget = (Widget) item; - view.setTag(widget); - - workspace.addWidget(view, widget, false); - break; } } @@ -2254,7 +2070,6 @@ public final class Launcher extends Activity public void dumpState() { Log.d(TAG, "BEGIN launcher2 dump state for launcher " + this); Log.d(TAG, "mSavedState=" + mSavedState); - Log.d(TAG, "mIsNewIntent=" + mIsNewIntent); Log.d(TAG, "mWorkspaceLoading=" + mWorkspaceLoading); Log.d(TAG, "mRestoring=" + mRestoring); Log.d(TAG, "mWaitingForResult=" + mWaitingForResult); diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index 43daa9c0e..16e5c3b6f 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java @@ -674,7 +674,6 @@ public class LauncherModel extends BroadcastReceiver { ShortcutInfo info; String intentDescription; - Widget widgetInfo; LauncherAppWidgetInfo appWidgetInfo; int container; long id; @@ -803,25 +802,6 @@ public class LauncherModel extends BroadcastReceiver { } break; - case LauncherSettings.Favorites.ITEM_TYPE_WIDGET_SEARCH: - widgetInfo = Widget.makeSearch(); - - container = c.getInt(containerIndex); - if (container != LauncherSettings.Favorites.CONTAINER_DESKTOP) { - Log.e(TAG, "Widget found where container " - + "!= CONTAINER_DESKTOP ignoring!"); - continue; - } - - widgetInfo.id = c.getLong(idIndex); - widgetInfo.screen = c.getInt(screenIndex); - widgetInfo.container = container; - widgetInfo.cellX = c.getInt(cellXIndex); - widgetInfo.cellY = c.getInt(cellYIndex); - - mItems.add(widgetInfo); - break; - case LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET: // Read all Launcher-specific widget details int appWidgetId = c.getInt(appWidgetIdIndex); diff --git a/src/com/android/launcher2/LauncherProvider.java b/src/com/android/launcher2/LauncherProvider.java index 62c19df9f..14c83b3e3 100644 --- a/src/com/android/launcher2/LauncherProvider.java +++ b/src/com/android/launcher2/LauncherProvider.java @@ -16,8 +16,10 @@ package com.android.launcher2; +import android.app.SearchManager; import android.appwidget.AppWidgetHost; import android.appwidget.AppWidgetManager; +import android.appwidget.AppWidgetProviderInfo; import android.content.ContentProvider; import android.content.Context; import android.content.ContentValues; @@ -49,9 +51,11 @@ import android.provider.Settings; import java.io.IOException; import java.net.URISyntaxException; import java.util.ArrayList; +import java.util.List; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParser; + import com.android.internal.util.XmlUtils; import com.android.launcher2.LauncherSettings.Favorites; @@ -386,6 +390,12 @@ public class LauncherProvider extends ContentProvider { } } + if (version < 7) { + // Version 7 gets rid of the special search widget. + convertWidgets(db); + version = 7; + } + if (version < 8) { // Version 8 (froyo) has the icons all normalized. This should // already be the case in practice, but we now rely on it and don't @@ -512,6 +522,7 @@ public class LauncherProvider extends ContentProvider { logged = true; } } + db.setTransactionSuccessful(); } catch (SQLException ex) { Log.w(TAG, "Problem while allocating appWidgetIds for existing widgets", ex); } finally { @@ -528,26 +539,21 @@ public class LauncherProvider extends ContentProvider { * equivalents. */ private void convertWidgets(SQLiteDatabase db) { + final AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(mContext); final int[] bindSources = new int[] { Favorites.ITEM_TYPE_WIDGET_CLOCK, Favorites.ITEM_TYPE_WIDGET_PHOTO_FRAME, + Favorites.ITEM_TYPE_WIDGET_SEARCH, }; - - final ArrayList<ComponentName> bindTargets = new ArrayList<ComponentName>(); - bindTargets.add(new ComponentName("com.android.alarmclock", - "com.android.alarmclock.AnalogAppWidgetProvider")); - bindTargets.add(new ComponentName("com.android.camera", - "com.android.camera.PhotoAppWidgetProvider")); - + final String selectWhere = buildOrWhereString(Favorites.ITEM_TYPE, bindSources); Cursor c = null; - boolean allocatedAppWidgets = false; db.beginTransaction(); try { // Select and iterate through each matching widget - c = db.query(TABLE_FAVORITES, new String[] { Favorites._ID }, + c = db.query(TABLE_FAVORITES, new String[] { Favorites._ID, Favorites.ITEM_TYPE }, selectWhere, null, null, null, null); if (LOGD) Log.d(TAG, "found upgrade cursor count=" + c.getCount()); @@ -555,7 +561,8 @@ public class LauncherProvider extends ContentProvider { final ContentValues values = new ContentValues(); while (c != null && c.moveToNext()) { long favoriteId = c.getLong(0); - + int favoriteType = c.getInt(1); + // Allocate and update database with new appWidgetId try { int appWidgetId = mAppWidgetHost.allocateAppWidgetId(); @@ -564,18 +571,35 @@ public class LauncherProvider extends ContentProvider { Log.d(TAG, "allocated appWidgetId=" + appWidgetId + " for favoriteId=" + favoriteId); } - values.clear(); - values.put(LauncherSettings.Favorites.APPWIDGET_ID, appWidgetId); - + values.put(Favorites.ITEM_TYPE, Favorites.ITEM_TYPE_APPWIDGET); + values.put(Favorites.APPWIDGET_ID, appWidgetId); + // Original widgets might not have valid spans when upgrading - values.put(LauncherSettings.Favorites.SPANX, 2); - values.put(LauncherSettings.Favorites.SPANY, 2); + if (favoriteType == Favorites.ITEM_TYPE_WIDGET_SEARCH) { + values.put(LauncherSettings.Favorites.SPANX, 4); + values.put(LauncherSettings.Favorites.SPANY, 1); + } else { + values.put(LauncherSettings.Favorites.SPANX, 2); + values.put(LauncherSettings.Favorites.SPANY, 2); + } String updateWhere = Favorites._ID + "=" + favoriteId; db.update(TABLE_FAVORITES, values, updateWhere, null); - - allocatedAppWidgets = true; + + ComponentName cn = null; + if (favoriteType == Favorites.ITEM_TYPE_WIDGET_CLOCK) { + appWidgetManager.bindAppWidgetId(appWidgetId, + new ComponentName("com.android.alarmclock", + "com.android.alarmclock.AnalogAppWidgetProvider")); + } else if (favoriteType == Favorites.ITEM_TYPE_WIDGET_PHOTO_FRAME) { + appWidgetManager.bindAppWidgetId(appWidgetId, + new ComponentName("com.android.camera", + "com.android.camera.PhotoAppWidgetProvider")); + } else if (favoriteType == Favorites.ITEM_TYPE_WIDGET_SEARCH) { + appWidgetManager.bindAppWidgetId(appWidgetId, + getSearchWidgetProvider()); + } } catch (RuntimeException ex) { Log.e(TAG, "Problem allocating appWidgetId", ex); } @@ -590,34 +614,9 @@ public class LauncherProvider extends ContentProvider { c.close(); } } - - // If any appWidgetIds allocated, then launch over to binder - if (allocatedAppWidgets) { - launchAppWidgetBinder(bindSources, bindTargets); - } } /** - * Launch the widget binder that walks through the Launcher database, - * binding any matching widgets to the corresponding targets. We can't - * bind ourselves because our parent process can't obtain the - * BIND_APPWIDGET permission. - */ - private void launchAppWidgetBinder(int[] bindSources, ArrayList<ComponentName> bindTargets) { - final Intent intent = new Intent(); - intent.setComponent(new ComponentName("com.android.settings", - "com.android.settings.LauncherAppWidgetBinder")); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - - final Bundle extras = new Bundle(); - extras.putIntArray(EXTRA_BIND_SOURCES, bindSources); - extras.putParcelableArrayList(EXTRA_BIND_TARGETS, bindTargets); - intent.putExtras(extras); - - mContext.startActivity(intent); - } - - /** * Loads the default set of favorite packages from an xml file. * * @param db The database to write the values into @@ -710,48 +709,41 @@ public class LauncherProvider extends ContentProvider { return true; } - private boolean addSearchWidget(SQLiteDatabase db, ContentValues values) { - // Add a search box - values.put(Favorites.ITEM_TYPE, Favorites.ITEM_TYPE_WIDGET_SEARCH); - values.put(Favorites.SPANX, 4); - values.put(Favorites.SPANY, 1); - db.insert(TABLE_FAVORITES, null, values); - - return true; + private ComponentName getSearchWidgetProvider() { + SearchManager searchManager = + (SearchManager) mContext.getSystemService(Context.SEARCH_SERVICE); + ComponentName searchComponent = searchManager.getGlobalSearchActivity(); + if (searchComponent == null) return null; + return getProviderInPackage(searchComponent.getPackageName()); } - private boolean addClockWidget(SQLiteDatabase db, ContentValues values) { - final int[] bindSources = new int[] { - Favorites.ITEM_TYPE_WIDGET_CLOCK, - }; - - final ArrayList<ComponentName> bindTargets = new ArrayList<ComponentName>(); - bindTargets.add(new ComponentName("com.android.alarmclock", - "com.android.alarmclock.AnalogAppWidgetProvider")); - - boolean allocatedAppWidgets = false; - - // Try binding to an analog clock widget - try { - int appWidgetId = mAppWidgetHost.allocateAppWidgetId(); - - values.put(Favorites.ITEM_TYPE, Favorites.ITEM_TYPE_WIDGET_CLOCK); - values.put(Favorites.SPANX, 2); - values.put(Favorites.SPANY, 2); - values.put(Favorites.APPWIDGET_ID, appWidgetId); - db.insert(TABLE_FAVORITES, null, values); - - allocatedAppWidgets = true; - } catch (RuntimeException ex) { - Log.e(TAG, "Problem allocating appWidgetId", ex); + /** + * Gets an appwidget provider from the given package. If the package contains more than + * one appwidget provider, an arbitrary one is returned. + */ + private ComponentName getProviderInPackage(String packageName) { + AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(mContext); + List<AppWidgetProviderInfo> providers = appWidgetManager.getInstalledProviders(); + if (providers == null) return null; + final int providerCount = providers.size(); + for (int i = 0; i < providerCount; i++) { + ComponentName provider = providers.get(i).provider; + if (provider != null && provider.getPackageName().equals(packageName)) { + return provider; + } } + return null; + } - // If any appWidgetIds allocated, then launch over to binder - if (allocatedAppWidgets) { - launchAppWidgetBinder(bindSources, bindTargets); - } + private boolean addSearchWidget(SQLiteDatabase db, ContentValues values) { + ComponentName cn = getSearchWidgetProvider(); + return addAppWidget(db, values, cn, 4, 1); + } - return allocatedAppWidgets; + private boolean addClockWidget(SQLiteDatabase db, ContentValues values) { + ComponentName cn = new ComponentName("com.android.alarmclock", + "com.android.alarmclock.AnalogAppWidgetProvider"); + return addAppWidget(db, values, cn, 2, 2); } private boolean addAppWidget(SQLiteDatabase db, ContentValues values, TypedArray a) { @@ -763,7 +755,13 @@ public class LauncherProvider extends ContentProvider { } ComponentName cn = new ComponentName(packageName, className); - + int spanX = a.getInt(R.styleable.Favorite_spanX, 0); + int spanY = a.getInt(R.styleable.Favorite_spanY, 0); + return addAppWidget(db, values, cn, spanX, spanY); + } + + private boolean addAppWidget(SQLiteDatabase db, ContentValues values, ComponentName cn, + int spanX, int spanY) { boolean allocatedAppWidgets = false; final AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(mContext); @@ -771,8 +769,8 @@ public class LauncherProvider extends ContentProvider { int appWidgetId = mAppWidgetHost.allocateAppWidgetId(); values.put(Favorites.ITEM_TYPE, Favorites.ITEM_TYPE_APPWIDGET); - values.put(Favorites.SPANX, a.getString(R.styleable.Favorite_spanX)); - values.put(Favorites.SPANY, a.getString(R.styleable.Favorite_spanY)); + values.put(Favorites.SPANX, spanX); + values.put(Favorites.SPANY, spanY); values.put(Favorites.APPWIDGET_ID, appWidgetId); db.insert(TABLE_FAVORITES, null, values); diff --git a/src/com/android/launcher2/Search.java b/src/com/android/launcher2/Search.java deleted file mode 100644 index 283042d19..000000000 --- a/src/com/android/launcher2/Search.java +++ /dev/null @@ -1,380 +0,0 @@ -/* - * 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 com.android.launcher2; - -import android.app.Activity; -import android.content.ActivityNotFoundException; -import android.content.Context; -import android.content.Intent; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; -import android.content.res.Configuration; -import android.graphics.drawable.Drawable; -import android.os.Bundle; -import android.util.AttributeSet; -import android.util.Log; -import android.view.KeyEvent; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.View.OnKeyListener; -import android.view.View.OnLongClickListener; -import android.view.animation.AccelerateDecelerateInterpolator; -import android.view.animation.Animation; -import android.view.animation.Interpolator; -import android.view.animation.Transformation; -import android.view.inputmethod.InputMethodManager; -import android.widget.ImageButton; -import android.widget.LinearLayout; -import android.widget.TextView; - -public class Search extends LinearLayout - implements OnClickListener, OnKeyListener, OnLongClickListener { - - // Speed at which the widget slides up/down, in pixels/ms. - private static final float ANIMATION_VELOCITY = 1.0f; - - /** The distance in dips between the optical top of the widget and the top if its bounds */ - private static final float WIDGET_TOP_OFFSET = 9; - - - private final String TAG = "Launcher.SearchWidget"; - - private Launcher mLauncher; - - private TextView mSearchText; - private ImageButton mVoiceButton; - - /** The animation that morphs the search widget to the search dialog. */ - private Animation mMorphAnimation; - - /** The animation that morphs the search widget back to its normal position. */ - private Animation mUnmorphAnimation; - - // These four are passed to Launcher.startSearch() when the search widget - // has finished morphing. They are instance variables to make it possible to update - // them while the widget is morphing. - private String mInitialQuery; - private boolean mSelectInitialQuery; - private Bundle mAppSearchData; - private boolean mGlobalSearch; - - // For voice searching - private Intent mVoiceSearchIntent; - - private int mWidgetTopOffset; - - /** - * Used to inflate the Workspace from XML. - * - * @param context The application's context. - * @param attrs The attributes set containing the Workspace's customization values. - */ - public Search(Context context, AttributeSet attrs) { - super(context, attrs); - - final float scale = context.getResources().getDisplayMetrics().density; - mWidgetTopOffset = Math.round(WIDGET_TOP_OFFSET * scale); - - Interpolator interpolator = new AccelerateDecelerateInterpolator(); - - mMorphAnimation = new ToParentOriginAnimation(); - // no need to apply transformation before the animation starts, - // since the gadget is already in its normal place. - mMorphAnimation.setFillBefore(false); - // stay in the top position after the animation finishes - mMorphAnimation.setFillAfter(true); - mMorphAnimation.setInterpolator(interpolator); - mMorphAnimation.setAnimationListener(new Animation.AnimationListener() { - // The amount of time before the animation ends to show the search dialog. - private static final long TIME_BEFORE_ANIMATION_END = 80; - - // The runnable which we'll pass to our handler to show the search dialog. - private final Runnable mShowSearchDialogRunnable = new Runnable() { - public void run() { - showSearchDialog(); - } - }; - - public void onAnimationEnd(Animation animation) { } - public void onAnimationRepeat(Animation animation) { } - public void onAnimationStart(Animation animation) { - // Make the search dialog show up ideally *just* as the animation reaches - // the top, to aid the illusion that the widget becomes the search dialog. - // Otherwise, there is a short delay when the widget reaches the top before - // the search dialog shows. We do this roughly 80ms before the animation ends. - getHandler().postDelayed( - mShowSearchDialogRunnable, - Math.max(mMorphAnimation.getDuration() - TIME_BEFORE_ANIMATION_END, 0)); - } - }); - - mUnmorphAnimation = new FromParentOriginAnimation(); - // stay in the top position until the animation starts - mUnmorphAnimation.setFillBefore(true); - // no need to apply transformation after the animation finishes, - // since the gadget is now back in its normal place. - mUnmorphAnimation.setFillAfter(false); - mUnmorphAnimation.setInterpolator(interpolator); - mUnmorphAnimation.setAnimationListener(new Animation.AnimationListener(){ - public void onAnimationEnd(Animation animation) { - clearAnimation(); - } - public void onAnimationRepeat(Animation animation) { } - public void onAnimationStart(Animation animation) { } - }); - - mVoiceSearchIntent = new Intent(android.speech.RecognizerIntent.ACTION_WEB_SEARCH); - mVoiceSearchIntent.putExtra(android.speech.RecognizerIntent.EXTRA_LANGUAGE_MODEL, - android.speech.RecognizerIntent.LANGUAGE_MODEL_WEB_SEARCH); - } - - /** - * Implements OnClickListener. - */ - public void onClick(View v) { - if (v == mVoiceButton) { - startVoiceSearch(); - } else { - mLauncher.onSearchRequested(); - } - } - - private void startVoiceSearch() { - try { - getContext().startActivity(mVoiceSearchIntent); - } catch (ActivityNotFoundException ex) { - // Should not happen, since we check the availability of - // voice search before showing the button. But just in case... - Log.w(TAG, "Could not find voice search activity"); - } - } - - /** - * Sets the query text. The query field is not editable, instead we forward - * the key events to the launcher, which keeps track of the text, - * calls setQuery() to show it, and gives it to the search dialog. - */ - public void setQuery(String query) { - mSearchText.setText(query, TextView.BufferType.NORMAL); - } - - /** - * Morph the search gadget to the search dialog. - * See {@link Activity#startSearch()} for the arguments. - */ - public void startSearch(String initialQuery, boolean selectInitialQuery, - Bundle appSearchData, boolean globalSearch) { - mInitialQuery = initialQuery; - mSelectInitialQuery = selectInitialQuery; - mAppSearchData = appSearchData; - mGlobalSearch = globalSearch; - - if (isAtTop()) { - showSearchDialog(); - } else { - // Call up the keyboard before we actually call the search dialog so that it - // (hopefully) animates in at about the same time as the widget animation, and - // so that it becomes available as soon as possible. Only do this if a hard - // keyboard is not currently available. - if (getContext().getResources().getConfiguration().hardKeyboardHidden == - Configuration.HARDKEYBOARDHIDDEN_YES) { - InputMethodManager inputManager = (InputMethodManager) - getContext().getSystemService(Context.INPUT_METHOD_SERVICE); - inputManager.showSoftInputUnchecked(0, null); - } - - // Start the animation, unless it has already started. - if (getAnimation() != mMorphAnimation) { - mMorphAnimation.setDuration(getAnimationDuration()); - startAnimation(mMorphAnimation); - } - } - } - - /** - * Shows the system search dialog immediately, without any animation. - */ - private void showSearchDialog() { - mLauncher.showSearchDialog( - mInitialQuery, mSelectInitialQuery, mAppSearchData, mGlobalSearch); - } - - /** - * Restore the search gadget to its normal position. - * - * @param animate Whether to animate the movement of the gadget. - */ - public void stopSearch(boolean animate) { - setQuery(""); - - // Only restore if we are not already restored. - if (getAnimation() == mMorphAnimation) { - if (animate && !isAtTop()) { - mUnmorphAnimation.setDuration(getAnimationDuration()); - startAnimation(mUnmorphAnimation); - } else { - clearAnimation(); - } - } - } - - private boolean isAtTop() { - return getWidgetTop() == 0; - } - - private int getAnimationDuration() { - return (int) (getWidgetTop() / ANIMATION_VELOCITY); - } - - /** - * Modify clearAnimation() to invalidate the parent. This works around - * an issue where the region where the end of the animation placed the view - * was not redrawn after clearing the animation. - */ - @Override - public void clearAnimation() { - Animation animation = getAnimation(); - if (animation != null) { - super.clearAnimation(); - if (animation.hasEnded() - && animation.getFillAfter() - && animation.willChangeBounds()) { - View parent = (View) getParent(); - if (parent != null) parent.invalidate(); - } else { - invalidate(); - } - } - } - - public boolean onKey(View v, int keyCode, KeyEvent event) { - if (!event.isSystem() && - (keyCode != KeyEvent.KEYCODE_DPAD_UP) && - (keyCode != KeyEvent.KEYCODE_DPAD_DOWN) && - (keyCode != KeyEvent.KEYCODE_DPAD_LEFT) && - (keyCode != KeyEvent.KEYCODE_DPAD_RIGHT) && - (keyCode != KeyEvent.KEYCODE_DPAD_CENTER)) { - // Forward key events to Launcher, which will forward text - // to search dialog - switch (event.getAction()) { - case KeyEvent.ACTION_DOWN: - return mLauncher.onKeyDown(keyCode, event); - case KeyEvent.ACTION_MULTIPLE: - return mLauncher.onKeyMultiple(keyCode, event.getRepeatCount(), event); - case KeyEvent.ACTION_UP: - return mLauncher.onKeyUp(keyCode, event); - } - } - return false; - } - - /** - * Implements OnLongClickListener to pass long clicks on child views - * to the widget. This makes it possible to pick up the widget by long - * clicking on the text field or a button. - */ - public boolean onLongClick(View v) { - return performLongClick(); - } - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - - mSearchText = (TextView) findViewById(R.id.search_src_text); - mVoiceButton = (ImageButton) findViewById(R.id.search_voice_btn); - - mSearchText.setOnKeyListener(this); - - mSearchText.setOnClickListener(this); - mVoiceButton.setOnClickListener(this); - setOnClickListener(this); - - mSearchText.setOnLongClickListener(this); - mVoiceButton.setOnLongClickListener(this); - - // Set the placeholder text to be the Google logo within the search widget. - Drawable googlePlaceholder = - getContext().getResources().getDrawable(R.drawable.placeholder_google); - mSearchText.setCompoundDrawablesWithIntrinsicBounds(googlePlaceholder, null, null, null); - - configureVoiceSearchButton(); - } - - @Override - public void onDetachedFromWindow() { - super.onDetachedFromWindow(); - } - - /** - * If appropriate & available, configure voice search - * - * Note: Because the home screen search widget is always web search, we only check for - * getVoiceSearchLaunchWebSearch() modes. We don't support the alternate form of app-specific - * voice search. - */ - private void configureVoiceSearchButton() { - // Enable the voice search button if there is an activity that can handle it - PackageManager pm = getContext().getPackageManager(); - ResolveInfo ri = pm.resolveActivity(mVoiceSearchIntent, - PackageManager.MATCH_DEFAULT_ONLY); - boolean voiceSearchVisible = ri != null; - - // finally, set visible state of voice search button, as appropriate - mVoiceButton.setVisibility(voiceSearchVisible ? View.VISIBLE : View.GONE); - } - - /** - * Sets the {@link Launcher} that this gadget will call on to display the search dialog. - */ - public void setLauncher(Launcher launcher) { - mLauncher = launcher; - } - - /** - * Moves the view to the top left corner of its parent. - */ - private class ToParentOriginAnimation extends Animation { - @Override - protected void applyTransformation(float interpolatedTime, Transformation t) { - float dx = -getLeft() * interpolatedTime; - float dy = -getWidgetTop() * interpolatedTime; - t.getMatrix().setTranslate(dx, dy); - } - } - - /** - * Moves the view from the top left corner of its parent. - */ - private class FromParentOriginAnimation extends Animation { - @Override - protected void applyTransformation(float interpolatedTime, Transformation t) { - float dx = -getLeft() * (1.0f - interpolatedTime); - float dy = -getWidgetTop() * (1.0f - interpolatedTime); - t.getMatrix().setTranslate(dx, dy); - } - } - - /** - * The widget is centered vertically within it's 4x1 slot. This is accomplished by nesting - * the actual widget inside another view. For animation purposes, we care about the top of the - * actual widget rather than it's container. This method return the top of the actual widget. - */ - private int getWidgetTop() { - return getTop() + getChildAt(0).getTop() + mWidgetTopOffset; - } -} diff --git a/src/com/android/launcher2/Widget.java b/src/com/android/launcher2/Widget.java deleted file mode 100644 index 348acee7c..000000000 --- a/src/com/android/launcher2/Widget.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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 com.android.launcher2; - -import android.content.ContentValues; -import android.graphics.Bitmap; - -/** - * Represents one instance of a Launcher widget, such as search. - */ -class Widget extends ItemInfo { - int layoutResource; - - static Widget makeSearch() { - Widget w = new Widget(); - w.itemType = LauncherSettings.Favorites.ITEM_TYPE_WIDGET_SEARCH; - w.spanX = 4; - w.spanY = 1; - w.layoutResource = R.layout.widget_search; - return w; - } -} diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index f3ffeaf2d..e64c487af 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -29,6 +29,7 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.net.Uri; +import android.os.IBinder; import android.os.Parcelable; import android.os.Parcel; import android.util.AttributeSet; @@ -256,6 +257,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag mPreviousIndicator.setLevel(mCurrentScreen); mNextIndicator.setLevel(mCurrentScreen); scrollTo(mCurrentScreen * getWidth(), 0); + updateWallpaperOffset(); invalidate(); } @@ -342,16 +344,6 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag } } - void addWidget(View view, Widget widget) { - addInScreen(view, widget.screen, widget.cellX, widget.cellY, widget.spanX, - widget.spanY, false); - } - - void addWidget(View view, Widget widget, boolean insert) { - addInScreen(view, widget.screen, widget.cellX, widget.cellY, widget.spanX, - widget.spanY, insert); - } - CellLayout.CellInfo findAllVacantCells(boolean[] occupied) { CellLayout group = (CellLayout) getChildAt(mCurrentScreen); if (group != null) { @@ -386,8 +378,11 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag } private void updateWallpaperOffset(int scrollRange) { - mWallpaperManager.setWallpaperOffsetSteps(1.0f / (getChildCount() - 1), 0 ); - mWallpaperManager.setWallpaperOffsets(getWindowToken(), mScrollX / (float) scrollRange, 0); + IBinder token = getWindowToken(); + if (token != null) { + mWallpaperManager.setWallpaperOffsetSteps(1.0f / (getChildCount() - 1), 0 ); + mWallpaperManager.setWallpaperOffsets(getWindowToken(), mScrollX/(float)scrollRange, 0); + } } @Override @@ -444,6 +439,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag protected void onAttachedToWindow() { super.onAttachedToWindow(); + computeScroll(); mDragController.setWindowToken(getWindowToken()); } @@ -843,7 +839,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag mPreviousIndicator.setLevel(mNextScreen); mNextIndicator.setLevel(mNextScreen); - + View focusedChild = getFocusedChild(); if (focusedChild != null && screenDelta != 0 && focusedChild == getChildAt(mCurrentScreen)) { focusedChild.clearFocus(); @@ -863,8 +859,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag View child = cellInfo.cell; // Make sure the drag was started by a long press as opposed to a long click. - // Note that Search takes focus when clicked rather than entering touch mode - if (!child.isInTouchMode() && !(child instanceof Search)) { + if (!child.isInTouchMode()) { return; } @@ -1129,29 +1124,6 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag return result; } - /** - * Find a search widget on the given screen - */ - private Search findSearchWidget(CellLayout screen) { - final int count = screen.getChildCount(); - for (int i = 0; i < count; i++) { - View v = screen.getChildAt(i); - if (v instanceof Search) { - return (Search) v; - } - } - return null; - } - - /** - * Gets the first search widget on the current screen, if there is one. - * Returns <code>null</code> otherwise. - */ - public Search findSearchWidgetOnCurrentScreen() { - CellLayout currentScreen = (CellLayout)getChildAt(mCurrentScreen); - return findSearchWidget(currentScreen); - } - public Folder getFolderForTag(Object tag) { int screenCount = getChildCount(); for (int screen = 0; screen < screenCount; screen++) { |