Merge "Gray out Wallpapers menu item when setting of wallpapers is not allowed. BUG...

diff --cc src/com/android/settings/DisplaySettings.java
index 5e7407b,bcccf43..6c99839
--- 1/src/com/android/settings/DisplaySettings.java
--- 2/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@@ -17,7 -17,9 +17,8 @@@
  package com.android.settings;
  
  import android.app.Activity;
 -import android.app.ActivityManagerNative;
  import android.app.UiModeManager;
+ import android.app.WallpaperManager;
  import android.app.admin.DevicePolicyManager;
  import android.content.ContentResolver;
  import android.content.Context;
@@@ -83,8 -79,9 +84,9 @@@ public class DisplaySettings extends Se
      private static final String KEY_CAMERA_GESTURE = "camera_gesture";
      private static final String KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE
              = "camera_double_tap_power_gesture";
+     private static final String KEY_WALLPAPER = "wallpaper";
  
 -    private DropDownPreference mFontSizePref;
 +    private Preference mFontSizePref;
  
      private final Configuration mCurConfig = new Configuration();