Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e67d293d authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'donut' of git://github.com/Wysie/android_packages_apps_Contacts into donut

parents 69b1c63c 0dc5accb

res/layout-finger/contacts_list_content.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
        android:layout_height="fill_parent"

        android:orientation="vertical">



    <ListView android:id="@android:id/list"

    <com.android.contacts.FocusRequestingListView android:id="@android:id/list"

            android:layout_width="fill_parent"

            android:layout_height="fill_parent"

            android:fastScrollEnabled="true"

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ 
    <string name="title_about_name">Mod Name</string>

    <string name="summary_about_name">Wysie Contacts</string>

    <string name="title_about_version">Version</string>

    <string name="summary_about_version">2.0</string>

    <string name="summary_about_version">2.01</string>

    <string name="title_about_credits">Credits</string>

    <string name="summary_about_credits">ChainsDD and the rest of XDA! :)</string>

src/com/android/contacts/ContactsListActivity.java

+14 −6
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import android.graphics.drawable.Drawable; 
import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;

import android.os.Message;

import android.os.Parcelable;

import android.os.RemoteException;

import android.os.SystemProperties;
@@ -1834,7 +1835,6 @@ public final class ContactsListActivity extends ListActivity 
        private boolean mDisplayPhotos = false;

        private SparseArray<SoftReference<Bitmap>> mBitmapCache = null;

        private int mFrequentSeparatorPos = ListView.INVALID_POSITION;        

        

        private int[] mSectionPositions;



        public ContactItemListAdapter(Context context) {
@@ -1958,7 +1958,14 @@ public final class ContactsListActivity extends ListActivity 
            }

            

            //Wysie_Soh: if mMode == MODE_STREQUENT or MODE_FREQUENT, mDisplaySectionHeaders is already set to false

            if (!(mMode == MODE_STREQUENT || mMode == MODE_FREQUENT)) {

            //Doing so means that the section separators will be shown in all other mModes. If I'm not wrong,

            //The default Eclair Contacts only shows the section separators in "Contacts" tab mode.

            //if (!(mMode == MODE_STREQUENT || mMode == MODE_FREQUENT)) {

            //    mDisplaySectionHeaders = ePrefs.getBoolean("contacts_show_alphabetical_separators", true);

            //}

            

            //Wysie_Soh: Decide whether to display headers or not based on preferences            

            if (mContactsTab) {

                mDisplaySectionHeaders = ePrefs.getBoolean("contacts_show_alphabetical_separators", true);

            }
@@ -1968,6 +1975,7 @@ public final class ContactsListActivity extends ListActivity 
            return v;

        }

        

        //Wysie_Soh: cache.divider makes the line between each contact thicker, investigating

        private void bindSectionHeader(View view, int position, boolean displaySectionHeaders) {

            final ContactListItemCache cache = (ContactListItemCache) view.getTag();

            if (!displaySectionHeaders) {

src/com/android/contacts/FocusRequestingListView.java

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.contacts;



import android.content.Context;

import android.util.AttributeSet;

import android.widget.ListView;



/* Subclass of ListView that requests focus after it is layed out for the first time. */

public class FocusRequestingListView extends ListView {



    private boolean mFirstLayoutDone = false;



    public FocusRequestingListView(Context context) {

        super(context);

    }



    public FocusRequestingListView(Context context, AttributeSet attrs) {

        super(context, attrs);

    }



    public FocusRequestingListView(Context context, AttributeSet attrs, int defStyle) {

        super(context, attrs, defStyle);

    }



    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {

        super.onLayout(changed, left, top, right, bottom);

        if (!mFirstLayoutDone) {

            setFocusable(true);

            requestFocus();

        }

        mFirstLayoutDone = true;

    }

}