diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-04-09 11:21:51 -0700 |
|---|---|---|
| committer | Yorke Lee <yorkelee@google.com> | 2013-04-09 11:30:11 -0700 |
| commit | bc8a5b4d1ca27c5b277e232e057a019003333f38 (patch) | |
| tree | 57073369a6e47fc78ac9ad319dd6d7d698c5ce6f /src | |
| parent | 9f0c1621718b382531cbebfe38907e6d3db6ceae (diff) | |
| download | android_packages_apps_ContactsCommon-bc8a5b4d1ca27c5b277e232e057a019003333f38.tar.gz android_packages_apps_ContactsCommon-bc8a5b4d1ca27c5b277e232e057a019003333f38.tar.bz2 android_packages_apps_ContactsCommon-bc8a5b4d1ca27c5b277e232e057a019003333f38.zip | |
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
Diffstat (limited to 'src')
3 files changed, 2 insertions, 1 deletions
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; |