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

Commit ddaec8dc authored by Wenyi Wang's avatar Wenyi Wang
Browse files

Add share activity to manifest and move file provider string (AOSP) 

Bug 22083005

Change-Id: I9d35cb9eb522d4081fdec11c47b76db467ecc4fd
(cherry picked from commit 734115f2)
parent 9ff6a7ca

AndroidManifest.xml

+5 −1
Original line number Diff line number Diff line
@@ -467,6 +467,10 @@ 
            android:label="@string/launcherActivityLabel"

            android:theme="@style/BackgroundOnlyTheme" />



        <activity android:name=".common.vcard.ShareVCardActivity"

                  android:label="@string/launcherActivityLabel"

                  android:theme="@style/BackgroundOnlyTheme" />



        <service

            android:name=".common.vcard.VCardService"

            android:exported="false" />
@@ -534,7 +538,7 @@ 


        <provider

            android:name="android.support.v4.content.FileProvider"

            android:authorities="com.android.contacts.files"

            android:authorities="@string/contacts_file_provider_authority"

            android:grantUriPermissions="true"

            android:exported="false">

            <meta-data

res/values/donottranslate_config.xml

+3 −0
Original line number Diff line number Diff line
@@ -42,4 +42,7 @@ 
    <!-- Help URL pointing to editing contacts in People. This is intentionally empty because

         the overlay will fill this in during build time. -->

    <string name="help_url_people_edit"></string>



    <!-- File Authority for the photo picker -->

    <string name="photo_file_provider_authority">com.android.contacts.files</string>

</resources>

res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -805,9 +805,6 @@ 
    <!-- Prefix for messages that you sent [CHAR LIMIT=40] -->

    <string name="message_from_you_prefix">You: <xliff:g id="sms_body">%s</xliff:g></string>



    <!-- File Authority for the photo picker -->

    <string name="photo_file_provider_authority" translatable="false">com.android.contacts.files</string>



    <!-- When a user tries to create an IM Hangouts field, an alert dialog pops up displaying this message. We don't want users entering email addresses of phone numbers into the IM field. [CHAR LIMIT=200] -->

    <string name="contact_editor_hangouts_im_alert">Hangouts works better when you enter the person\'s Hangouts identifier into the email field or phone field.</string>