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

Commit 575ec64d authored by Wysie's avatar Wysie
Browse files

Release 1.9. Fixed a few FC bugs with the groups. Added preferences to change the digits colors :).

parent 6c902f06

res/layout-finger/twelve_key_dialer.xml

+3 −2
Original line number Diff line number Diff line
@@ -31,12 +31,13 @@ 
        android:textSize="33sp"

        android:freezesText="true"

        android:background="@drawable/btn_dial_textfield"        

        android:textColor="@color/dialer_button_text"

        android:focusableInTouchMode="true"

        android:editable="true"

        android:cursorVisible="false"

        android:layout_weight="0"

    />

    <!-- Wysie_Soh: Commented out since text color is now a variable -->

    <!-- android:textColor="@color/dialer_button_text" -->



    <!-- Keypad section -->

    <include layout="@layout/dialpad" />

res/values/arrays.xml

+29 −1
Original line number Diff line number Diff line
@@ -30,6 +30,34 @@ 
        <item>4</item>

    </string-array>

    

    <string-array name="digits_colors">

        <item>Black</item>

        <item>Blue</item>

        <item>Cyan</item>

        <item>Dark Gray</item>

        <item>Gray</item>

        <item>Green</item>

        <item>Light Gray</item>

        <item>Magenta</item>

        <item>Red</item>

        <item>White</item>

        <item>Yellow</item>

   </string-array>

   

   <string-array name="digits_colors_values">

        <item>-16777216</item>

        <item>-16776961</item>

        <item>-16711681</item>

        <item>-12303292</item>

        <item>-7829368</item>

        <item>-16711936</item>

        <item>-3355444</item>

        <item>-65281</item>

        <item>-65536</item>

        <item>-1</item>

        <item>-256</item>

  </string-array>

        

    <string-array name="vm_handlers">

	<item>Google Voice/com.google.android.apps.googlevoice/.SplashActivity</item>

	<item>HulloMail/com.hullomail.android.messaging.us/.HulloMail</item>

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -766,6 +766,10 @@ 
    <string name="title_disable_num_check">Disable number checks</string>

    <string name="summaryon_disable_num_check">Left action button (LAB) and menu will always be enabled</string>

    <string name="summaryoff_disable_num_check">LAB and menu will be enabled only if at least one number is entered (except voicemail)</string>

    <string name="title_digits_color_unselected">Digits color (not selected)</string>

    <string name="title_digits_color_focused">Digits color (focused)</string>

    <string name="title_digits_color_pressed">Digits color (pressed)</string>

    <string name="title_choose_color">Choose a color</string>

    

    <string name="title_call_log_category">Call log</string>    

    <string name="title_cl_relative_time">Relative times</string>

res/xml/contacts_preferences.xml

+23 −2
Original line number Diff line number Diff line
@@ -37,6 +37,27 @@ 
            android:summaryOn="@string/summaryon_disable_num_check"

            android:summaryOff="@string/summaryoff_disable_num_check"

            android:defaultValue="false" />

        <ListPreference

            android:key="focused_digit_color"

            android:title="@string/title_digits_color_focused"

            android:dialogTitle="@string/title_choose_color"

            android:entries="@array/digits_colors"

            android:entryValues="@array/digits_colors_values"

            android:defaultValue="-16777216" />

        <ListPreference

            android:key="pressed_digit_color"

            android:title="@string/title_digits_color_pressed"

            android:dialogTitle="@string/title_choose_color"

            android:entries="@array/digits_colors"

            android:entryValues="@array/digits_colors_values"

            android:defaultValue="-16777216" />

        <ListPreference

            android:key="unselected_digit_color"

            android:title="@string/title_digits_color_unselected"

            android:dialogTitle="@string/title_choose_color"

            android:entries="@array/digits_colors"

            android:entryValues="@array/digits_colors_values"

            android:defaultValue="-1" />

    </PreferenceCategory>

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

        <CheckBoxPreference
@@ -45,7 +66,7 @@ 
            android:summaryOn="@string/summaryon_cl_relative_time"

            android:summaryOff="@string/summaryoff_cl_relative_time"

            android:disableDependentsState="true"

            android:defaultValue="true" />

            android:defaultValue="false" />

        <CheckBoxPreference

            android:key="cl_show_seconds"

            android:title="@string/title_cl_show_seconds"

src/com/android/contacts/ContactsPreferences.java

+21 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ public class ContactsPreferences extends PreferenceActivity implements Preferenc 


    private ListPreference mVMButton;

    private ListPreference mVMHandler;

    private ListPreference colorFocused, colorPressed, colorUnselected;



    @Override

    protected void onCreate(Bundle savedInstanceState) {
@@ -47,13 +48,23 @@ public class ContactsPreferences extends PreferenceActivity implements Preferenc 
        mVMButton = (ListPreference) findPreference("vm_button");

        mVMHandler = (ListPreference) findPreference("vm_handler");

        

        colorFocused = (ListPreference) findPreference("focused_digit_color");

        colorPressed = (ListPreference) findPreference("pressed_digit_color");

        colorUnselected = (ListPreference) findPreference("unselected_digit_color");



        mVMButton.setOnPreferenceChangeListener(this);

        mVMHandler.setOnPreferenceChangeListener(this);

        colorFocused.setOnPreferenceChangeListener(this);

        colorPressed.setOnPreferenceChangeListener(this);

        colorUnselected.setOnPreferenceChangeListener(this);



        loadHandlers();



        updatePrefs(mVMButton, mVMButton.getValue());

        updatePrefs(mVMHandler, mVMHandler.getValue());

        updatePrefs(colorFocused, colorFocused.getValue());

        updatePrefs(colorPressed, colorPressed.getValue());

        updatePrefs(colorUnselected, colorUnselected.getValue());

    }



    public boolean onPreferenceChange (Preference preference, Object newValue) {
@@ -66,7 +77,15 @@ public class ContactsPreferences extends PreferenceActivity implements Preferenc 
        try {

            p.setSummary(p.getEntries()[p.findIndexOfValue((String) newValue)]);

        } catch (ArrayIndexOutOfBoundsException e) {

            if (p.getKey().equals("vm_button") || p.getKey().equals("vm_handler")) {

                p.setValue("0");

            }

            else if (p.getKey().equals("focused_digit_color") || p.getKey().equals("pressed_digit_color")) {

                p.setValue("-16777216");

            }

            else if (p.getKey().equals("unselected_digit_color")) {

                p.setValue("-1");

            }

            updatePrefs(p, p.getValue());

        }

    }