From a506a48b9f445fb9b1d19c697578617787457594 Mon Sep 17 00:00:00 2001 From: James Willcox Date: Tue, 8 Oct 2024 19:24:35 +0000 Subject: [PATCH 1/2] Don't show default payment component in search if Wallet role is enabled Bug: 372254720 Test: atest PaymentSettingsTest Flag: android.permission.flags.wallet_role_enabled (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1133353e5df414936d6a69d50dcb6e42ad4d0370) Merged-In: I4044d8fcd95db215d4a06b335b3cb96f8a5e3697 Change-Id: I4044d8fcd95db215d4a06b335b3cb96f8a5e3697 --- .../android/settings/nfc/PaymentSettings.java | 4 ++++ .../settings/nfc/PaymentSettingsTest.java | 22 ++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index a1f75bc63d2..28df8ed5989 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -30,6 +30,7 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.internal.hidden_from_bootclasspath.android.permission.flags.Flags; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -120,6 +121,9 @@ public class PaymentSettings extends DashboardFragment { @Override protected boolean isPageSearchEnabled(Context context) { + if (Flags.walletRoleEnabled()) { + return false; + } final UserManager userManager = context.getSystemService(UserManager.class); final UserInfo myUserInfo = userManager.getUserInfo(UserHandle.myUserId()); if (myUserInfo.isGuest()) { diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java index 458bc93d38c..7380c6688e4 100644 --- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java +++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java @@ -28,6 +28,10 @@ import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; +import android.platform.test.annotations.RequiresFlagsDisabled; +import android.platform.test.annotations.RequiresFlagsEnabled; +import android.platform.test.flag.junit.CheckFlagsRule; +import android.platform.test.flag.junit.DeviceFlagsValueProvider; import androidx.preference.Preference; import androidx.preference.PreferenceManager; @@ -36,6 +40,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.testutils.shadow.ShadowNfcAdapter; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -58,6 +63,9 @@ public class PaymentSettingsTest { private Context mContext; + @Rule + public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); + @Mock private PackageManager mPackageManager; @@ -98,7 +106,19 @@ public class PaymentSettingsTest { } @Test - public void getNonIndexableKey_primaryUser_returnsTrue() { + @RequiresFlagsEnabled(android.permission.flags.Flags.FLAG_WALLET_ROLE_ENABLED) + public void getNonIndexableKey_primaryUser_returnsFalse_walletRoleEnabled() { + when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true); + + final List niks = + PaymentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext); + + assertThat(niks).containsAtLeast(FOREGROUND_KEY, PAYMENT_KEY); + } + + @Test + @RequiresFlagsDisabled(android.permission.flags.Flags.FLAG_WALLET_ROLE_ENABLED) + public void getNonIndexableKey_primaryUser_returnsTrue_walletRoleDisabled() { when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true); final List niks = From 4d2012ccf9d6f419f25668cd905576f3cc9f0f5e Mon Sep 17 00:00:00 2001 From: Edgar Wang Date: Tue, 8 Oct 2024 13:02:27 +0000 Subject: [PATCH 2/2] [Homepage Revamp] hide the scroll bar of homepage Bug: 364612225 Test: visual Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b246d2e8152eda94691a463a70973166e98c39c9) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e3c7913e3c9ffb9e95675d1731e8bf9a58082a18) Merged-In: I0d4c48ef6debfa82597db48a4320b0500f330b1b Change-Id: I0d4c48ef6debfa82597db48a4320b0500f330b1b --- src/com/android/settings/homepage/TopLevelSettings.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/settings/homepage/TopLevelSettings.java b/src/com/android/settings/homepage/TopLevelSettings.java index 99441b0cc50..87e5560c959 100644 --- a/src/com/android/settings/homepage/TopLevelSettings.java +++ b/src/com/android/settings/homepage/TopLevelSettings.java @@ -251,6 +251,8 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi Bundle savedInstanceState) { RecyclerView recyclerView = super.onCreateRecyclerView(inflater, parent, savedInstanceState); + recyclerView.setVerticalScrollBarEnabled(false); + recyclerView.setHorizontalScrollBarEnabled(false); recyclerView.setPadding(mPaddingHorizontal, 0, mPaddingHorizontal, 0); return recyclerView; }