PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the intent<->activity mapping for wallpaper intent"

Browse Source
This commit is contained in:
Ronish Kalia
2022-05-27 23:54:24 +00:00
committed by Android (Google) Code Review
parent 5848c3dcbc d491d7a46f
commit 46ccb94e38
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
AndroidManifest.xml
View File

@@ -1108,10 +1108,6 @@
android:label="@string/wallpaper_settings_fragment_title" android:label="@string/wallpaper_settings_fragment_title"
android:icon="@drawable/ic_wallpaper" android:icon="@drawable/ic_wallpaper"
android:exported="true"> android:exported="true">
<intent-filter>
<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" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.wallpaper.WallpaperTypeSettings" /> android:value="com.android.settings.wallpaper.WallpaperTypeSettings" />
<meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY" <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
@@ -1124,15 +1120,19 @@
android:exported="true" android:exported="true"
android:theme="@android:style/Theme.NoDisplay"> android:theme="@android:style/Theme.NoDisplay">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.WALLPAPER_SETTINGS"/>
<category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" /> <category android:name="android.intent.category.DEFAULT"/>
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN"/>
<category android:name="com.android.settings.suggested.category.PERSONALIZE" /> <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="com.android.settings.suggested.category.PERSONALIZE"/>
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.title" <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" <meta-data android:name="com.android.settings.summary"
android:resource="@string/wallpaper_suggestion_summary" /> android:resource="@string/wallpaper_suggestion_summary" />
<meta-data android:name="com.android.settings.dismiss" <meta-data android:name="com.android.settings.dismiss"