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

Move Contextual Search setting to AOSP.

Browse Source 
This only appears if the correpsonding system feature is enabled.

Bug: 353715553
Test: Manual
Flag: EXEMPT moving code from vendor to aosp
Change-Id: Ib19db6345b907500dfe3d53c36700df428c0171e
This commit is contained in:
Andy Wickham
2024-08-02 21:24:38 +00:00
parent 1cc49800be
commit 9f9571a078
7 changed files with 227 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/gestures/ButtonNavigationSettingsAssistController.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.gestures;
import static android.app.contextualsearch.ContextualSearchManager.FEATURE_CONTEXTUAL_SEARCH;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
@@ -50,6 +51,11 @@ public class ButtonNavigationSettingsAssistController extends TogglePreferenceCo
@Override
public int getAvailabilityStatus() {
// Hide the existing assistant UI elements when contextual search is available.
if (mContext.getPackageManager().hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH)) {
return UNSUPPORTED_ON_DEVICE;
}
if (SystemNavigationPreferenceController.isOverlayPackageAvailable(mContext,
NAV_BAR_MODE_2BUTTON_OVERLAY)
|| SystemNavigationPreferenceController.isOverlayPackageAvailable(mContext,