Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1eb67f97 authored by Randy Pfohl's avatar Randy Pfohl Committed by Android (Google) Code Review
Browse files

Merge "adding check for contextual search to ensure ui elements being hidden... 

Merge "adding check for contextual search to ensure ui elements being hidden will also hide button navigation menu from search" into main
parents f2ffa3dd 496a8819

src/com/android/settings/gestures/ButtonNavigationSettingsFragment.java

+7 −0
Original line number Diff line number Diff line
@@ -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;
@@ -59,6 +60,12 @@ public class ButtonNavigationSettingsFragment extends DashboardFragment { 


                @Override

                protected boolean isPageSearchEnabled(Context context) {

                    /*  Hide button navigation settings from search when contextual search is

                     *   enable to match button navigation preferences logic.

                     */

                    if (context.getPackageManager().hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH)) {

                        return false;

                    }

                    return SystemNavigationPreferenceController.isOverlayPackageAvailable(context,

                            NAV_BAR_MODE_2BUTTON_OVERLAY)

                            || SystemNavigationPreferenceController.isOverlayPackageAvailable(