commit 2907f869715fee03b2caf45e8a174aff87f07821
author Fan Zhang <zhfan@google.com> Fri Mar 17 15:05:14 2017 -0700
committer Fan Zhang <zhfan@google.com> Fri Mar 17 16:49:58 2017 -0700
tree 114bae7cca5a7d847849e0c182d3d6c09311a03e
parent 92c6a453586bb4319f48ab50c1882fa6ad223a0f

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

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 07d7ecc..0c5c6ef 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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">