Fallback to default wallpaper picker if first choice fails

- Add fallback logic in WallpaperSuggestionActivity
- Move some classes around
- Delete some unused class

Change-Id: Ifc8864428647a94f3ecae50d193c2156b2592ff3
Fix: 36140287
Test: make RunSettingsRoboTests
This commit is contained in:
Fan Zhang
2017-03-17 15:05:14 -07:00
parent 92c6a45358
commit 2907f86971
12 changed files with 119 additions and 80 deletions

View File

@@ -143,7 +143,6 @@
</activity>
<!-- Wireless Controls -->
<activity android:name=".Settings$NetworkDashboardActivity"
android:taskAffinity="com.android.settings"
android:label="@string/network_dashboard_title"
@@ -803,13 +802,12 @@
android:icon="@drawable/ic_wallpaper"
android:taskAffinity="">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.WallpaperTypeSettings" />
android:value="com.android.settings.wallpaper.WallpaperTypeSettings" />
</activity>
<activity android:name="WallpaperSuggestionActivity"
<activity android:name=".wallpaper.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" />
@@ -1942,8 +1940,9 @@
android:value="com.android.settings.DevelopmentSettings" />
</activity-alias>
<activity android:name=".AppPicker" android:label="@string/select_application"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />
<activity android:name=".development.AppPicker"
android:label="@string/select_application"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />
<activity android:name="Settings$WebViewAppPickerActivity"
android:label="@string/select_webview_provider_dialog_title">