commit 377bb6987a50923b3f6abda063b5255c67494a14
author Yorke Lee <yorkelee@google.com> Tue Nov 05 18:56:40 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 05 18:56:41 2013 +0000
tree a5e89e6c6b4b09b22aa91b48fc7d878319f74785
parent f61b8bc69634a0ad7f7746eddc4bee71b2186be6
parent 66582330750d3f956f39d148d4f1545448427996

Merge "Tweak minimum swipe distance for Dialer" into klp-dev

res/layout/dialpad.xml

diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml
index bc910db..4fc3e83 100644
--- a/res/layout/dialpad.xml
+++ b/res/layout/dialpad.xml
@@ -40,7 +40,7 @@
             android:focusable="true" >
             <LinearLayout
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center" >
                 <TextView
                     android:id="@+id/dialpad_key_number"

res/layout/dialpad_key.xml

diff --git a/res/layout/dialpad_key.xml b/res/layout/dialpad_key.xml
index e87fde0..c104f8a 100644
--- a/res/layout/dialpad_key.xml
+++ b/res/layout/dialpad_key.xml
@@ -22,7 +22,7 @@
     android:focusable="true" >
     <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_gravity="center">
       <TextView
           android:id="@+id/dialpad_key_number"

src/com/android/dialer/dialpad/SmartDialCursorLoader.java

diff --git a/src/com/android/dialer/dialpad/SmartDialCursorLoader.java b/src/com/android/dialer/dialpad/SmartDialCursorLoader.java
index a13ecd8..3690796 100644
--- a/src/com/android/dialer/dialpad/SmartDialCursorLoader.java
+++ b/src/com/android/dialer/dialpad/SmartDialCursorLoader.java
@@ -162,6 +162,8 @@
     }
 
     private void releaseResources(Cursor cursor) {
-        cursor.close();
+        if (cursor != null) {
+            cursor.close();
+        }
     }
 }