From d515f6724f48a8f809b1875c5bb4063d3934cdcb Mon Sep 17 00:00:00 2001 From: Bill Lin Date: Fri, 19 Nov 2021 10:16:29 +0800 Subject: Fix ACTION_ONE_HANDED_SETTINGS breaks CTS IntentTest The CTS test will check new added intent is expected android.signature.cts.intent.IntentTest#shouldNotFindUnexpectedIntents If the new added intent should belong to allow list, we should add it into cts/tests/signature/intent-check/DynamicConfig.xml However, in One handed mode case, I think it's make sense to define in settings provider frameworks/base/core/java/android/provider/Settings.java Test: atest android.signature.cts.intent.IntentTest Fixes: 206824091 Fixes: 206989400 Change-Id: Ibee10261a780737a83f5e5b3dff5c20bc31ceafe --- core/java/android/content/Intent.java | 9 --------- .../src/com/android/systemui/qs/tiles/OneHandedModeTile.java | 3 ++- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index fccb8a785166..3c9b1f81da8a 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1563,15 +1563,6 @@ public class Intent implements Parcelable, Cloneable { @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_POWER_USAGE_SUMMARY = "android.intent.action.POWER_USAGE_SUMMARY"; - /** - * Activity Action: Show one-handed mode settings to the user. - *

Input: Nothing. - *

Output: Nothing. - * @hide - */ - public static final String ACTION_ONE_HANDED_SETTINGS = - "android.intent.action.ONE_HANDED_SETTINGS"; - /** * Activity Action: Setup wizard action provided for OTA provisioning to determine if it needs * to run. diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/OneHandedModeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/OneHandedModeTile.java index c8d2cdc1e478..d4525df38de3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/OneHandedModeTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/OneHandedModeTile.java @@ -105,7 +105,8 @@ public class OneHandedModeTile extends QSTileImpl { @Override public Intent getLongClickIntent() { - return new Intent(Intent.ACTION_ONE_HANDED_SETTINGS); + // TODO(b/201743873) define new intent action ACTION_ONE_HANDED_SETTINGS in Settings. + return null; } @Override -- cgit v1.2.3-59-g8ed1b