Tweaking mechanism for adding keyguard widgets

-> Fix for issue 7173877
-> Fix for issue 7173587

Change-Id: I266cafcf175c98e0c8a8401e11faa5dd2e2fa885

Conflicts:

	src/com/android/settings/SecuritySettings.java
This commit is contained in:
Adam Cohen
2012-09-18 13:26:29 -07:00
committed by The Android Automerger
parent 682298bc34
commit 352c901765

View File

@@ -455,8 +455,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
Intent pickIntent = new Intent(AppWidgetManager.ACTION_APPWIDGET_PICK);
// Found in KeyguardHostView.java
final int KEYGUARD_HOST_ID = 0x4B455947;
int appWidgetId = AppWidgetHost.allocateAppWidgetIdForHost(
"com.android.internal.policy.impl.keyguard", KEYGUARD_HOST_ID);
int appWidgetId = AppWidgetHost.allocateAppWidgetIdForSystem(KEYGUARD_HOST_ID);
if (appWidgetId != -1) {
pickIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
pickIntent.putExtra(AppWidgetManager.EXTRA_CUSTOM_SORT, false);
@@ -597,7 +596,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
Integer.toString(appWidgetId));
} else {
AppWidgetHost.deleteAppWidgetIdForHost(appWidgetId);
AppWidgetHost.deleteAppWidgetIdForSystem(appWidgetId);
}
}
createPreferenceHierarchy();