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

Commit 28f7b2d5 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 e5f7838e 4cbba4f2
Loading
Loading
Loading
Loading
+159 B
Loading image diff...
+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:orientation="vertical"
    android:background="@drawable/custom_background_dialer"
>

    <EditText android:id="@+id/digits"
+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@
    android:layout_gravity="center_horizontal"
    android:layout_marginTop="6dip"
    android:layout_weight="1"
    android:orientation="horizontal">
    android:orientation="horizontal"
    >

    <!-- Onscreen "Voicemail" button.
         The width is 75 (from the mocks) + 12 of padding from the
+4 −1
Original line number Diff line number Diff line
@@ -762,8 +762,11 @@
    
    <!-- Wysie_Soh: Preferences strings (based on ChainsDD's code) -->
    <string name="title_dialer_category">Dialer</string>
    <string name="title_vm_button">Left action button</string>    
    <string name="title_vm_button">Left action button (LAB)</string>    
    <string name="title_vm_handler">Voicemail handler</string>
    <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_call_log_category">Call log</string>    
    <string name="title_cl_relative_time">Relative times</string>
+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,12 @@
            android:entries="@array/entries_vm_handler"
            android:entryValues="@array/entryvalues_numbers"
            android:defaultValue="0" />
        <CheckBoxPreference
            android:key="dial_disable_num_check"
            android:title="@string/title_disable_num_check"
            android:summaryOn="@string/summaryon_disable_num_check"
            android:summaryOff="@string/summaryoff_disable_num_check"
            android:defaultValue="false" />            
    </PreferenceCategory>
    <PreferenceCategory android:title="@string/title_call_log_category">
        <CheckBoxPreference
Loading