[cng1985] r617 committed - [No log message]

[cng...@googlecode.com]

Revision: 617
Author: cng1985
Date: Thu Sep 8 22:26:16 2011
Log: [No log message]
http://code.google.com/p/cng1985/source/detail?r=617

Deleted:
/adw/res/drawable-mdpi/ic_launcher_home.png
Modified:
/adw/AndroidManifest.xml
/adw/res/drawable-mdpi/icon.png
/adw/src/org/adw/launcher2/Launcher.java

=======================================
--- /adw/res/drawable-mdpi/ic_launcher_home.png Thu Sep 8 17:42:42 2011
+++ /dev/null
Binary file, no diff available.
=======================================
--- /adw/AndroidManifest.xml Thu Sep 8 21:37:04 2011
+++ /adw/AndroidManifest.xml Thu Sep 8 22:26:16 2011
@@ -106,7 +106,7 @@
android:required="false" />
<application android:name="org.adw.launcher2.LauncherApplication"
android:process="@string/process"
android:label="@string/application_name"
- android:icon="@drawable/ic_launcher_home">
+ android:icon="@drawable/icon">

<activity android:name="org.adw.launcher2.Launcher"
android:launchMode="singleTask" android:clearTaskOnLaunch="true"
@@ -120,17 +120,11 @@
<category android:name="android.intent.category.MONKEY" />
</intent-filter>
</activity>
-
- <activity android:name="org.adw.launcher2.WallpaperChooser"
- android:label="@string/pick_wallpaper"
android:icon="@drawable/ic_launcher_wallpaper"
- android:screenOrientation="nosensor"
- android:finishOnCloseSystemDialogs="true">
- <intent-filter>
- <action android:name="android.intent.action.SET_WALLPAPER" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
-
+ <!-- <activity android:name="org.adw.launcher2.WallpaperChooser"
android:label="@string/pick_wallpaper"
+ android:icon="@drawable/ic_launcher_wallpaper"
android:screenOrientation="nosensor"
+ android:finishOnCloseSystemDialogs="true"> <intent-filter> <action
android:name="android.intent.action.SET_WALLPAPER"
+ /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter>
+ </activity> -->
<activity android:name="org.adw.launcher2.actions.RunActionActivity">
<intent-filter>
<action android:name="org.adw.launcher2.ACTION_LAUNCHERACTION" />
@@ -183,10 +177,10 @@



- <!-- 快速设置 -->
- <activity android:name="com.bwx.bequick.ShowSettingsActivity"
android:label="Quick Settings"
- android:icon="@drawable/ic_logo" android:launchMode="standard"
- android:theme="@android:style/Theme.NoDisplay">
+ <!-- 快速设置 -->
+ <activity android:name="com.bwx.bequick.ShowSettingsActivity"
+ android:label="Quick Settings" android:icon="@drawable/ic_logo"
+ android:launchMode="standard"
android:theme="@android:style/Theme.NoDisplay">
<intent-filter>
<action android:name="android.intent.action.SEARCH_LONG_PRESS" />
<category android:name="android.intent.category.DEFAULT" />
@@ -199,9 +193,10 @@
android:excludeFromRecents="true">
</activity>

- <activity android:name="com.bwx.bequick.MainSettingsActivity"
android:label="Quick Settings"
- android:icon="@drawable/ic_logo" android:launchMode="singleInstance"
- android:excludeFromRecents="true" android:theme="@style/NoTitle" />
+ <activity android:name="com.bwx.bequick.MainSettingsActivity"
+ android:label="Quick Settings" android:icon="@drawable/ic_logo"
+ android:launchMode="singleInstance" android:excludeFromRecents="true"
+ android:theme="@style/NoTitle" />

<activity android:name="com.bwx.bequick.LayoutSettingsActivity"
android:label="@string/txt_customize_settings"
@@ -219,8 +214,8 @@
<activity android:name="com.bwx.bequick.preferences.MobileDataPrefs"
android:label="@string/txt_preferences"
android:excludeFromRecents="true" />

- <activity android:name="com.bwx.bequick.preferences.GpsPrefs"
android:label="@string/txt_preferences"
- android:excludeFromRecents="true" />
+ <activity android:name="com.bwx.bequick.preferences.GpsPrefs"
+ android:label="@string/txt_preferences"
android:excludeFromRecents="true" />

<activity android:name="com.bwx.bequick.preferences.AirplaneModePrefs"
android:label="@string/txt_preferences"
android:excludeFromRecents="true" />
=======================================
--- /adw/res/drawable-mdpi/icon.png Thu Sep 8 17:42:42 2011
+++ /adw/res/drawable-mdpi/icon.png Thu Sep 8 22:26:16 2011
Binary file, no diff available.
=======================================
--- /adw/src/org/adw/launcher2/Launcher.java Thu Sep 8 20:26:11 2011
+++ /adw/src/org/adw/launcher2/Launcher.java Thu Sep 8 22:26:16 2011
@@ -2254,12 +2254,29 @@
}

case AddAdapter.ITEM_APPWIDGET: {
- int appWidgetId =
Launcher.this.mAppWidgetHost.allocateAppWidgetId();
-
- Intent pickIntent = new
Intent(AppWidgetManager.ACTION_APPWIDGET_PICK);
-
pickIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
- // start the pick activity
- startActivityForResult(pickIntent,
REQUEST_PICK_APPWIDGET);
+ int appWidgetId =
Launcher.this.mAppWidgetHost.allocateAppWidgetId();
+ 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.application_name);
+ info.icon = R.drawable.ic_home_arrows_1_focus;
+ 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;
}

@@ -2280,7 +2297,7 @@
}
}
}
-
+ private static final String EXTRA_CUSTOM_WIDGET = "custom_widget";
/**
* Receives notifications when applications are added/removed.
*/