Merge changes If771fbea,Ib213cf3c am: ce13778736
am: 4a27089552
Change-Id: I21496a501d5c0978fdb685689dc6239c700c24ea
diff --git a/java/com/android/dialer/app/res/layout/dialtacts_activity.xml b/java/com/android/dialer/app/res/layout/dialtacts_activity.xml
index 4c07f1c..1627844 100644
--- a/java/com/android/dialer/app/res/layout/dialtacts_activity.xml
+++ b/java/com/android/dialer/app/res/layout/dialtacts_activity.xml
@@ -41,13 +41,12 @@
<android.support.design.widget.FloatingActionButton
android:id="@+id/floating_action_button"
- android:layout_width="@dimen/floating_action_button_width"
- android:layout_height="@dimen/floating_action_button_height"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
android:contentDescription="@string/action_menu_dialpad_button"
android:src="@drawable/quantum_ic_dialpad_white_24"
- android:scaleType="center"
app:elevation="@dimen/floating_action_button_translation_z"
app:backgroundTint="@color/dialer_secondary_color"/>
diff --git a/java/com/android/dialer/searchfragment/list/SearchCursorManager.java b/java/com/android/dialer/searchfragment/list/SearchCursorManager.java
index c6aca8e..364e97b 100644
--- a/java/com/android/dialer/searchfragment/list/SearchCursorManager.java
+++ b/java/com/android/dialer/searchfragment/list/SearchCursorManager.java
@@ -101,10 +101,6 @@
return false;
}
- if (contactsCursor != null && !contactsCursor.isClosed()) {
- contactsCursor.close();
- }
-
if (cursor != null) {
contactsCursor = cursor;
} else {
@@ -119,10 +115,6 @@
return false;
}
- if (nearbyPlacesCursor != null && !nearbyPlacesCursor.isClosed()) {
- nearbyPlacesCursor.close();
- }
-
if (cursor != null) {
nearbyPlacesCursor = cursor;
} else {
@@ -146,10 +138,6 @@
return false;
}
- if (corpDirectoryCursor != null && !corpDirectoryCursor.isClosed()) {
- corpDirectoryCursor.close();
- }
-
if (cursor != null) {
corpDirectoryCursor = cursor;
} else {
@@ -286,20 +274,9 @@
/** removes all cursors. */
void clear() {
- if (contactsCursor != null) {
- contactsCursor.close();
- contactsCursor = null;
- }
-
- if (nearbyPlacesCursor != null) {
- nearbyPlacesCursor.close();
- nearbyPlacesCursor = null;
- }
-
- if (corpDirectoryCursor != null) {
- corpDirectoryCursor.close();
- corpDirectoryCursor = null;
- }
+ contactsCursor = null;
+ nearbyPlacesCursor = null;
+ corpDirectoryCursor = null;
}
/**