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

Commit 20bb9f60 authored by Roman Birg's avatar Roman Birg Committed by Steve Kondik
Browse files

Settings: Remove Wallpaper selection from Display 



Let the launcher handle wallpaper selection.

Change-Id: I7f0eb20a5bc01d82fdb98905524b9743fee447c6
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>
parent b71c517b

res/xml/display_settings.xml

+0 −5
Original line number Diff line number Diff line
@@ -32,11 +32,6 @@ 
                android:targetClass="com.android.settings.ScreenColorSettings" />

        </PreferenceScreen>



        <PreferenceScreen

                android:key="wallpaper"

                android:title="@string/wallpaper_settings_title"

                android:fragment="com.android.settings.WallpaperTypeSettings" />



        <PreferenceScreen

            android:key="display_rotation"

            android:fragment="com.android.settings.cyanogenmod.DisplayRotation"

src/com/android/settings/Settings.java

+1 −3
Original line number Diff line number Diff line
@@ -1144,9 +1144,7 @@ public class Settings extends PreferenceActivity 
    public boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {

        // Override the fragment title for Wallpaper settings

        int titleRes = pref.getTitleRes();

        if (pref.getFragment().equals(WallpaperTypeSettings.class.getName())) {

            titleRes = R.string.wallpaper_settings_fragment_title;

        } else if (pref.getFragment().equals(OwnerInfoSettings.class.getName())

        if (pref.getFragment().equals(OwnerInfoSettings.class.getName())

                && UserHandle.myUserId() != UserHandle.USER_OWNER) {

            if (UserManager.get(this).isLinkedUser()) {

                titleRes = R.string.profile_info_settings_title;

src/com/android/settings/WallpaperTypeSettings.java

deleted100644 → 0
+0 −61
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 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.ComponentName;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.os.Bundle;

import android.preference.Preference;

import android.preference.PreferenceScreen;



import java.util.List;



public class WallpaperTypeSettings extends SettingsPreferenceFragment {

    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        addPreferencesFromResource(R.xml.wallpaper_settings);

        populateWallpaperTypes();

    }



    private void populateWallpaperTypes() {

        // Search for activities that satisfy the ACTION_SET_WALLPAPER action

        Intent intent = new Intent(Intent.ACTION_SET_WALLPAPER);

        final PackageManager pm = getPackageManager();

        List<ResolveInfo> rList = pm.queryIntentActivities(intent,

                PackageManager.MATCH_DEFAULT_ONLY);



        final PreferenceScreen parent = getPreferenceScreen();

        parent.setOrderingAsAdded(false);

        // Add Preference items for each of the matching activities

        for (ResolveInfo info : rList) {

            Preference pref = new Preference(getActivity());

            Intent prefIntent = new Intent(intent);

            prefIntent.setComponent(new ComponentName(

                    info.activityInfo.packageName, info.activityInfo.name));

            pref.setIntent(prefIntent);

            CharSequence label = info.loadLabel(pm);

            if (label == null) label = info.activityInfo.packageName;

            pref.setTitle(label);

            parent.addPreference(pref);

        }

    }

}