diff options
| author | Jim Miller <jaggies@google.com> | 2012-11-04 17:58:09 -0800 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2012-11-06 17:04:26 -0800 |
| commit | 51117262c8fadb6d227d137e83ad66996b013141 (patch) | |
| tree | 94a9b21e3f8bd76d075c5955b1b8d0fcd7d08f5c /core/java/android/provider | |
| parent | 475255bffc792b48e18213a6bfde0fc9ebeb4a34 (diff) | |
| download | frameworks_base-51117262c8fadb6d227d137e83ad66996b013141.zip frameworks_base-51117262c8fadb6d227d137e83ad66996b013141.tar.gz frameworks_base-51117262c8fadb6d227d137e83ad66996b013141.tar.bz2 | |
Handle DevicePolicyManagement and safe mode when inflating widgets
Bug 7459120
Bug 7444159
Bug 7444016
Change-Id: I7966ec510da8113ac571b5a4b9dc48dd291396e8
Conflicts:
policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index f482335..b94f0b9 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3229,6 +3229,13 @@ public final class Settings { "lock_screen_appwidget_ids"; /** + * Id of the appwidget shown on the lock screen when appwidgets are disabled. + * @hide + */ + public static final String LOCK_SCREEN_FALLBACK_APPWIDGET_ID = + "lock_screen_fallback_appwidget_id"; + + /** * Index of the lockscreen appwidget to restore, -1 if none. * @hide */ |