Merge "Fix bug: allow users to select "none" for lockscreen widget" into jb-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
dddef157b7
@@ -593,9 +593,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
|
|||||||
// If we selected "none", delete the allocated id
|
// If we selected "none", delete the allocated id
|
||||||
AppWidgetHost.deleteAppWidgetIdForSystem(appWidgetId);
|
AppWidgetHost.deleteAppWidgetIdForSystem(appWidgetId);
|
||||||
data.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1);
|
data.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1);
|
||||||
} else {
|
|
||||||
onActivityResult(REQUEST_CREATE_APPWIDGET, Activity.RESULT_OK, data);
|
|
||||||
}
|
}
|
||||||
|
onActivityResult(REQUEST_CREATE_APPWIDGET, Activity.RESULT_OK, data);
|
||||||
}
|
}
|
||||||
} else if (
|
} else if (
|
||||||
requestCode == REQUEST_CREATE_APPWIDGET && resultCode == Activity.RESULT_OK) {
|
requestCode == REQUEST_CREATE_APPWIDGET && resultCode == Activity.RESULT_OK) {
|
||||||
|
Reference in New Issue
Block a user