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

Commit 61e26e9f 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/strings.xml
	src/com/android/contacts/RecentCallsListActivity.java
parents 627af1c9 56f6587c
Loading
Loading
Loading
Loading
+32 −28
Original line number Diff line number Diff line
@@ -19,21 +19,24 @@
    android:layout_height="fill_parent"
    android:orientation="vertical"
>

    <LinearLayout
        android:layout_width="fill_parent"
        android:layout_height="wrap_content"
        android:background="@android:drawable/title_bar_tall"
        android:orientation="horizontal"
        android:gravity="center_vertical"
        android:paddingLeft="9dip"
        android:paddingRight="5dip"
    >
    
        <ImageView android:id="@+id/icon"
            android:layout_width="32dip"
            android:layout_height="32dip"
            android:layout_marginRight="5dip"
        <ImageView
            android:id="@+id/photo"
            style="?android:attr/imageWellStyle"
            android:layout_width="78dip"
            android:layout_height="78dip"
            android:layout_marginRight="7dip"
            android:layout_marginLeft="2dip"
            android:scaleType="fitXY"
            android:background="@drawable/btn_contact_picture"
        />
        
        <LinearLayout
@@ -44,35 +47,41 @@
            android:layout_marginLeft="5dip"
        >
        
            <TextView android:id="@+id/type"
            <TextView                    
                android:id="@+id/name"
                android:layout_width="wrap_content"
                android:layout_weight="1"
                android:layout_height="wrap_content"
                android:textAppearance="?android:attr/textAppearanceLarge"
                android:shadowColor="#BB000000"
                android:shadowRadius="2.75"
                android:maxLines="2"
                android:ellipsize="end"
                android:text="@string/unknown"
            />

            <TextView android:id="@+id/time"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textAppearance="?android:attr/textAppearanceSmall"
                android:textColor="?android:attr/textColorPrimaryInverse"
            />
        
            <TextView android:id="@+id/duration"
            <TextView android:id="@+id/number"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textAppearance="?android:attr/textAppearanceSmall"
                android:textColor="?android:attr/textColorPrimaryInverse"
                android:text="@string/unknown"
            />

        </LinearLayout>

    </LinearLayout>  
          
    <FrameLayout
        android:layout_height="0dip"
        android:layout_width="fill_parent"
        android:layout_height="0dip"
        android:layout_weight="1"
    >
    
        <View
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
            android:background="@drawable/title_bar_shadow"
        />
    
        <ListView android:id="@android:id/list"
            android:layout_width="fill_parent" 
            android:layout_height="fill_parent"
@@ -98,11 +107,6 @@

        </ScrollView>

        <View
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
            android:background="@drawable/title_bar_shadow"
        />

    </FrameLayout>

</LinearLayout>
+90 −32
Original line number Diff line number Diff line
@@ -22,57 +22,115 @@
    android:layout_height="wrap_content"
    android:minHeight="?android:attr/listPreferredItemHeight"
    android:orientation="horizontal"
    android:paddingLeft="9dip"
    android:paddingRight="5dip"
    android:gravity="center_vertical"
>

    <ImageView android:id="@+id/icon"
        android:layout_width="32dip"
        android:layout_height="32dip"
        android:layout_marginRight="5dip"
        android:gravity="center"
        android:scaleType="centerInside"
    />
    <RelativeLayout android:id="@+id/line_action"
        android:layout_width="fill_parent"
        android:layout_height="?android:attr/listPreferredItemHeight"
        android:paddingLeft="5dip"
    >
    
    <LinearLayout
        android:layout_width="0dip"
        android:layout_height="wrap_content"
        android:layout_weight="1"
        android:layout_marginLeft="5dip"
        android:paddingTop="5dip"
        android:paddingBottom="7dip"
        android:orientation="vertical"
        <com.android.contacts.ui.widget.DontPressWithParentImageView android:id="@+id/sms_icon"
            android:layout_width="wrap_content"
            android:layout_height="fill_parent"
            android:paddingLeft="14dip"
            android:paddingRight="14dip"
            android:src="@drawable/sym_action_sms"
            android:background="@drawable/call_background"
            android:layout_alignParentRight="true"
            android:gravity="center_vertical"
    >
        />      
        
        <TextView android:id="@android:id/text1"
        <TextView android:id="@+id/call"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginLeft="11dip"
            android:textAppearance="?android:attr/textAppearanceLarge"
            android:text="@string/callBack"
            android:layout_alignParentLeft="true"
            android:layout_marginTop="17dip"
            android:gravity="center_vertical"
        />
        
        <View android:id="@+id/divider1"
            android:layout_width="1px"
            android:layout_height="fill_parent"
            android:layout_marginBottom="5dip"
            android:layout_toLeftOf="@id/sms_icon"
            android:background="@drawable/divider_vertical_dark"
            android:focusable = "false"
        />
        
        <LinearLayout android:id="@+id/line2"
        <com.android.contacts.ui.widget.DontPressWithParentImageView android:id="@+id/call_icon"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_height="fill_parent"
            android:paddingLeft="14dip"
            android:paddingRight="14dip"
            android:gravity="center_vertical"
            android:layout_toLeftOf="@id/divider1"
            android:src="@android:drawable/sym_action_call"
            android:background="@drawable/call_background"
        />
        
    </RelativeLayout>
    
    <LinearLayout android:id="@+id/line_log"
        android:layout_width="fill_parent"
        android:layout_height="?android:attr/listPreferredItemHeight"
        android:orientation="horizontal"
        android:gravity="center_vertical"
        android:background="@android:drawable/list_selector_background"
        android:paddingLeft="5dip"
    >
            <TextView android:id="@+id/label"
    
        <ImageView android:id="@+id/icon"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
                android:layout_marginRight="5dip"
            android:paddingLeft="4dip"
            android:paddingRight="4dip"
            android:gravity="center"
            android:scaleType="centerInside"
        />
        
        <RelativeLayout 
            android:layout_width="wrap_content"
            android:layout_height="fill_parent"
            android:paddingTop="5dip"
        >
        
            <TextView android:id="@+id/type"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginLeft="11dip"
                android:layout_alignParentLeft="true"
                android:layout_alignParentTop="true"
                android:textAppearance="?android:attr/textAppearanceSmall"
                android:textStyle="bold"   
                android:text="@string/menu_sendTextMessage"
            />
            
            <TextView android:id="@+id/number"
            <TextView android:id="@+id/duration"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginRight="11dip"
                android:layout_alignParentRight="true"
                android:layout_alignBaseline="@id/type"
                android:textAppearance="?android:attr/textAppearanceSmall"
            />
        </LinearLayout>
            
    </LinearLayout>
            <TextView android:id="@+id/time"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_alignParentLeft="true"
                android:layout_alignParentBottom="true"
                android:singleLine="true"
                android:layout_marginBottom="8dip"
                android:layout_marginTop="-8dip"
                android:layout_marginLeft="11dip"
                android:textAppearance="?android:attr/textAppearanceSmall"
            />

        </RelativeLayout>
    </LinearLayout>
</LinearLayout>
+4 −2
Original line number Diff line number Diff line
@@ -797,6 +797,8 @@
    <string name="title_cl_ask_before_clear">Ask before clearing</string>
    <string name="summaryon_cl_ask_before_clear">Ask before clearing call log</string>
    <string name="summaryoff_cl_ask_before_clear">Call logs will be cleared without asking</string>
    <string name="title_view_cl">Individual call log</string>
    <string name="summary_view_cl">Set preferences when viewing an individual's call log</string>
    
    <string name="title_contacts_category">Contacts</string>
    <string name="title_contacts_show_pic">Show contact pictures</string>
@@ -842,7 +844,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">2.34</string>
    <string name="summary_about_version">2.5</string>
    <string name="title_about_credits">Credits</string>
    <string name="summary_about_credits">ChainsDD and the rest of XDA! :)</string>
    
@@ -854,12 +856,12 @@
    <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>
    <string name="recentCalls_removeAllFrom">Remove all </string>
    
    <string name="view_contact_groups">Groups</string>    
    
    <!-- Wysie_Soh: Groups management -->
    <string name="help_title">Usage</string>
+13 −0
Original line number Diff line number Diff line
@@ -132,6 +132,19 @@
            android:summaryOn="@string/summaryon_cl_ask_before_clear"
            android:summaryOff="@string/summaryoff_cl_ask_before_clear"
            android:defaultValue="false" />
        <PreferenceScreen
            android:key="view_call_log"
            android:title="@string/title_view_cl"
            android:summary="@string/summary_view_cl">
            <ListPreference
                android:key="cl_view_contact_pic_size"
                android:title="@string/title_contacts_view_pic_size"
                android:summary="@string/summary_contacts_view_pic_size"
                android:dialogTitle="@string/title_contacts_choose_pic_size"
                android:entries="@array/view_contact_pic_sizes"
                android:entryValues="@array/view_contact_pic_sizes_values"
                android:defaultValue="78" />                
        </PreferenceScreen>            
    </PreferenceCategory>
    <PreferenceCategory android:title="@string/contactsIconLabel">
        <CheckBoxPreference
+454 −176

File changed.

Preview size limit exceeded, changes collapsed.

Loading