Bug 851170 - Put homescreen wallpaper feature behind confvars variable. r=ted

This commit is contained in:
Margaret Leibovic 2013-03-21 14:01:02 -07:00
parent ba2c81e50e
commit e50647fad7
4 changed files with 16 additions and 0 deletions

View File

@ -4279,6 +4279,7 @@ BUILD_CTYPES=1
MOZ_USE_NATIVE_POPUP_WINDOWS=
MOZ_ANDROID_HISTORY=
MOZ_WEBSMS_BACKEND=
MOZ_ANDROID_WALLPAPER=
ACCESSIBILITY=1
MOZ_SYS_MSG=
MOZ_TIME_MANAGER=
@ -5150,6 +5151,13 @@ if test -n "$MOZ_WEBSMS_BACKEND"; then
AC_DEFINE(MOZ_WEBSMS_BACKEND)
fi
dnl ========================================================
dnl = Enable SET_WALLPAPER permission on Android
dnl ========================================================
if test -n "$MOZ_ANDROID_WALLPAPER"; then
AC_DEFINE(MOZ_ANDROID_WALLPAPER)
fi
dnl ========================================================
dnl = Build Personal Security Manager
dnl ========================================================
@ -8599,6 +8607,7 @@ AC_SUBST(MOZ_METRO)
AC_SUBST(MOZ_ANDROID_HISTORY)
AC_SUBST(MOZ_WEBSMS_BACKEND)
AC_SUBST(MOZ_ANDROID_WALLPAPER)
AC_SUBST(ENABLE_STRIP)
AC_SUBST(PKG_SKIP_STRIP)
AC_SUBST(STRIP_FLAGS)

View File

@ -25,7 +25,9 @@
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.VIBRATE"/>
#ifdef MOZ_ANDROID_WALLPAPER
<uses-permission android:name="android.permission.SET_WALLPAPER"/>
#endif
<uses-permission android:name="@ANDROID_PACKAGE_NAME@.permissions.PASSWORD_PROVIDER"/>
<uses-permission android:name="@ANDROID_PACKAGE_NAME@.permissions.BROWSER_PROVIDER"/>
<uses-permission android:name="@ANDROID_PACKAGE_NAME@.permissions.FORMHISTORY_PROVIDER"/>

View File

@ -475,6 +475,7 @@ var BrowserApp = {
aTarget.ownerDocument);
});
#ifdef MOZ_ANDROID_WALLPAPER
NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.setWallpaper"),
NativeWindow.contextmenus.imageSaveableContext,
function(aTarget) {
@ -484,6 +485,7 @@ var BrowserApp = {
url: src
});
});
#endif
NativeWindow.contextmenus.add(
function(aTarget) {

View File

@ -19,6 +19,9 @@ MOZ_DISABLE_CRYPTOLEGACY=1
# Enable getUserMedia
MOZ_MEDIA_NAVIGATOR=1
# Enable SET_WALLPAPER permission
MOZ_ANDROID_WALLPAPER=1
if test "$LIBXUL_SDK"; then
MOZ_XULRUNNER=1
else