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

Commit 47c3ee4d authored by Wysie's avatar Wysie
Browse files

Preferences strings changed slightly, should follow locale now. Clear... 

Preferences strings changed slightly, should follow locale now. Clear frequently called menu option is now hidden if frequently called is set to hidden.
parent 4cbba4f2

res/xml/contacts_preferences.xml

+4 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<!-- This is a primitive example showing the different types of preferences available. -->

<PreferenceScreen

        xmlns:android="http://schemas.android.com/apk/res/android">

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

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

        <ListPreference

            android:key="vm_button"

            android:title="@string/title_vm_button"
@@ -38,7 +38,7 @@ 
            android:summaryOff="@string/summaryoff_disable_num_check"

            android:defaultValue="false" />            

    </PreferenceCategory>

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

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

        <CheckBoxPreference

            android:key="cl_relative_time"

            android:title="@string/title_cl_relative_time"
@@ -59,7 +59,7 @@ 
            android:summaryOff="@string/summaryoff_cl_ask_before_clear"

            android:defaultValue="false" />

    </PreferenceCategory>

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

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

        <CheckBoxPreference

            android:key="contacts_show_dial_button"

            android:title="@string/title_contacts_show_dial_button"
@@ -71,7 +71,7 @@ 
            android:summary="@string/summary_contacts_show_pic"

            android:defaultValue="true" />

    </PreferenceCategory>

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

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

        <CheckBoxPreference

            android:key="favourites_hide_freq_called"

            android:title="@string/title_favourites_hide_freq_call"

src/com/android/contacts/ContactsListActivity.java

+13 −1
Original line number Diff line number Diff line
@@ -334,6 +334,9 @@ public final class ContactsListActivity extends ListActivity 
    private boolean mDefaultMode = false;

    private boolean mFavTab = false;

    

    //MenuItem for Clear Freq. Called

    private MenuItem mClearFreqCalled;



    /**

     * Internal query type when in mode {@link #MODE_QUERY_PICK_TO_VIEW}.

     */
@@ -862,7 +865,8 @@ public final class ContactsListActivity extends ListActivity 
        

        //Wysie_Soh: Clear frequently called

        if (mFavTab) {

	        menu.add(0, MENU_CLEAR_FREQ_CONTACTS, 0, R.string.fav_clear_freq).setIcon(android.R.drawable.ic_menu_close_clear_cancel);

	       mClearFreqCalled = menu.add(0, MENU_CLEAR_FREQ_CONTACTS, 0, R.string.fav_clear_freq).setIcon

	       			(android.R.drawable.ic_menu_close_clear_cancel);

        }

        //Preferences

        Intent i = new Intent(this, ContactsPreferences.class);
@@ -880,6 +884,14 @@ public final class ContactsListActivity extends ListActivity 
       }

       menu.setGroupEnabled(MENU_GROUP_BT, bluetoothEnabled);

       menu.setGroupVisible(MENU_GROUP_BT, bluetoothEnabled);

       

       if (mFavTab) {       

	       if (ePrefs.getBoolean("favourites_hide_freq_called", false))

       			mClearFreqCalled.setVisible(false);

       		else

       			mClearFreqCalled.setVisible(true);

       }

       

       return true;

    }