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

Commit 38623b00 authored by Matías Hernández's avatar Matías Hernández Committed by Android (Google) Code Review
Browse files

Merge changes I28f7e3e6,I30450d13 into main 

* changes:
  Fix existing DND Settings shortcuts to point to Modes
  Refactor shortcut updating, and do it on BOOT_COMPLETE
parents f2335dc8 31e3f274

AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -5362,6 +5362,14 @@ 
            </intent-filter>

        </receiver>



        <receiver

            android:name=".shortcut.ShortcutsUpdateReceiver"

            android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.BOOT_COMPLETED"/>

            </intent-filter>

        </receiver>



        <!-- This is the longest AndroidManifest.xml ever. -->

    </application>

</manifest>

src/com/android/settings/backup/SettingsBackupHelper.java

+9 −3
Original line number Diff line number Diff line
@@ -16,17 +16,19 @@ 


package com.android.settings.backup;





import android.app.backup.BackupAgentHelper;

import android.util.Log;



import com.android.settings.flags.Flags;

import com.android.settings.onboarding.OnboardingFeatureProvider;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.shortcut.CreateShortcutPreferenceController;

import com.android.settings.shortcut.ShortcutsUpdater;

import com.android.settingslib.datastore.BackupRestoreStorageManager;



/** Backup agent for Settings APK */

public class SettingsBackupHelper extends BackupAgentHelper {

    private static final String TAG = "SettingsBackupHelper";



    public static final String SOUND_BACKUP_HELPER = "SoundSettingsBackup";

    public static final String ACCESSIBILITY_APPEARANCE_BACKUP_HELPER =

            "AccessibilityAppearanceSettingsBackup";
@@ -58,6 +60,10 @@ public class SettingsBackupHelper extends BackupAgentHelper { 
    public void onRestoreFinished() {

        super.onRestoreFinished();

        BackupRestoreStorageManager.getInstance(this).onRestoreFinished();

        CreateShortcutPreferenceController.updateRestoredShortcuts(this);

        try {

            ShortcutsUpdater.updatePinnedShortcuts(this);

        } catch (Exception e) {

            Log.e(TAG, "Error updating shortcuts after restoring backup", e);

        }

    }

}

src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java

+7 −3
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings.localepicker;



import static com.google.common.base.Preconditions.checkNotNull;



import android.app.settings.SettingsEnums;

import android.content.Context;

import android.graphics.Canvas;
@@ -41,7 +43,8 @@ import com.android.internal.app.LocalePicker; 
import com.android.internal.app.LocaleStore;

import com.android.settings.R;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.shortcut.ShortcutsUpdateTask;

import com.android.settings.shortcut.ShortcutsUpdater;

import com.android.settingslib.utils.ThreadUtils;



import java.text.NumberFormat;

import java.util.ArrayList;
@@ -96,7 +99,7 @@ class LocaleDragAndDropAdapter 
    LocaleDragAndDropAdapter(LocaleListEditor parent, List<LocaleStore.LocaleInfo> feedItemList) {

        mFeedItemList = feedItemList;

        mCacheItemList = new ArrayList<>(feedItemList);

        mContext = parent.getContext();

        mContext = checkNotNull(parent.getContext());



        final float dragElevation = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 8,

                mContext.getResources().getDisplayMetrics());
@@ -350,7 +353,8 @@ class LocaleDragAndDropAdapter 


                LocalePicker.updateLocales(mLocalesToSetNext);

                mLocalesSetLast = mLocalesToSetNext;

                new ShortcutsUpdateTask(mContext).execute();

                ThreadUtils.postOnBackgroundThread(

                        () -> ShortcutsUpdater.updatePinnedShortcuts(mContext));



                mLocalesToSetNext = null;

src/com/android/settings/shortcut/CreateShortcutPreferenceController.java

+8 −106
Original line number Diff line number Diff line
@@ -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;

}

src/com/android/settings/shortcut/Shortcuts.java

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

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

    }

}