Merge "City search keyboard now starts in uppercase" into ub-deskclock-fantasy
diff --git a/src/com/android/deskclock/actionbarmenu/SearchMenuItemController.java b/src/com/android/deskclock/actionbarmenu/SearchMenuItemController.java
index 95feb1d..52a4680 100644
--- a/src/com/android/deskclock/actionbarmenu/SearchMenuItemController.java
+++ b/src/com/android/deskclock/actionbarmenu/SearchMenuItemController.java
@@ -20,6 +20,7 @@
 import android.os.Bundle;
 import android.support.v7.widget.SearchView;
 import android.support.v7.widget.SearchView.OnQueryTextListener;
+import android.text.InputType;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -73,6 +74,7 @@
     public void onCreateOptionsItem(Menu menu) {
         final SearchView searchView = new SearchView(mContext);
         searchView.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
+        searchView.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
         searchView.setQuery(mQuery, false);
         searchView.setOnCloseListener(mSearchModeChangeListener);
         searchView.setOnSearchClickListener(mSearchModeChangeListener);