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

Commit f6f47e95 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev

parents 725a2ffe 43d84518

core/java/android/app/SearchManager.java

+3 −0
Original line number Diff line number Diff line
@@ -858,6 +858,9 @@ public class SearchManager 
     */

    public Intent getAssistIntent(Context context, int userHandle) {

        try {

            if (mService == null) {

                return null;

            }

            ComponentName comp = mService.getAssistIntent(userHandle);

            if (comp == null) {

                return null;

policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java

+12 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.app.Activity; 
import android.app.ActivityManagerNative;

import android.app.AlarmManager;

import android.app.PendingIntent;

import android.app.SearchManager;

import android.app.StatusBarManager;

import android.content.BroadcastReceiver;

import android.content.ContentResolver;
@@ -166,6 +167,9 @@ public class KeyguardViewMediator { 
    /** UserManager for querying number of users */

    private UserManager mUserManager;



    /** SearchManager for determining whether or not search assistant is available */

    private SearchManager mSearchManager;



    /**

     * Used to keep the device awake while to ensure the keyguard finishes opening before

     * we sleep.
@@ -527,6 +531,7 @@ public class KeyguardViewMediator { 
     * Let us know that the system is ready after startup.

     */

    public void onSystemReady() {

        mSearchManager = (SearchManager) mContext.getSystemService(Context.SEARCH_SERVICE);

        synchronized (this) {

            if (DEBUG) Log.d(TAG, "onSystemReady");

            mSystemReady = true;
@@ -1313,6 +1318,9 @@ public class KeyguardViewMediator { 
                    // showing secure lockscreen; disable ticker.

                    flags |= StatusBarManager.DISABLE_NOTIFICATION_TICKER;

                }

                if (!isAssistantAvailable()) {

                    flags |= StatusBarManager.DISABLE_SEARCH;

                }

            }



            if (DEBUG) {
@@ -1410,4 +1418,8 @@ public class KeyguardViewMediator { 
        mKeyguardViewManager.showAssistant();

    }



    private boolean isAssistantAvailable() {

        return mSearchManager != null

                && mSearchManager.getAssistIntent(mContext, UserHandle.USER_CURRENT) != null;

    }

}