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

Commit 4dae8c27 authored by Sunny Goyal's avatar Sunny Goyal Committed by android-build-merger
Browse files

Merge \"Changing the WallpaperSuggestionActivity to redirect to the actual... 

Merge \"Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config.\" into nyc-mr1-dev
am: fef6234e

Change-Id: I602f81cfeea807b3c63799eb7b9985e0053ed583
parents d2961ede fef6234e

AndroidManifest.xml

+7 −9
Original line number Diff line number Diff line
@@ -856,17 +856,15 @@ 
                       android:value="com.android.settings.WallpaperTypeSettings" />

        </activity>



        <activity android:name="Settings$WallpaperSuggestionActivity"

        <activity android:name="WallpaperSuggestionActivity"

                  android:label="@string/wallpaper_settings_title"

                android:exported="true"

                  android:icon="@drawable/ic_wallpaper"

                android:taskAffinity="">

                  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" />

            <meta-data android:name="com.android.settings.summary"

src/com/android/settings/Settings.java

+0 −1
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ public class Settings extends SettingsActivity { 


    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 */

src/com/android/settings/WallpaperSuggestionActivity.java

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * 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();

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ import com.android.ims.ImsManager; 
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;