commit 7131f2583858035818ab542a913659cde83ac480
author Yorke Lee <yorkelee@google.com> Fri Mar 21 22:54:49 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 21 22:54:49 2014 +0000
tree 6b499a4abcb7ae31da54e7d15cf7ebee09dd87eb
parent 3fb7218a3fe75460d675bf979fb6269088e5eb16
parent 9e91bb0709f420a8c19c344965cc1410a38bccd5

Merge "Fix overdraw in Dialer"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3a643a8..509960c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -15,7 +15,8 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.dialer">
+    package="com.android.dialer"
+    coreApp="true">
 
     <uses-permission android:name="android.permission.CALL_PRIVILEGED" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />

src/com/android/dialer/list/PhoneFavoriteFragment.java

diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java
index 0b19141..9af0cb2 100644
--- a/src/com/android/dialer/list/PhoneFavoriteFragment.java
+++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java
@@ -441,7 +441,8 @@
             final int position = firstVisiblePosition + i;
             final long itemId = mAdapter.getItemId(position);
             final int itemViewType = mAdapter.getItemViewType(position);
-            if (itemViewType == PhoneFavoritesTileAdapter.ViewTypes.TOP) {
+            if (itemViewType == PhoneFavoritesTileAdapter.ViewTypes.TOP &&
+                    child instanceof ContactTileRow) {
                 // This is a tiled row, so save horizontal offsets instead
                 saveHorizontalOffsets((ContactTileRow) child, (ArrayList<ContactEntry>)
                         mAdapter.getItem(position),
@@ -649,10 +650,11 @@
         saveOffsets(0);
     }
 
-    public void dismissShortcut(int height) {
+    public void dismissShortcut(View view) {
+        final int height = ((View) view.getParent()).getHeight();
         saveOffsets(height);
         mLastCallShortcutDate = mCurrentCallShortcutDate;
-        final SharedPreferences prefs = getActivity().getSharedPreferences(
+        final SharedPreferences prefs = view.getContext().getSharedPreferences(
                 DialtactsActivity.SHARED_PREFS_NAME, Context.MODE_PRIVATE);
         prefs.edit().putLong(KEY_LAST_DISMISSED_CALL_SHORTCUT_DATE, mLastCallShortcutDate)
                 .apply();

src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java

diff --git a/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java b/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
index e966f10..81d682b 100644
--- a/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
+++ b/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
@@ -74,7 +74,7 @@
             mCallLogQueryHandler.markNewVoicemailsAsOld();
             CallLogNotificationsHelper.removeMissedCallNotifications();
             CallLogNotificationsHelper.updateVoicemailNotifications(mContext);
-            mFragment.dismissShortcut(((View) view.getParent()).getHeight());
+            mFragment.dismissShortcut(view);
         }
 
         @Override