From bc8a5b4d1ca27c5b277e232e057a019003333f38 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Tue, 9 Apr 2013 11:21:51 -0700
Subject: Set layoutDirection for PinnedHeaderView on creation

Fixes crash when typing a character into the contact picker
caused by trying to access a null view.

Bug 8575063

Change-Id: Ie379b81cc1662143e395d89cad031a9c0749ebbb
---
 src/com/android/contacts/common/list/IndexerListAdapter.java      | 1 +
 src/com/android/contacts/common/list/PinnedHeaderListAdapter.java | 1 +
 src/com/android/contacts/common/list/PinnedHeaderListView.java    | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/com/android/contacts/common/list/IndexerListAdapter.java b/src/com/android/contacts/common/list/IndexerListAdapter.java
index 830ea81f..14243ce0 100644
--- a/src/com/android/contacts/common/list/IndexerListAdapter.java
+++ b/src/com/android/contacts/common/list/IndexerListAdapter.java
@@ -149,6 +149,7 @@ public abstract class IndexerListAdapter extends PinnedHeaderListAdapter impleme
         if (isSectionHeaderDisplayEnabled() && viewIndex == getPinnedHeaderCount() - 1) {
             if (mHeader == null) {
                 mHeader = createPinnedSectionHeaderView(mContext, parent);
+                mHeader.setLayoutDirection(parent.getLayoutDirection());
             }
             return mHeader;
         } else {
diff --git a/src/com/android/contacts/common/list/PinnedHeaderListAdapter.java b/src/com/android/contacts/common/list/PinnedHeaderListAdapter.java
index 9591092a..de5ea4fa 100644
--- a/src/com/android/contacts/common/list/PinnedHeaderListAdapter.java
+++ b/src/com/android/contacts/common/list/PinnedHeaderListAdapter.java
@@ -83,6 +83,7 @@ public abstract class PinnedHeaderListAdapter extends CompositeCursorAdapter
                 view.setEnabled(false);
             }
             bindHeaderView(view, partition, getCursor(partition));
+            view.setLayoutDirection(parent.getLayoutDirection());
             return view;
         } else {
             return null;
diff --git a/src/com/android/contacts/common/list/PinnedHeaderListView.java b/src/com/android/contacts/common/list/PinnedHeaderListView.java
index 3f207a51..9e166df8 100644
--- a/src/com/android/contacts/common/list/PinnedHeaderListView.java
+++ b/src/com/android/contacts/common/list/PinnedHeaderListView.java
@@ -170,7 +170,6 @@ public class PinnedHeaderListView extends AutoScrollListView
                     mHeaders[i] = new PinnedHeader();
                 }
                 mHeaders[i].view = mAdapter.getPinnedHeaderView(i, mHeaders[i].view, this);
-                mHeaders[i].view.setLayoutDirection(getLayoutDirection());
             }
 
             mAnimationTargetTime = System.currentTimeMillis() + mAnimationDuration;
-- 
cgit v1.2.3