Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2907f869 authored by Fan Zhang's avatar Fan Zhang
Browse files

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
parent 92c6a453

AndroidManifest.xml

+5 −6
Original line number Diff line number Diff line
@@ -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,7 +1940,8 @@ 
                android:value="com.android.settings.DevelopmentSettings" />

        </activity-alias>



        <activity android:name=".AppPicker" android:label="@string/select_application"

        <activity android:name=".development.AppPicker"

                  android:label="@string/select_application"

                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />



        <activity android:name="Settings$WebViewAppPickerActivity"

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -5718,8 +5718,6 @@ 








    <!-- Home application selection - uninstall button [CHAR LIMIT=80] -->









    <string name="home_app_uninstall_button">Uninstall this application</string>









    <!-- Message to user that Home Settings will be hidden because there is now only one available home application -->









    <string name="only_one_home_message">Home settings will be hidden until you install another home application.</string>

















    <!-- Warning message when changing a global setting for a tablet.[CHAR LIMIT=none] -->









    <string name="global_change_warning" product="tablet">This setting affects all users on this tablet.</string>
































src/com/android/settings/DevelopmentSettings.java



+2
−4






























Original line number
Diff line number
Diff line







@@ -31,7 +31,6 @@ import android.bluetooth.BluetoothCodecConfig;







import android.bluetooth.BluetoothCodecStatus;









import android.bluetooth.BluetoothProfile;









import android.content.BroadcastReceiver;









import android.content.ComponentName;









import android.content.ContentResolver;









import android.content.Context;









import android.content.DialogInterface;








@@ -85,12 +84,11 @@ import android.widget.Toast;

















import com.android.internal.app.LocalePicker;









import com.android.internal.logging.nano.MetricsProto.MetricsEvent;









import com.android.settings.applications.BackgroundCheckSummary;









import com.android.settings.dashboard.DashboardFeatureProvider;









import com.android.settings.development.BugReportPreferenceController;









import com.android.settings.development.AppPicker;









import com.android.settings.development.BugReportInPowerPreferenceController;









import com.android.settings.development.BugReportPreferenceController;









import com.android.settings.development.TelephonyMonitorPreferenceController;









import com.android.settings.fuelgauge.InactiveApps;









import com.android.settings.overlay.FeatureFactory;









import com.android.settings.search.BaseSearchIndexProvider;









import com.android.settings.search.Indexable;
































src/com/android/settings/core/gateway/SettingsGateway.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -36,7 +36,6 @@ import com.android.settings.TestingSettings;







import com.android.settings.TetherSettings;









import com.android.settings.TrustedCredentialsSettings;









import com.android.settings.UserDictionarySettings;









import com.android.settings.WallpaperTypeSettings;









import com.android.settings.WifiCallingSettings;









import com.android.settings.accessibility.AccessibilitySettings;









import com.android.settings.accessibility.AccessibilitySettingsForSetupWizard;








@@ -116,6 +115,7 @@ import com.android.settings.system.SystemDashboardFragment;







import com.android.settings.tts.TextToSpeechSettings;









import com.android.settings.users.UserSettings;









import com.android.settings.vpn2.VpnSettings;









import com.android.settings.wallpaper.WallpaperTypeSettings;









import com.android.settings.webview.WebViewAppPicker;









import com.android.settings.wfd.WifiDisplaySettings;









import com.android.settings.wifi.ConfigureWifiSettings;
































src/com/android/settings/dashboard/DashboardSummary.java



+1
−0






























Original line number
Diff line number
Diff line







@@ -37,6 +37,7 @@ import com.android.settings.dashboard.conditional.ConditionManager;







import com.android.settings.dashboard.conditional.FocusRecyclerView;









import com.android.settings.dashboard.suggestions.SuggestionDismissController;









import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;









import com.android.settings.dashboard.suggestions.SuggestionsChecks;









import com.android.settings.overlay.FeatureFactory;









import com.android.settingslib.SuggestionParser;









import com.android.settingslib.drawer.CategoryKey;