Changing the WallpaperSuggestionActivity to redirect to the actual
wallpaper picker component defined in the config.
Bug: 28554244
Change-Id: Iebd38b8fee13608e060acb2b52332014c5c3d87e
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8b9f368..572f3ff 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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"
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 1bf1e0e..1aae590 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -131,7 +131,6 @@
public static class WifiCallingSuggestionActivity extends SettingsActivity { /* empty */ }
public static class ZenModeAutomationSuggestionActivity extends SettingsActivity { /* empty */ }
- public static class WallpaperSuggestionActivity extends SettingsActivity { /* empty */ }
public static class FingerprintSuggestionActivity extends FingerprintSettings { /* empty */ }
public static class FingerprintEnrollSuggestionActivity extends FingerprintEnrollIntroduction {
/* empty */
diff --git a/src/com/android/settings/WallpaperSuggestionActivity.java b/src/com/android/settings/WallpaperSuggestionActivity.java
new file mode 100644
index 0000000..d264e4a
--- /dev/null
+++ b/src/com/android/settings/WallpaperSuggestionActivity.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class WallpaperSuggestionActivity extends Activity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ Intent intent = new Intent()
+ .setClassName(getString(R.string.config_wallpaper_picker_package),
+ getString(R.string.config_wallpaper_picker_class))
+ .addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+ startActivity(intent);
+ finish();
+ }
+}
diff --git a/src/com/android/settings/dashboard/SuggestionsChecks.java b/src/com/android/settings/dashboard/SuggestionsChecks.java
index 0ce82ad..bde9035 100644
--- a/src/com/android/settings/dashboard/SuggestionsChecks.java
+++ b/src/com/android/settings/dashboard/SuggestionsChecks.java
@@ -32,9 +32,9 @@
import com.android.settings.Settings.FingerprintEnrollSuggestionActivity;
import com.android.settings.Settings.FingerprintSuggestionActivity;
import com.android.settings.Settings.ScreenLockSuggestionActivity;
-import com.android.settings.Settings.WallpaperSuggestionActivity;
import com.android.settings.Settings.WifiCallingSuggestionActivity;
import com.android.settings.Settings.ZenModeAutomationSuggestionActivity;
+import com.android.settings.WallpaperSuggestionActivity;
import com.android.settingslib.drawer.Tile;
import java.util.Collection;
