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

Commit 76da31a8 authored by Roman Birg's avatar Roman Birg Committed by Gerrit Code Review
Browse files

Revert "SystemUI: Add option to disable search bar in recents (2/2)" 

Ref: CYNGNOS-342

This reverts commit 7ae677fc.

Change-Id: I3a83ffc4698621481249605cd43b1199caaa1f0a
parent 221e301a

packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java

+5 −25
Original line number Diff line number Diff line
@@ -25,11 +25,9 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.res.Resources;

import android.os.Bundle;

import android.os.SystemClock;

import android.os.UserHandle;

import android.provider.Settings;

import android.view.KeyEvent;

import android.view.View;

import android.view.ViewStub;
@@ -38,7 +36,6 @@ import android.widget.Toast; 
import com.android.internal.logging.MetricsLogger;

import com.android.systemui.Prefs;

import com.android.systemui.R;

import com.android.systemui.recents.RecentsConfiguration;

import com.android.systemui.recents.misc.Console;

import com.android.systemui.recents.misc.DebugTrigger;

import com.android.systemui.recents.misc.ReferenceCountedTrigger;
@@ -133,7 +130,7 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView 
    /**

     * Broadcast receiver to handle messages from AlternateRecentsComponent.

     */

    private final BroadcastReceiver mServiceBroadcastReceiver = new BroadcastReceiver() {

    final BroadcastReceiver mServiceBroadcastReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            String action = intent.getAction();
@@ -163,7 +160,7 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView 
    /**

     * Broadcast receiver to handle messages from the system

     */

    private final BroadcastReceiver mSystemBroadcastReceiver = new BroadcastReceiver() {

    final BroadcastReceiver mSystemBroadcastReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            String action = intent.getAction();
@@ -182,7 +179,7 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView 
    /**

     * A custom debug trigger to listen for a debug key chord.

     */

    private final DebugTrigger mDebugTrigger = new DebugTrigger(new Runnable() {

    final DebugTrigger mDebugTrigger = new DebugTrigger(new Runnable() {

        @Override

        public void run() {

            onDebugModeTriggered();
@@ -264,30 +261,13 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView 
                mEmptyView.setVisibility(View.GONE);

                mEmptyView.setOnClickListener(null);

            }

            boolean showSearchBar = CMSettings.System.getInt(getContentResolver(),

                       CMSettings.System.RECENTS_SHOW_SEARCH_BAR, 1) == 1;



            if (mRecentsView.hasValidSearchBar()) {

                if (showSearchBar) {

                mRecentsView.setSearchBarVisibility(View.VISIBLE);

            } else {

                    mRecentsView.setSearchBarVisibility(View.GONE);

                }

            } else {

                if (showSearchBar) {

                refreshSearchWidgetView();

            }

        }



            // Update search bar space height

            if (showSearchBar) {

                mConfig.searchBarSpaceHeightPx = getResources().getDimensionPixelSize(

                    R.dimen.recents_search_bar_space_height);

            } else {

                mConfig.searchBarSpaceHeightPx = 0;

            }

        }



        // Animate the SystemUI scrims into view

        mScrimViews.prepareEnterRecentsAnimation();