PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am dddef157: Merge "Fix bug: allow users to select "none" for lockscreen widget" into jb-mr1-dev

Browse Source 
* commit 'dddef157b79818cb20321e2a3b715e88457fba44':
  Fix bug: allow users to select "none" for lockscreen widget
This commit is contained in:
Michael Jurka
2012-09-18 16:54:43 -07:00
committed by Android Git Automerger
parent c2bb090a52 dddef157b7
commit 2be38ba7c1
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/SecuritySettings.java
View File

@@ -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) {