fw: Move RECENTS_SHOW_SEARCH_BAR to CMSettings. (d023953a) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -3626,12 +3626,6 @@ public final class Settings {
		*/
		public static final String VOLUME_KEY_CURSOR_CONTROL = "volume_key_cursor_control";

		/**
		* Show search bar in recents
		* @hide
		*/
		public static final String RECENTS_SHOW_SEARCH_BAR = "recents_show_search_bar";

		/**
		* Whether to enable voice wakeup. The value is boolean (1 or 0).
		* @hide

+3 −2

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ import com.android.systemui.recents.views.DebugOverlayView;
		import com.android.systemui.recents.views.RecentsView;
		import com.android.systemui.recents.views.SystemBarScrimViews;
		import com.android.systemui.recents.views.ViewAnimation;
		import cyanogenmod.providers.CMSettings;

		import java.lang.ref.WeakReference;
		import java.util.ArrayList;
		@@ -256,8 +257,8 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView
		if (mEmptyView != null) {
		mEmptyView.setVisibility(View.GONE);
		}
		boolean showSearchBar = Settings.System.getInt(getContentResolver(),
		Settings.System.RECENTS_SHOW_SEARCH_BAR, 1) == 1;
		boolean showSearchBar = CMSettings.System.getInt(getContentResolver(),
		CMSettings.System.RECENTS_SHOW_SEARCH_BAR, 1) == 1;

		if (mRecentsView.hasValidSearchBar()) {
		if (showSearchBar) {