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

Commit 2f8782dd authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 82e61c94: Merge change 1316 into donut 

Merge commit '82e61c94'

* commit '82e61c94':
  Make in-app search have a different background resource which looks
parents 86dbf0d7 82e61c94

core/java/android/app/SearchDialog.java

+12 −1
Original line number Diff line number Diff line
@@ -325,6 +325,14 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
        

        // show the dialog. this will call onStart().

        if (!isShowing()) {

            // First make sure the keyboard is showing (if needed), so that we get the right height

            // for the dropdown to respect the IME.

            if (getContext().getResources().getConfiguration().hardKeyboardHidden ==

                Configuration.HARDKEYBOARDHIDDEN_YES) {

                InputMethodManager inputManager = (InputMethodManager)

                getContext().getSystemService(Context.INPUT_METHOD_SERVICE);

                        inputManager.showSoftInputUnchecked(0, null);

            }

            show();

        }
@@ -528,13 +536,16 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
        mSearchAutoComplete.setDropDownAnimationStyle(0); // no animation

        mSearchAutoComplete.setThreshold(mSearchable.getSuggestThreshold());



        // TODO: Use different dropdown background resource for in-app search.

        if (mGlobalSearchMode) {

            mSearchAutoComplete.setDropDownAlwaysVisible(true);  // fill space until results come in

            mSearchAutoComplete.setDropDownDismissedOnCompletion(false);

            mSearchAutoComplete.setDropDownBackgroundResource(

                    com.android.internal.R.drawable.search_dropdown_background);

        } else {

            mSearchAutoComplete.setDropDownAlwaysVisible(false);

            mSearchAutoComplete.setDropDownDismissedOnCompletion(true);

            mSearchAutoComplete.setDropDownBackgroundResource(

                    com.android.internal.R.drawable.search_dropdown_background_apps);

        }



        // attach the suggestions adapter, if suggestions are available

core/res/res/drawable/search_dropdown_background_apps.9.png

0 → 100644
+412 B
Loading image diff...