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

Commit e7371b3e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-3605d486-97ee-488a-9bef-b52de93b00b5-for-git_oc-dr1-release-40... 

release-request-3605d486-97ee-488a-9bef-b52de93b00b5-for-git_oc-dr1-release-4017239 snap-temp-L53000000064886993

Change-Id: Ibf146f9236aeaff1e48625ad301ec95358faa4d4
parents 064357bb 859008a2

res/values-gl/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ 
    <string name="contact_directory_description" msgid="683398073603909119">"Directorio <xliff:g id="TYPE">%1$s</xliff:g>"</string>

    <string name="activity_title_settings" msgid="5464130076132770781">"Configuración"</string>

    <string name="menu_settings" msgid="377929915873428211">"Configuración"</string>

    <string name="menu_help" msgid="1680178646764069976">"Axuda e suxestións"</string>

    <string name="menu_help" msgid="1680178646764069976">"Axuda e comentarios"</string>

    <string name="organization_company_and_title" msgid="6718207751363732025">"<xliff:g id="COMPANY_0">%2$s</xliff:g>, <xliff:g id="COMPANY_1">%1$s</xliff:g>"</string>

    <string name="non_phone_caption" msgid="1541655052330027380">"Número de teléfono"</string>

    <string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Engadir a contactos"</string>

res/values-in/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ 
    <string name="call_subject_type_and_number" msgid="7667188212129152558">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>

    <string name="about_build_version" msgid="1765533099416999801">"Versi build"</string>

    <string name="about_open_source_licenses" msgid="6479990452352919641">"Lisensi sumber terbuka"</string>

    <string name="about_open_source_licenses_summary" msgid="57418386931763994">"Detail lisensi untuk perangkat lunak sumber terbuka"</string>

    <string name="about_open_source_licenses_summary" msgid="57418386931763994">"Detail lisensi untuk software sumber terbuka"</string>

    <string name="about_privacy_policy" msgid="3705518622499152626">"Kebijakan privasi"</string>

    <string name="about_terms_of_service" msgid="4642400812150296723">"Persyaratan layanan"</string>

    <string name="activity_title_licenses" msgid="5467767062737708066">"Lisensi sumber terbuka"</string>

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

+3 −3
Original line number Diff line number Diff line
@@ -436,8 +436,6 @@ public class QuickContactActivity extends ContactsActivity { 
                }

            }



            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);



            mHasIntentLaunched = true;

            try {

                final int actionType = intent.getIntExtra(EXTRA_ACTION_TYPE,
@@ -445,10 +443,12 @@ public class QuickContactActivity extends ContactsActivity { 
                final String thirdPartyAction = intent.getStringExtra(EXTRA_THIRD_PARTY_ACTION);

                Logger.logQuickContactEvent(mReferrer, mContactType,

                        CardType.UNKNOWN_CARD, actionType, thirdPartyAction);

                // For the tachyon call action, we need to use startActivityForResult.

                // For the tachyon call action, we need to use startActivityForResult and not

                // add FLAG_ACTIVITY_NEW_TASK to the intent.

                if (TACHYON_CALL_ACTION.equals(intent.getAction())) {

                    QuickContactActivity.this.startActivityForResult(intent, /* requestCode */ 0);

                } else {

                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

                    ImplicitIntentsUtil.startActivityInAppIfPossible(QuickContactActivity.this,

                            intent);

                }