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
This commit is contained in:
@@ -0,0 +1,56 @@
|
||||
/*
|
||||
* Copyright (C) 2017 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.wallpaper;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
|
||||
import com.android.internal.logging.nano.MetricsProto;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.Utils;
|
||||
|
||||
public class WallpaperSuggestionActivity extends Activity {
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
final PackageManager pm = getPackageManager();
|
||||
final 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);
|
||||
if (pm.resolveActivity(intent, 0) != null) {
|
||||
startActivity(intent);
|
||||
} else {
|
||||
startFallbackSuggestion();
|
||||
}
|
||||
|
||||
finish();
|
||||
}
|
||||
|
||||
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
|
||||
void startFallbackSuggestion() {
|
||||
// fall back to default wallpaper picker
|
||||
Utils.startWithFragment(this, WallpaperTypeSettings.class.getName(), null, null, 0,
|
||||
R.string.wallpaper_suggestion_title, null,
|
||||
MetricsProto.MetricsEvent.DASHBOARD_SUMMARY);
|
||||
}
|
||||
|
||||
}
|
112
src/com/android/settings/wallpaper/WallpaperTypeSettings.java
Normal file
112
src/com/android/settings/wallpaper/WallpaperTypeSettings.java
Normal file
@@ -0,0 +1,112 @@
|
||||
/*
|
||||
* Copyright (C) 2017 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.wallpaper;
|
||||
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.pm.ResolveInfo;
|
||||
import android.os.Bundle;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsPreferenceFragment;
|
||||
import com.android.settings.search.BaseSearchIndexProvider;
|
||||
import com.android.settings.search.Indexable;
|
||||
import com.android.settings.search.SearchIndexableRaw;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class WallpaperTypeSettings extends SettingsPreferenceFragment implements Indexable {
|
||||
|
||||
@Override
|
||||
public int getMetricsCategory() {
|
||||
return MetricsEvent.WALLPAPER_TYPE;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getHelpResource() {
|
||||
return R.string.help_uri_wallpaper;
|
||||
}
|
||||
|
||||
@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
|
||||
final Intent intent = new Intent(Intent.ACTION_SET_WALLPAPER);
|
||||
final PackageManager pm = getPackageManager();
|
||||
final 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(getPrefContext());
|
||||
pref.setLayoutResource(R.layout.preference_wallpaper_type);
|
||||
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);
|
||||
pref.setIcon(info.loadIcon(pm));
|
||||
parent.addPreference(pref);
|
||||
}
|
||||
}
|
||||
|
||||
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||
new BaseSearchIndexProvider() {
|
||||
@Override
|
||||
public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
|
||||
final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
|
||||
|
||||
final Intent intent = new Intent(Intent.ACTION_SET_WALLPAPER);
|
||||
final PackageManager pm = context.getPackageManager();
|
||||
final List<ResolveInfo> rList = pm.queryIntentActivities(intent,
|
||||
PackageManager.MATCH_DEFAULT_ONLY);
|
||||
|
||||
// Add indexable data for each of the matching activities
|
||||
for (ResolveInfo info : rList) {
|
||||
CharSequence label = info.loadLabel(pm);
|
||||
if (label == null) label = info.activityInfo.packageName;
|
||||
|
||||
SearchIndexableRaw data = new SearchIndexableRaw(context);
|
||||
data.title = label.toString();
|
||||
data.screenTitle = context.getResources().getString(
|
||||
R.string.wallpaper_settings_fragment_title);
|
||||
data.intentAction = Intent.ACTION_SET_WALLPAPER;
|
||||
data.intentTargetPackage = info.activityInfo.packageName;
|
||||
data.intentTargetClass = info.activityInfo.name;
|
||||
result.add(data);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
};
|
||||
}
|
Reference in New Issue
Block a user