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

Commit d4aa9273 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Intent to LockscreenSettings page on wallet overflow menu clicked."... 

Merge "Intent to LockscreenSettings page on wallet overflow menu clicked." into sc-dev am: e265a992 am: 596e388a

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

Change-Id: Idcad2b5d78bfaa207d5b323758ec589c2d5c150b
parents 000beba2 596e388a

core/java/android/provider/Settings.java

+15 −0
Original line number Diff line number Diff line
@@ -921,6 +921,21 @@ public final class Settings { 
    public static final String ACTION_LOCALE_SETTINGS =

            "android.settings.LOCALE_SETTINGS";













    /**













     * Activity Action: Show settings to allow configuration of lockscreen.













     * <p>













     * In some cases, a matching Activity may not exist, so ensure you













     * safeguard against this.













     * <p>













     * Input: Nothing.













     * <p>













     * Output: Nothing.













     *













     * @hide













     */













    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)













    public static final String ACTION_LOCKSCREEN_SETTINGS = "android.settings.LOCK_SCREEN_SETTINGS";



























    /**















     * Activity Action: Show settings to configure input methods, in particular















     * allowing the user to enable input methods.

































packages/SystemUI/src/com/android/systemui/wallet/ui/WalletActivity.java



+7
−1






























Original line number
Diff line number
Diff line








@@ -16,6 +16,9 @@





























package com.android.systemui.wallet.ui;





























import static android.provider.Settings.ACTION_LOCKSCREEN_SETTINGS;



























import android.content.Intent;















import android.graphics.Color;















import android.graphics.drawable.Drawable;















import android.os.Bundle;










@@ -178,7 +181,10 @@ public class WalletActivity extends LifecycleActivity {













            finish();















            return true;















        } else if (itemId == R.id.wallet_lockscreen_settings) {













            // TODO(b/186496392): Navigate to Lock Screen Settings page when the item is clicked.













            Intent intent =













                    new Intent(ACTION_LOCKSCREEN_SETTINGS)













                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);













            mActivityStarter.startActivity(intent, true);















            return true;















        }















        return super.onOptionsItemSelected(item);