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

Commit be18791b authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android_ui.lnx.2.1.c1-00017. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1076380   I262509a413923d11325c8c14e46299e240af8a2c   Contacts: Operator specific sim icon customisation.

Change-Id: I8c63b0508bb1613b72447203952d976d080720e5
CRs-Fixed: 1076380
parents 41c4831e 73c4935b

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
LOCAL_PACKAGE_NAME := Contacts

LOCAL_CERTIFICATE := shared

LOCAL_PRIVILEGED_MODULE := true



LOCAL_JAVA_LIBRARIES := telephony-common

LOCAL_PROGUARD_FLAG_FILES := proguard.flags



LOCAL_SDK_VERSION := current

src/com/android/contacts/editor/CompactRawContactsEditorView.java

+4 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ import android.widget.LinearLayout; 
import android.widget.ListPopupWindow;

import android.widget.TextView;



import com.android.contacts.common.MoreContactUtils;



import java.io.FileNotFoundException;

import java.util.ArrayList;

import java.util.Arrays;
@@ -852,6 +854,8 @@ public class CompactRawContactsEditorView extends LinearLayout implements View.O 
        } else {

            mAccountSelectorName.setVisibility(View.VISIBLE);

            mAccountSelectorName.setText(accountInfo.first);

            MoreContactUtils.setSimOperatorName(accountInfo.first,

                    mAccountSelectorName, getContext());

        }



        final String selectorTitle = getResources().getString(

src/com/android/contacts/quickcontact/QuickContactActivity.java

+26 −0
Original line number Diff line number Diff line
@@ -185,6 +185,8 @@ import com.android.contacts.widget.MultiShrinkScroller.MultiShrinkScrollerListen 
import com.android.contacts.widget.QuickContactImageView;

import com.android.contactsbind.HelpUtils;



import com.android.internal.telephony.OperatorSimInfo;



import com.google.common.collect.Lists;

import com.google.common.collect.ImmutableList;

import java.lang.SecurityException;
@@ -2930,6 +2932,12 @@ public class QuickContactActivity extends ContactsActivity 
                                    + MoreContactUtils.getAcount(

                                            QuickContactActivity.this,

                                            SimContactsConstants.SLOT2).name);

                            String customLabel = MoreContactUtils.getCustomOperatorLabel(

                                    getApplicationContext(), SimContactsConstants.SLOT2);

                            if(!TextUtils.isEmpty(customLabel)) {

                                copyToSim2Menu.setTitle(getString(R.string.menu_copyTo)

                                    + customLabel);

                            }

                            copyToSim2Menu.setVisible(true);

                        }

                        if (SimContactsConstants.SIM_NAME_2.equals(accoutName)
@@ -2938,6 +2946,12 @@ public class QuickContactActivity extends ContactsActivity 
                                    + MoreContactUtils.getAcount(

                                            QuickContactActivity.this,

                                            SimContactsConstants.SLOT1).name);

                            String customLabel = MoreContactUtils.getCustomOperatorLabel(

                                    getApplicationContext(), SimContactsConstants.SLOT1);

                            if(!TextUtils.isEmpty(customLabel)) {

                                copyToSim1Menu.setTitle(getString(R.string.menu_copyTo)

                                    + customLabel);

                            }

                            copyToSim1Menu.setVisible(true);

                        }

                    }
@@ -2949,12 +2963,24 @@ public class QuickContactActivity extends ContactsActivity 
                            copyToSim1Menu.setTitle(getString(R.string.menu_copyTo)

                                    + MoreContactUtils.getAcount(

                                            this, SimContactsConstants.SLOT1).name);

                            String customLabel = MoreContactUtils.getCustomOperatorLabel(

                                    getApplicationContext(), SimContactsConstants.SLOT1);

                            if(!TextUtils.isEmpty(customLabel)) {

                                copyToSim1Menu.setTitle(getString(R.string.menu_copyTo)

                                    + customLabel);

                            }

                            copyToSim1Menu.setVisible(true);

                        }

                        if (hasPhoneOrEmail && simTwoLoadComplete) {

                            copyToSim2Menu.setTitle(getString(R.string.menu_copyTo)

                                    + MoreContactUtils.getAcount(

                                            this, SimContactsConstants.SLOT2).name);

                            String customLabel = MoreContactUtils.getCustomOperatorLabel(

                                    getApplicationContext(), SimContactsConstants.SLOT2);

                            if(!TextUtils.isEmpty(customLabel)) {

                                copyToSim2Menu.setTitle(getString(R.string.menu_copyTo)

                                    + customLabel);

                            }

                            copyToSim2Menu.setVisible(true);

                        }

                    } else {