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

Commit 279061c8 authored by Steve Kondik's avatar Steve Kondik
Browse files

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

Conflicts:
	res/values/arrays.xml
	src/com/android/contacts/TwelveKeyDialer.java
parents 28f7b2d5 575ec64d

res/layout-finger/edit_separator_group.xml

0 → 100644
+51 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 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.

-->



<!-- Layout used for edit separators. -->



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

    android:id="@+id/separator"

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

    android:paddingLeft="14dip"

    android:paddingRight="?android:attr/scrollbarSize"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:background="@android:drawable/list_selector_background"

    android:orientation="horizontal"

    android:gravity="center_vertical"

    android:focusable="true"

    android:clickable="true"

    >



    <TextView android:id="@+id/text"

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

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

        android:duplicateParentState="true"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:fadingEdge="horizontal"

        />

        

    <ImageView android:id="@+id/groupIcon"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="center_vertical"        

        />

    -->



</LinearLayout>

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

+28 −0
Original line number Diff line number Diff line
@@ -37,6 +37,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>T-mobile Visual Voicemail/com.oz.mobile.android.voicemail.application/.application</item>

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

res/values/strings.xml

+11 −0
Original line number Diff line number Diff line
@@ -341,6 +341,8 @@ 
    <!-- Section header in the Edit Contacts screen for other options, such as setting ringtone -->

    <string name="listSeparatorOtherInformation_edit">Other options</string>

    

    <string name="listSeparatorGroup">Group(s)</string>    



    <!-- Section header in the Edit Contacts screen for the "Add more items" button -->

    <string name="listSeparatorMore_edit">More</string>
@@ -767,6 +769,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>
@@ -802,4 +808,9 @@ 
    <string name="alert_clear_freq_called">Clear frequently called</string>

    <string name="alert_clear_freq_called_msg">Are you sure you want to clear all frequently called entries?</string>

    

    

    <!-- Wysie_Soh: View contact strings -->

    <string name="view_contact_navigate">Navigate to</string>

    <string name="view_contact_groups">Groups</string>

    

</resources>

res/xml/contacts_preferences.xml

+27 −6
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,15 +38,36 @@ 
            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/title_call_log_category">

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

        <CheckBoxPreference

            android:key="cl_relative_time"

            android:title="@string/title_cl_relative_time"

            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"
@@ -60,7 +81,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"
@@ -72,7 +93,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"