Merge "Add an option allowing to skip wallpaper apps selection." into nyc-mr1-dev

am: 60a4dc652d

* commit '60a4dc652db643d23417fb2f037369b15177b7e2':
  Add an option allowing to skip wallpaper apps selection.

Change-Id: I79a0ab340470a4a9e0489ddb86d217f7495284c1
This commit is contained in:
Sunny Goyal
2016-05-25 23:18:33 +00:00
committed by android-build-merger
4 changed files with 10 additions and 12 deletions

View File

@@ -848,10 +848,6 @@
android:label="@string/wallpaper_settings_fragment_title"
android:icon="@drawable/ic_wallpaper"
android:taskAffinity="">
<intent-filter android:priority="1">
<action android:name="android.settings.WALLPAPER_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.WallpaperTypeSettings" />
</activity>