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

Commit 71134e8d authored by Simran Basi's avatar Simran Basi Committed by Automerger Merge Worker
Browse files

Merge "Delete attribute useTargetActivityForQuickAccess." into tm-dev am: ab7ee498 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17455673



Change-Id: I34ce5272254a850578c301aa570e9b71b5a8be51
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 922be204 ab7ee498

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -1651,7 +1651,6 @@ package android { 
    field public static final int useEmbeddedDex = 16844190; // 0x101059e

    field public static final int useIntrinsicSizeAsMinimum = 16843536; // 0x1010310

    field public static final int useLevel = 16843167; // 0x101019f

    field public static final int useTargetActivityForQuickAccess;

    field public static final int userVisible = 16843409; // 0x1010291

    field public static final int usesCleartextTraffic = 16844012; // 0x10104ec

    field public static final int usesPermissionFlags = 16844356; // 0x1010644

core/api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -2404,7 +2404,6 @@ package android.service.quickaccesswallet { 
    method public void notifyWalletDismissed();

    method public void removeWalletServiceEventListener(@NonNull android.service.quickaccesswallet.QuickAccessWalletClient.WalletServiceEventListener);

    method public void selectWalletCard(@NonNull android.service.quickaccesswallet.SelectWalletCardRequest);

    method public boolean useTargetActivityForQuickAccess();

  }



  public static interface QuickAccessWalletClient.OnWalletCardsRetrievedCallback {

core/java/android/service/quickaccesswallet/QuickAccessWalletClient.java

+0 −11
Original line number Diff line number Diff line
@@ -240,15 +240,4 @@ public interface QuickAccessWalletClient extends Closeable { 
     */

    @Nullable

    CharSequence getShortcutLongLabel();



    /**

     * Return whether the system should use the component specified by the

     * {@link android:targetActivity} or

     * {@link QuickAccessWalletService#getTargetActivityPendingIntent()}

     * as the "quick access" , invoked directly by the system.

     * If false, the system will use the built-in UI instead of the component specified

     * in {@link android:targetActivity} or

     * {@link QuickAccessWalletService#getTargetActivityPendingIntent()}.

     */

    boolean useTargetActivityForQuickAccess();

}

core/java/android/service/quickaccesswallet/QuickAccessWalletClientImpl.java

+0 −5
Original line number Diff line number Diff line
@@ -350,11 +350,6 @@ public class QuickAccessWalletClientImpl implements QuickAccessWalletClient, Ser 
        return mServiceInfo == null ? null : mServiceInfo.getShortcutLongLabel(mContext);

    }



    @Override

    public boolean useTargetActivityForQuickAccess() {

        return mServiceInfo.getUseTargetActivityForQuickAccess();

    }



    private void connect() {

        mHandler.post(this::connectInternal);

    }

core/java/android/service/quickaccesswallet/QuickAccessWalletService.java

+8 −0
Original line number Diff line number Diff line
@@ -336,6 +336,14 @@ public abstract class QuickAccessWalletService extends Service { 
        mHandler.post(() -> sendWalletServiceEventInternal(serviceEvent));

    }



    /**

     * Specify a {@link PendingIntent} to be launched as the "Quick Access" activity.

     *

     * This activity will be launched directly by the system in lieu of the card switcher activity

     * provided by the system.

     *

     * In order to use the system-provided card switcher activity, return null from this method.

     */

    @Nullable

    public PendingIntent getTargetActivityPendingIntent() {

        return null;