Merge "Fix wallpaper tap location in Nexus wallpaper" into ics-factoryrom
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 137abca..acd7c62 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -35,43 +35,41 @@
<activity
android:label="@string/wallpaper_grass"
android:name="com.android.wallpaper.grass.Grass"
- android:theme="@android:style/Theme.NoTitleBar">
-
+ android:theme="@android:style/Theme.NoTitleBar"
+ android:enabled="@bool/config_enable_grass_wallpaper">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.TEST" />
</intent-filter>
-
</activity>
<activity
android:label="@string/wallpaper_galaxy"
android:name="com.android.wallpaper.galaxy.Galaxy"
- android:theme="@android:style/Theme.NoTitleBar">
-
+ android:theme="@android:style/Theme.NoTitleBar"
+ android:enabled="@bool/config_enable_galaxy_wallpaper">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.TEST" />
</intent-filter>
-
</activity>
<activity
android:label="@string/wallpaper_fall"
android:name="com.android.wallpaper.fall.Fall"
- android:theme="@android:style/Theme.NoTitleBar">
-
+ android:theme="@android:style/Theme.NoTitleBar"
+ android:enabled="@bool/config_enable_fall_wallpaper">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.TEST" />
</intent-filter>
-
</activity>
<service
android:label="@string/wallpaper_nexus"
android:name="com.android.wallpaper.nexus.NexusWallpaper"
- android:permission="android.permission.BIND_WALLPAPER">
+ android:permission="android.permission.BIND_WALLPAPER"
+ android:enabled="@bool/config_enable_nexus_wallpaper">
<intent-filter>
<action android:name="android.service.wallpaper.WallpaperService" />
</intent-filter>
@@ -81,7 +79,8 @@
<service
android:label="@string/wallpaper_grass"
android:name="com.android.wallpaper.grass.GrassWallpaper"
- android:permission="android.permission.BIND_WALLPAPER">
+ android:permission="android.permission.BIND_WALLPAPER"
+ android:enabled="@bool/config_enable_grass_wallpaper">
<intent-filter>
<action android:name="android.service.wallpaper.WallpaperService" />
</intent-filter>
@@ -91,7 +90,8 @@
<service
android:label="@string/wallpaper_galaxy"
android:name="com.android.wallpaper.galaxy.GalaxyWallpaper"
- android:permission="android.permission.BIND_WALLPAPER">
+ android:permission="android.permission.BIND_WALLPAPER"
+ android:enabled="@bool/config_enable_galaxy_wallpaper">
<intent-filter>
<action android:name="android.service.wallpaper.WallpaperService" />
</intent-filter>
@@ -101,7 +101,8 @@
<service
android:label="@string/wallpaper_fall"
android:name="com.android.wallpaper.fall.FallWallpaper"
- android:permission="android.permission.BIND_WALLPAPER">
+ android:permission="android.permission.BIND_WALLPAPER"
+ android:enabled="@bool/config_enable_fall_wallpaper">
<intent-filter>
<action android:name="android.service.wallpaper.WallpaperService" />
</intent-filter>
@@ -112,13 +113,15 @@
android:label="@string/clock_settings"
android:name="com.android.wallpaper.polarclock.PolarClockSettings"
android:theme="@android:style/Theme"
- android:exported="true">
+ android:exported="true"
+ android:enabled="@bool/config_enable_polar_clock_wallpaper">
</activity>
<service
android:label="@string/wallpaper_clock"
android:name="com.android.wallpaper.polarclock.PolarClockWallpaper"
- android:permission="android.permission.BIND_WALLPAPER">
+ android:permission="android.permission.BIND_WALLPAPER"
+ android:enabled="@bool/config_enable_polar_clock_wallpaper">
<intent-filter>
<action android:name="android.service.wallpaper.WallpaperService" />
</intent-filter>
diff --git a/res/values/config.xml b/res/values/config.xml
new file mode 100644
index 0000000..a17d816
--- /dev/null
+++ b/res/values/config.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2010 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <bool name="config_enable_grass_wallpaper">false</bool>
+ <bool name="config_enable_galaxy_wallpaper">false</bool>
+ <bool name="config_enable_fall_wallpaper">true</bool>
+ <bool name="config_enable_nexus_wallpaper">true</bool>
+ <bool name="config_enable_polar_clock_wallpaper">false</bool>
+</resources>
+
