diff options
author | Amith Yamasani <yamasani@google.com> | 2011-06-16 16:55:28 -0700 |
---|---|---|
committer | Amith Yamasani <yamasani@google.com> | 2011-06-16 17:48:40 -0700 |
commit | fcbf7cffb6e16b202006d306bafaace97508332b (patch) | |
tree | 4b1bc5a5a4d95f657afe173e799897d23dd6cefe | |
parent | 0ae7893ab9fe205a0d69a8dce6cc4b87b9eb0ba2 (diff) | |
download | packages_apps_Settings-fcbf7cffb6e16b202006d306bafaace97508332b.tar.gz packages_apps_Settings-fcbf7cffb6e16b202006d306bafaace97508332b.tar.bz2 packages_apps_Settings-fcbf7cffb6e16b202006d306bafaace97508332b.zip |
Wallpaper settings
Added an option in Screen settings to choose a wallpaper.
It then shows a list of wallpaper sources and launches the
corresponding intent on selecting.
Bug: 4691375
Change-Id: I9de9edf56ae4cdd5145a1c5d836df66b893a05fe
-rw-r--r-- | res/values/strings.xml | 2 | ||||
-rw-r--r-- | res/xml/display_settings.xml | 8 | ||||
-rw-r--r-- | res/xml/wallpaper_settings.xml | 20 | ||||
-rw-r--r-- | src/com/android/settings/WallpaperTypeSettings.java | 59 |
4 files changed, 88 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 3bb8dc311..6c1ca6fd4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1450,6 +1450,8 @@ <string name="screen_timeout">Timeout</string> <!-- Sound & display settings screen, setting option summary to change screen timeout --> <string name="screen_timeout_summary">Screen turns off automatically after <xliff:g id="timeout_description">%1$s</xliff:g></string> + <!-- Wallpaper settings title [CHAR LIMIT=30] --> + <string name="wallpaper_settings_title">Wallpaper</string> <!-- Display settings screen, trigger for screen saver options --> <string name="dream_settings_title">Android Dreams</string> <!-- Display settings screen, summary for screen saver options --> diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index 03d9641ef..b0abd9a27 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -41,7 +41,13 @@ android:persistent="false" android:entries="@array/screen_timeout_entries" android:entryValues="@array/screen_timeout_values" /> - + + <PreferenceScreen + android:key="wallpaper" + android:title="@string/wallpaper_settings_title" + android:fragment="com.android.settings.WallpaperTypeSettings" + /> + <PreferenceScreen android:title="@string/dream_settings_title" android:summary="@string/dream_settings_summary" diff --git a/res/xml/wallpaper_settings.xml b/res/xml/wallpaper_settings.xml new file mode 100644 index 000000000..63346f7ac --- /dev/null +++ b/res/xml/wallpaper_settings.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- 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. +--> + +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + android:title="@string/wallpaper_settings_title"> + +</PreferenceScreen> diff --git a/src/com/android/settings/WallpaperTypeSettings.java b/src/com/android/settings/WallpaperTypeSettings.java new file mode 100644 index 000000000..fa0b4e490 --- /dev/null +++ b/src/com/android/settings/WallpaperTypeSettings.java @@ -0,0 +1,59 @@ +/* + * 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.content.ComponentName; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.graphics.drawable.Drawable; +import android.os.Bundle; +import android.preference.Preference; + +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); + + // 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); + getPreferenceScreen().addPreference(pref); + } + } +} |