From e157e875140fb62fa577be4945c1e9ce2d895fd4 Mon Sep 17 00:00:00 2001 From: Jinsuk Kim Date: Mon, 27 Mar 2023 21:14:45 +0000 Subject: [PATCH] [PCCT-SideSheet] Set the extra flags name correctly Removes unnecessary prefix from flag names. (cherry picked from commit 28fa3fe627dd03886556f4abedebe587f4cde842) Bug: 1427215 Change-Id: I3227464bab2584510f8ab2616fa3e88db1302b57 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4369074 Commit-Queue: Jinsuk Kim Code-Coverage: Findit Reviewed-by: Kevin Grosu Reviewed-by: Theresa Sullivan Cr-Original-Commit-Position: refs/heads/main@{#1121861} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4374832 Cr-Commit-Position: refs/branch-heads/5672@{#55} Cr-Branched-From: 5f2a72468eda1eb945b3b5a2298b5d1cd678521e-refs/heads/main@{#1121455} --- .../browser/customtabs/CustomTabIntentDataProvider.java | 6 +++--- .../java/org/chromium/customtabsclient/MainActivity.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java index 0171b6c41fcd48..679accb5b4c617 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java @@ -112,14 +112,14 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid * layout. */ public static final String EXTRA_ACTIVITY_SIDE_SHEET_POSITION = - "androidx.browser.customtabs.extra.EXTRA_ACTIVITY_SIDE_SHEET_POSITION"; + "androidx.browser.customtabs.extra.ACTIVITY_SIDE_SHEET_POSITION"; /** * Extra that defines the behavior of the opening animation of the side sheet. * It is set to {@link #ACTIVITY_SIDE_SHEET_SLIDE_IN_FROM_SIDE} by default. */ public static final String EXTRA_ACTIVITY_SIDE_SHEET_SLIDE_IN_BEHAVIOR = - "androidx.browser.customtabs.extra.EXTRA_ACTIVITY_SIDE_SHEET_SLIDE_IN_BEHAVIOR"; + "androidx.browser.customtabs.extra.ACTIVITY_SIDE_SHEET_SLIDE_IN_BEHAVIOR"; /** * Extra used to keep the caller alive. Its value is an Intent. @@ -260,7 +260,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid /** Extra that enables the maximization button on the side sheet Custom Tab toolbar. */ public static final String EXTRA_ACTIVITY_SIDE_SHEET_ENABLE_MAXIMIZATION = - "androix.browser.customtabs.extra.EXTRA_ACTIVITY_SIDE_SHEET_ENABLE_MAXIMIZATION"; + "androix.browser.customtabs.extra.ACTIVITY_SIDE_SHEET_ENABLE_MAXIMIZATION"; /** * Extra that, if set in combination with diff --git a/chrome/browser/android/examples/custom_tabs_client/src/java/org/chromium/customtabsclient/MainActivity.java b/chrome/browser/android/examples/custom_tabs_client/src/java/org/chromium/customtabsclient/MainActivity.java index cd428f4e3d7659..1488b2b4370460 100644 --- a/chrome/browser/android/examples/custom_tabs_client/src/java/org/chromium/customtabsclient/MainActivity.java +++ b/chrome/browser/android/examples/custom_tabs_client/src/java/org/chromium/customtabsclient/MainActivity.java @@ -94,7 +94,7 @@ public class MainActivity /** Extra that enables the maximization button on the side sheet Custom Tab toolbar. */ public static final String EXTRA_ACTIVITY_SIDE_SHEET_ENABLE_MAXIMIZATION = - "androix.browser.customtabs.extra.EXTRA_ACTIVITY_SIDE_SHEET_ENABLE_MAXIMIZATION"; + "androix.browser.customtabs.extra.ACTIVITY_SIDE_SHEET_ENABLE_MAXIMIZATION"; /** * Minimal height the bottom sheet CCT should show is half of the display height. @@ -152,14 +152,14 @@ public class MainActivity public static final int ACTIVITY_SIDE_SHEET_POSITION_END = 2; public static final String EXTRA_ACTIVITY_SIDE_SHEET_POSITION = - "androidx.browser.customtabs.extra.EXTRA_ACTIVITY_SIDE_SHEET_POSITION"; + "androidx.browser.customtabs.extra.ACTIVITY_SIDE_SHEET_POSITION"; public static final int ACTIVITY_SIDE_SHEET_SLIDE_IN_DEFAULT = 0; public static final int ACTIVITY_SIDE_SHEET_SLIDE_IN_FROM_BOTTOM = 1; public static final int ACTIVITY_SIDE_SHEET_SLIDE_IN_FROM_SIDE = 2; public static final String EXTRA_ACTIVITY_SIDE_SHEET_SLIDE_IN_BEHAVIOR = - "androidx.browser.customtabs.extra.EXTRA_ACTIVITY_SIDE_SHEET_SLIDE_IN_BEHAVIOR"; + "androidx.browser.customtabs.extra.ACTIVITY_SIDE_SHEET_SLIDE_IN_BEHAVIOR"; /** * Once per second, asks the framework for the process importance, and logs any change.