Merge \"Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config.\" into nyc-mr1-dev

am: fef6234ebc

Change-Id: I602f81cfeea807b3c63799eb7b9985e0053ed583
This commit is contained in:
Sunny Goyal
2016-06-14 17:00:56 +00:00
committed by android-build-merger
4 changed files with 43 additions and 11 deletions

View File

@@ -856,21 +856,19 @@
android:value="com.android.settings.WallpaperTypeSettings" />
</activity>
<activity android:name="Settings$WallpaperSuggestionActivity"
android:label="@string/wallpaper_settings_title"
android:exported="true"
android:icon="@drawable/ic_wallpaper"
android:taskAffinity="">
<activity android:name="WallpaperSuggestionActivity"
android:label="@string/wallpaper_settings_title"
android:icon="@drawable/ic_wallpaper"
android:exported="true"
android:theme="@android:style/Theme.NoDisplay">
<intent-filter android:priority="1">
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.WallpaperTypeSettings" />
<meta-data android:name="com.android.settings.title"
android:resource="@string/wallpaper_suggestion_title" />
android:resource="@string/wallpaper_suggestion_title" />
<meta-data android:name="com.android.settings.summary"
android:resource="@string/wallpaper_suggestion_summary" />
android:resource="@string/wallpaper_suggestion_summary" />
</activity>
<activity android:name="Settings$ZenModeScheduleRuleSettingsActivity"