Merge "DO NOT MERGE Make dialpad slide down when dismissed by tapping outside" into klp-dev
diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml
index 6eea633..0f80564 100644
--- a/res/layout/dialtacts_activity.xml
+++ b/res/layout/dialtacts_activity.xml
@@ -64,6 +64,7 @@
android:textSize="@dimen/search_text_size"
android:fontFamily="@string/search_font_family"
android:textColor="@color/searchbox_text_color"
+ android:textColorHint="@color/searchbox_hint_text_color"
android:inputType="textFilter"/>
<ImageView
android:id="@+id/search_close_button"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2fb59ed..e9730ea 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -70,8 +70,10 @@
<!-- Background color of the search box -->
<color name="searchbox_background_color">#ffffff</color>
- <!-- Text color of the search box -->
- <color name="searchbox_text_color">#d3d3d3</color>
+ <!-- Text color of the search box text as entered by user -->
+ <color name="searchbox_text_color">#000000</color>
+ <!-- Text color of the search box hint text -->
+ <color name="searchbox_hint_text_color">#d3d3d3</color>
<!-- Color of the contact name in favorite tiles -->
<color name="contact_tile_name_color">#ffffff</color>
diff --git a/src/com/android/dialer/calllog/ContactInfoHelper.java b/src/com/android/dialer/calllog/ContactInfoHelper.java
index 28edcf3..e1a01b4 100644
--- a/src/com/android/dialer/calllog/ContactInfoHelper.java
+++ b/src/com/android/dialer/calllog/ContactInfoHelper.java
@@ -282,6 +282,7 @@
* {@link #mCachedNumberLookupService}.
*/
public boolean isBusiness(int sourceType) {
- return mCachedNumberLookupService.isBusiness(sourceType);
+ return mCachedNumberLookupService != null
+ && mCachedNumberLookupService.isBusiness(sourceType);
}
}