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

Commit ef038985 authored by Wysie's avatar Wysie
Browse files

"Show contact pictures" and "Show dial button" are now separate settings for... 

"Show contact pictures" and "Show dial button" are now separate settings for each individual tab. "Show contact pictures" for Call log isn't working yet, tho the option is there.
parent 7b0d7f04

res/layout-finger/contacts_list_item_photo.xml

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ 
        android:layout_alignParentBottom="true"

        android:layout_marginBottom="8dip"

        android:layout_marginTop="-10dip"

        android:layout_alignWithParentIfMissing="true"



        android:singleLine="true"

        android:ellipsize="marquee"

res/layout-finger/recent_calls_list_item.xml

+5 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
        android:layout_marginTop="5dip"

        android:layout_marginBottom="5dip"

        android:layout_toLeftOf="@id/call_icon"

        android:layout_marginLeft="11dip"

        android:layout_marginLeft="6dip"

        android:background="@drawable/divider_vertical_dark"

    />
@@ -47,6 +47,8 @@ 
        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:layout_toLeftOf="@id/divider"

        android:layout_alignWithParentIfMissing="true"

        android:layout_marginRight="5dip"

    />



    <TextView android:id="@+id/date"
@@ -55,6 +57,8 @@ 
        android:layout_toLeftOf="@id/divider"

        android:layout_alignParentBottom="true"

        android:layout_marginBottom="8dip"

        android:layout_alignWithParentIfMissing="true"

        android:layout_marginRight="5dip"



        android:textAppearance="?android:attr/textAppearanceSmall"

        android:singleLine="true"

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -808,7 +808,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">1.94</string>

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

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

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

res/xml/contacts_preferences.xml

+19 −3
Original line number Diff line number Diff line
@@ -82,6 +82,14 @@ 
        </PreferenceScreen>

    </PreferenceCategory>

    <PreferenceCategory android:title="@string/recentCallsIconLabel">

        <CheckBoxPreference

            android:key="cl_show_dial_button"

            android:title="@string/title_contacts_show_dial_button"

            android:defaultValue="true" />

        <CheckBoxPreference

            android:key="cl_show_pic"

            android:title="@string/title_contacts_show_pic"

            android:defaultValue="false" />  

        <CheckBoxPreference

            android:key="cl_relative_time"

            android:title="@string/title_cl_relative_time"
@@ -123,6 +131,14 @@ 
            android:defaultValue="78" />

    </PreferenceCategory>

    <PreferenceCategory android:title="@string/contactsFavoritesLabel">

        <CheckBoxPreference

            android:key="favs_show_dial_button"

            android:title="@string/title_contacts_show_dial_button"

            android:defaultValue="true" />

        <CheckBoxPreference

            android:key="favs_show_pic"

            android:title="@string/title_contacts_show_pic"

            android:defaultValue="true" />

        <CheckBoxPreference

            android:key="favourites_hide_freq_called"

            android:title="@string/title_favourites_hide_freq_call"

src/com/android/contacts/ContactsListActivity.java

+12 −6
Original line number Diff line number Diff line
@@ -527,10 +527,7 @@ public final class ContactsListActivity extends ListActivity 
        }

        

        if (mMode == MODE_UNKNOWN) {

            if (ePrefs.getBoolean("contacts_show_pic", true))

            	mMode = DEFAULT_MODE;

            else

                mMode = DEFAULT_NO_PICTURES_MODE;

        }



        // Setup the UI
@@ -1849,6 +1846,8 @@ public final class ContactsListActivity extends ListActivity 
                    break;

            }

            

                            Log.d("WYSIE", "MOD MOD MOD");



            if ((mMode & MODE_MASK_SHOW_PHOTOS) == MODE_MASK_SHOW_PHOTOS) {

                mDisplayPhotos = true;

                setViewResource(R.layout.contacts_list_item_photo);
@@ -2009,7 +2008,8 @@ public final class ContactsListActivity extends ListActivity 
                numberView.setText(cache.numberBuffer.data, 0, size);                              

                numberView.setVisibility(View.VISIBLE);

                labelView.setVisibility(View.VISIBLE);                

                if (ePrefs.getBoolean("contacts_show_dial_button", true)) {

                if ((ePrefs.getBoolean("contacts_show_dial_button", true) && !mFavTab) ||

                    (ePrefs.getBoolean("favs_show_dial_button", true) && mFavTab)) {

                	callView.setTag(new String(cache.numberBuffer.data, 0, size)); //Wysie_Soh: Set tag to green dial button

                	callView.setVisibility(View.VISIBLE);

                	divView.setVisibility(View.VISIBLE);
@@ -2063,7 +2063,8 @@ public final class ContactsListActivity extends ListActivity 
            }



            // Set the photo, if requested

            if (mDisplayPhotos) {

            if (mDisplayPhotos && ((ePrefs.getBoolean("contacts_show_pic", true) && !mFavTab) ||

                (ePrefs.getBoolean("favs_show_pic", true) && mFavTab))) {

                Bitmap photo = null;



                // Look for the cached bitmap
@@ -2101,6 +2102,11 @@ public final class ContactsListActivity extends ListActivity 
                } else {

                    cache.photoView.setImageResource(R.drawable.ic_contact_list_picture);

                }

                

                cache.photoView.setVisibility(View.VISIBLE);

            }

            else {

                cache.photoView.setVisibility(View.GONE);

            }

        }