Fix width of account recent label spinner on tablet.
Needed to bring in correct overrides.
Also temporarily fix crash while fully implementing tablet
search.
Change-Id: I7b919966c3ec9eaa76ca1f9ac4eca7b19aea46b0
diff --git a/res/values-sw720dp-land/constants.xml b/res/values-sw720dp-land/constants.xml
index 8eea1b1..ed533bc 100644
--- a/res/values-sw720dp-land/constants.xml
+++ b/res/values-sw720dp-land/constants.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2011 Google Inc.
Licensed to The Android Open Source Project.
diff --git a/res/values-sw720dp-port/dimen.xml b/res/values-sw720dp-port/dimen.xml
new file mode 100644
index 0000000..db038f9
--- /dev/null
+++ b/res/values-sw720dp-port/dimen.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Google Inc.
+ Licensed to The Android Open Source Project.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <dimen name="spinner_frame_width">200dip</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values-sw720dp/constants.xml b/res/values-sw720dp/constants.xml
index f82bc72..756f38e 100644
--- a/res/values-sw720dp/constants.xml
+++ b/res/values-sw720dp/constants.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2011 Google Inc.
Licensed to The Android Open Source Project.
diff --git a/res/values-sw720dp/dimen.xml b/res/values-sw720dp/dimen.xml
new file mode 100644
index 0000000..51a7acc
--- /dev/null
+++ b/res/values-sw720dp/dimen.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Google Inc.
+ Licensed to The Android Open Source Project.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <dimen name="compose_scrollview_width">700dip</dimen>
+ <dimen name="compose_area_left_padding">100dip</dimen>
+ <dimen name="spinner_frame_width">260dip</dimen>
+</resources>
\ No newline at end of file
diff --git a/src/com/android/mail/ui/ActionBarView.java b/src/com/android/mail/ui/ActionBarView.java
index 5a5527b..97da9b7 100644
--- a/src/com/android/mail/ui/ActionBarView.java
+++ b/src/com/android/mail/ui/ActionBarView.java
@@ -139,7 +139,7 @@
mSearchWidget = (SearchView) mSearch.getActionView();
SearchManager searchManager = (SearchManager) mActivity.getActivityContext()
.getSystemService(Context.SEARCH_SERVICE);
- if (searchManager != null) {
+ if (searchManager != null && mSearchWidget != null) {
SearchableInfo info = searchManager.getSearchableInfo(mActivity.getComponentName());
mSearchWidget.setSearchableInfo(info);
mSearchWidget.setOnQueryTextListener(this);