Merge "Intent to LockscreenSettings page on wallet overflow menu clicked." into sc-dev (e265a992) · Commits · e / os / android_frameworks_base

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.

+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);