Refactor shortcut updating, and do it on BOOT_COMPLETE
This CL shuffles quite a bit of code around, but the effective differences are: * Unified shortcut updating code (language switch & backup restoration). * Shortcuts are also updated on boot (flagged by MODES_UI which will need this). * Removed usage of (long obsolete) AsyncTask. A further CL will add some special-casing for the DND->Modes shortcut transition. Bug: 365545604 Test: atest com.android.settings.shortcut + manual (switch language, reboot) Flag: android.app.modes_ui Change-Id: I30450d13cb05008d2a71ed89d4781eb81e5532b9
This commit is contained in:
Matías Hernández
@@ -16,27 +16,19 @@
|
||||
|
||||
package com.android.settings.shortcut;
|
||||
|
||||
import static com.android.settings.shortcut.Shortcuts.SHORTCUT_PROBE;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.ActivityInfo;
|
||||
import android.content.pm.ApplicationInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.pm.ResolveInfo;
|
||||
import android.content.pm.ShortcutInfo;
|
||||
import android.content.pm.ShortcutManager;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.graphics.drawable.Icon;
|
||||
import android.graphics.drawable.LayerDrawable;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.util.Log;
|
||||
import android.view.ContextThemeWrapper;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.ImageView;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.preference.Preference;
|
||||
@@ -48,7 +40,6 @@ import com.android.settings.Settings;
|
||||
import com.android.settings.Settings.DataUsageSummaryActivity;
|
||||
import com.android.settings.Settings.TetherSettingsActivity;
|
||||
import com.android.settings.Settings.WifiTetherSettingsActivity;
|
||||
import com.android.settings.activityembedding.ActivityEmbeddingUtils;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.gestures.OneHandedSettingsUtils;
|
||||
import com.android.settings.network.SubscriptionUtil;
|
||||
@@ -69,11 +60,6 @@ public class CreateShortcutPreferenceController extends BasePreferenceController
|
||||
|
||||
private static final String TAG = "CreateShortcutPrefCtrl";
|
||||
|
||||
static final String SHORTCUT_ID_PREFIX = "component-shortcut-";
|
||||
static final Intent SHORTCUT_PROBE = new Intent(Intent.ACTION_MAIN)
|
||||
.addCategory("com.android.settings.SHORTCUT")
|
||||
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
|
||||
private final ShortcutManager mShortcutManager;
|
||||
private final PackageManager mPackageManager;
|
||||
private final ConnectivityManager mConnectivityManager;
|
||||
@@ -132,9 +118,7 @@ public class CreateShortcutPreferenceController extends BasePreferenceController
|
||||
if (mHost == null) {
|
||||
return false;
|
||||
}
|
||||
final Intent shortcutIntent = createResultIntent(
|
||||
buildShortcutIntent(uiContext, info),
|
||||
info, clickTarget.getTitle());
|
||||
final Intent shortcutIntent = createResultIntent(info);
|
||||
mHost.setResult(Activity.RESULT_OK, shortcutIntent);
|
||||
logCreateShortcut(info);
|
||||
mHost.finish();
|
||||
@@ -149,21 +133,20 @@ public class CreateShortcutPreferenceController extends BasePreferenceController
|
||||
* launcher widget using this intent.
|
||||
*/
|
||||
@VisibleForTesting
|
||||
Intent createResultIntent(Intent shortcutIntent, ResolveInfo resolveInfo,
|
||||
CharSequence label) {
|
||||
ShortcutInfo info = createShortcutInfo(mContext, shortcutIntent, resolveInfo, label);
|
||||
Intent createResultIntent(ResolveInfo resolveInfo) {
|
||||
ShortcutInfo info = Shortcuts.createShortcutInfo(mContext, resolveInfo);
|
||||
Intent intent = mShortcutManager.createShortcutResultIntent(info);
|
||||
if (intent == null) {
|
||||
intent = new Intent();
|
||||
}
|
||||
intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
|
||||
Intent.ShortcutIconResource.fromContext(mContext, R.mipmap.ic_launcher_settings))
|
||||
.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent)
|
||||
.putExtra(Intent.EXTRA_SHORTCUT_NAME, label);
|
||||
.putExtra(Intent.EXTRA_SHORTCUT_INTENT, info.getIntent())
|
||||
.putExtra(Intent.EXTRA_SHORTCUT_NAME, info.getShortLabel());
|
||||
|
||||
final ActivityInfo activityInfo = resolveInfo.activityInfo;
|
||||
if (activityInfo.icon != 0) {
|
||||
intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, createIcon(
|
||||
intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, Shortcuts.createIcon(
|
||||
mContext,
|
||||
activityInfo.applicationInfo,
|
||||
activityInfo.icon,
|
||||
@@ -239,87 +222,6 @@ public class CreateShortcutPreferenceController extends BasePreferenceController
|
||||
info.activityInfo.name);
|
||||
}
|
||||
|
||||
private static Intent buildShortcutIntent(Context context, ResolveInfo info) {
|
||||
Intent intent = new Intent(SHORTCUT_PROBE)
|
||||
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP)
|
||||
.setClassName(info.activityInfo.packageName, info.activityInfo.name);
|
||||
if (ActivityEmbeddingUtils.isEmbeddingActivityEnabled(context)) {
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
|
||||
}
|
||||
return intent;
|
||||
}
|
||||
|
||||
private static ShortcutInfo createShortcutInfo(Context context, Intent shortcutIntent,
|
||||
ResolveInfo resolveInfo, CharSequence label) {
|
||||
final ActivityInfo activityInfo = resolveInfo.activityInfo;
|
||||
|
||||
final Icon maskableIcon;
|
||||
if (activityInfo.icon != 0 && activityInfo.applicationInfo != null) {
|
||||
maskableIcon = Icon.createWithAdaptiveBitmap(createIcon(
|
||||
context,
|
||||
activityInfo.applicationInfo, activityInfo.icon,
|
||||
R.layout.shortcut_badge_maskable,
|
||||
context.getResources().getDimensionPixelSize(R.dimen.shortcut_size_maskable)));
|
||||
} else {
|
||||
maskableIcon = Icon.createWithResource(context, R.drawable.ic_launcher_settings);
|
||||
}
|
||||
final String shortcutId = SHORTCUT_ID_PREFIX +
|
||||
shortcutIntent.getComponent().flattenToShortString();
|
||||
return new ShortcutInfo.Builder(context, shortcutId)
|
||||
.setShortLabel(label)
|
||||
.setIntent(shortcutIntent)
|
||||
.setIcon(maskableIcon)
|
||||
.build();
|
||||
}
|
||||
|
||||
private static Bitmap createIcon(Context context, ApplicationInfo app, int resource,
|
||||
int layoutRes, int size) {
|
||||
final Context themedContext = new ContextThemeWrapper(context,
|
||||
android.R.style.Theme_Material);
|
||||
final View view = LayoutInflater.from(themedContext).inflate(layoutRes, null);
|
||||
final int spec = View.MeasureSpec.makeMeasureSpec(size, View.MeasureSpec.EXACTLY);
|
||||
view.measure(spec, spec);
|
||||
final Bitmap bitmap = Bitmap.createBitmap(view.getMeasuredWidth(), view.getMeasuredHeight(),
|
||||
Bitmap.Config.ARGB_8888);
|
||||
final Canvas canvas = new Canvas(bitmap);
|
||||
|
||||
Drawable iconDrawable;
|
||||
try {
|
||||
iconDrawable = context.getPackageManager().getResourcesForApplication(app)
|
||||
.getDrawable(resource, themedContext.getTheme());
|
||||
if (iconDrawable instanceof LayerDrawable) {
|
||||
iconDrawable = ((LayerDrawable) iconDrawable).getDrawable(1);
|
||||
}
|
||||
((ImageView) view.findViewById(android.R.id.icon)).setImageDrawable(iconDrawable);
|
||||
} catch (PackageManager.NameNotFoundException e) {
|
||||
Log.w(TAG, "Cannot load icon from app " + app + ", returning a default icon");
|
||||
Icon icon = Icon.createWithResource(context, R.drawable.ic_launcher_settings);
|
||||
((ImageView) view.findViewById(android.R.id.icon)).setImageIcon(icon);
|
||||
}
|
||||
|
||||
view.layout(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight());
|
||||
view.draw(canvas);
|
||||
return bitmap;
|
||||
}
|
||||
|
||||
public static void updateRestoredShortcuts(Context context) {
|
||||
ShortcutManager sm = context.getSystemService(ShortcutManager.class);
|
||||
List<ShortcutInfo> updatedShortcuts = new ArrayList<>();
|
||||
for (ShortcutInfo si : sm.getPinnedShortcuts()) {
|
||||
if (si.getId().startsWith(SHORTCUT_ID_PREFIX)) {
|
||||
ResolveInfo ri = context.getPackageManager().resolveActivity(si.getIntent(), 0);
|
||||
|
||||
if (ri != null) {
|
||||
updatedShortcuts.add(createShortcutInfo(context,
|
||||
buildShortcutIntent(context, ri), ri, si.getShortLabel()));
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!updatedShortcuts.isEmpty()) {
|
||||
sm.updateShortcuts(updatedShortcuts);
|
||||
}
|
||||
}
|
||||
|
||||
private static final Comparator<ResolveInfo> SHORTCUT_COMPARATOR =
|
||||
(i1, i2) -> i1.priority - i2.priority;
|
||||
}
|
||||
|
||||
118
src/com/android/settings/shortcut/Shortcuts.java
Normal file
118
src/com/android/settings/shortcut/Shortcuts.java
Normal file
@@ -0,0 +1,118 @@
|
||||
/*
|
||||
* Copyright (C) 2024 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.shortcut;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkArgument;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.ActivityInfo;
|
||||
import android.content.pm.ApplicationInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.pm.ResolveInfo;
|
||||
import android.content.pm.ShortcutInfo;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.graphics.drawable.Icon;
|
||||
import android.graphics.drawable.LayerDrawable;
|
||||
import android.util.Log;
|
||||
import android.view.ContextThemeWrapper;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.ImageView;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.activityembedding.ActivityEmbeddingUtils;
|
||||
|
||||
class Shortcuts {
|
||||
|
||||
private static final String TAG = "Shortcuts";
|
||||
|
||||
static final String SHORTCUT_ID_PREFIX = "component-shortcut-";
|
||||
static final Intent SHORTCUT_PROBE = new Intent(Intent.ACTION_MAIN)
|
||||
.addCategory("com.android.settings.SHORTCUT")
|
||||
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
|
||||
static ShortcutInfo createShortcutInfo(Context context, ResolveInfo target) {
|
||||
checkArgument(target.activityInfo != null);
|
||||
String shortcutId = SHORTCUT_ID_PREFIX
|
||||
+ target.activityInfo.getComponentName().flattenToShortString();
|
||||
|
||||
return createShortcutInfo(context, shortcutId, target);
|
||||
}
|
||||
|
||||
static ShortcutInfo createShortcutInfo(Context context, String id, ResolveInfo target) {
|
||||
Intent intent = new Intent(SHORTCUT_PROBE)
|
||||
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP)
|
||||
.setClassName(target.activityInfo.packageName, target.activityInfo.name);
|
||||
if (ActivityEmbeddingUtils.isEmbeddingActivityEnabled(context)) {
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
|
||||
}
|
||||
|
||||
CharSequence label = target.loadLabel(context.getPackageManager());
|
||||
Icon maskableIcon = getMaskableIcon(context, target.activityInfo);
|
||||
|
||||
return new ShortcutInfo.Builder(context, id)
|
||||
.setIntent(intent)
|
||||
.setShortLabel(label)
|
||||
.setIcon(maskableIcon)
|
||||
.build();
|
||||
}
|
||||
|
||||
private static Icon getMaskableIcon(Context context, ActivityInfo activityInfo) {
|
||||
if (activityInfo.icon != 0 && activityInfo.applicationInfo != null) {
|
||||
return Icon.createWithAdaptiveBitmap(createIcon(
|
||||
context,
|
||||
activityInfo.applicationInfo, activityInfo.icon,
|
||||
R.layout.shortcut_badge_maskable,
|
||||
context.getResources().getDimensionPixelSize(R.dimen.shortcut_size_maskable)));
|
||||
} else {
|
||||
return Icon.createWithResource(context, R.drawable.ic_launcher_settings);
|
||||
}
|
||||
}
|
||||
|
||||
static Bitmap createIcon(Context context, ApplicationInfo app, int resource, int layoutRes,
|
||||
int size) {
|
||||
final Context themedContext = new ContextThemeWrapper(context,
|
||||
android.R.style.Theme_Material);
|
||||
final View view = LayoutInflater.from(themedContext).inflate(layoutRes, null);
|
||||
final int spec = View.MeasureSpec.makeMeasureSpec(size, View.MeasureSpec.EXACTLY);
|
||||
view.measure(spec, spec);
|
||||
final Bitmap bitmap = Bitmap.createBitmap(view.getMeasuredWidth(), view.getMeasuredHeight(),
|
||||
Bitmap.Config.ARGB_8888);
|
||||
final Canvas canvas = new Canvas(bitmap);
|
||||
|
||||
Drawable iconDrawable;
|
||||
try {
|
||||
iconDrawable = context.getPackageManager().getResourcesForApplication(app)
|
||||
.getDrawable(resource, themedContext.getTheme());
|
||||
if (iconDrawable instanceof LayerDrawable) {
|
||||
iconDrawable = ((LayerDrawable) iconDrawable).getDrawable(1);
|
||||
}
|
||||
((ImageView) view.findViewById(android.R.id.icon)).setImageDrawable(iconDrawable);
|
||||
} catch (PackageManager.NameNotFoundException e) {
|
||||
Log.w(TAG, "Cannot load icon from app " + app + ", returning a default icon");
|
||||
Icon icon = Icon.createWithResource(context, R.drawable.ic_launcher_settings);
|
||||
((ImageView) view.findViewById(android.R.id.icon)).setImageIcon(icon);
|
||||
}
|
||||
|
||||
view.layout(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight());
|
||||
view.draw(canvas);
|
||||
return bitmap;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
/*
|
||||
* Copyright (C) 2024 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.shortcut;
|
||||
|
||||
import android.app.Flags;
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.android.settingslib.utils.ThreadUtils;
|
||||
|
||||
public class ShortcutsUpdateReceiver extends BroadcastReceiver {
|
||||
|
||||
private static final String TAG = "ShortcutsUpdateReceiver";
|
||||
|
||||
@Override
|
||||
public void onReceive(@NonNull Context context, @NonNull Intent intent) {
|
||||
if (!Flags.modesApi() || !Flags.modesUi()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
|
||||
PendingResult pendingResult = goAsync();
|
||||
|
||||
ThreadUtils.getBackgroundExecutor().execute(() -> {
|
||||
try {
|
||||
ShortcutsUpdater.updatePinnedShortcuts(context);
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "Error trying to update Settings shortcuts", e);
|
||||
} finally {
|
||||
pendingResult.finish();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -16,8 +16,10 @@
|
||||
|
||||
package com.android.settings.shortcut;
|
||||
|
||||
import static com.android.settings.shortcut.CreateShortcutPreferenceController.SHORTCUT_ID_PREFIX;
|
||||
import static com.android.settings.shortcut.CreateShortcutPreferenceController.SHORTCUT_PROBE;
|
||||
import static com.android.settings.shortcut.Shortcuts.SHORTCUT_ID_PREFIX;
|
||||
import static com.android.settings.shortcut.Shortcuts.SHORTCUT_PROBE;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
@@ -26,23 +28,22 @@ import android.content.pm.PackageManager;
|
||||
import android.content.pm.ResolveInfo;
|
||||
import android.content.pm.ShortcutInfo;
|
||||
import android.content.pm.ShortcutManager;
|
||||
import android.os.AsyncTask;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class ShortcutsUpdateTask extends AsyncTask<Void, Void, Void> {
|
||||
public class ShortcutsUpdater {
|
||||
|
||||
private final Context mContext;
|
||||
|
||||
public ShortcutsUpdateTask(Context context) {
|
||||
mContext = context;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Void doInBackground(Void... params) {
|
||||
ShortcutManager sm = mContext.getSystemService(ShortcutManager.class);
|
||||
PackageManager pm = mContext.getPackageManager();
|
||||
/**
|
||||
* Update label, icon, and intent of pinned shortcuts to Settings subpages.
|
||||
*
|
||||
* <p>Should be called whenever any of those could have changed, such as after changing locale,
|
||||
* restoring a backup from a different device, or when flags controlling available features
|
||||
* may have flipped.
|
||||
*/
|
||||
public static void updatePinnedShortcuts(Context context) {
|
||||
ShortcutManager sm = checkNotNull(context.getSystemService(ShortcutManager.class));
|
||||
PackageManager pm = context.getPackageManager();
|
||||
|
||||
List<ShortcutInfo> updates = new ArrayList<>();
|
||||
for (ShortcutInfo info : sm.getPinnedShortcuts()) {
|
||||
@@ -55,12 +56,10 @@ public class ShortcutsUpdateTask extends AsyncTask<Void, Void, Void> {
|
||||
if (ri == null) {
|
||||
continue;
|
||||
}
|
||||
updates.add(new ShortcutInfo.Builder(mContext, info.getId())
|
||||
.setShortLabel(ri.loadLabel(pm)).build());
|
||||
updates.add(Shortcuts.createShortcutInfo(context, info.getId(), ri));
|
||||
}
|
||||
if (!updates.isEmpty()) {
|
||||
sm.updateShortcuts(updates);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user