Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Intent to LockscreenSettings page on wallet overflow menu clicked." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-17 17:48:18 +00:00
committed by Android (Google) Code Review
parent 234adf7cb2 dbc335b1c1
commit e265a992a6
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/provider/Settings.java
View File

@@ -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.

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

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