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

Commit 386f7853 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "New string for resolving ACTION_SENDTO intents" into nyc-dev

parents 6a00ad2c 13ea8f48

core/java/com/android/internal/app/ResolverActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ public class ResolverActivity extends Activity { 
                com.android.internal.R.string.whichSendApplication,

                com.android.internal.R.string.whichSendApplicationNamed),

        SENDTO(Intent.ACTION_SENDTO,

                com.android.internal.R.string.whichSendApplication,

                com.android.internal.R.string.whichSendApplicationNamed),

                com.android.internal.R.string.whichSendToApplication,

                com.android.internal.R.string.whichSendToApplicationNamed),

        SEND_MULTIPLE(Intent.ACTION_SEND_MULTIPLE,

                com.android.internal.R.string.whichSendApplication,

                com.android.internal.R.string.whichSendApplicationNamed),

core/res/res/values/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -2567,6 +2567,13 @@ 
    <!-- Title of intent resolver dialog when selecting a sharing application to run

         and a previously used application is known. -->

    <string name="whichSendApplicationNamed">Share with %1$s</string>

    <!-- Title of intent resolver dialog when selecting an application to run to

         send content to a specific recipient. Often used for email. -->

    <string name="whichSendToApplication">Send using</string>

    <!-- Title of intent resolver dialog when selecting an application to run to

         send content to a specific recipient and a previously used application is known.

         Often used for email. -->

    <string name="whichSendToApplicationNamed">Send using %1$s</string>

    <!-- Title of intent resolver dialog when selecting a HOME application to run. -->

    <string name="whichHomeApplication">Select a Home app</string>

    <!-- Title of intent resolver dialog when selecting a HOME application to run

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -2213,6 +2213,8 @@ 
  <java-symbol type="string" name="whichEditApplicationNamed" />

  <java-symbol type="string" name="whichSendApplication" />

  <java-symbol type="string" name="whichSendApplicationNamed" />

  <java-symbol type="string" name="whichSendToApplication" />

  <java-symbol type="string" name="whichSendToApplicationNamed" />

  <java-symbol type="attr" name="lightY" />

  <java-symbol type="attr" name="lightZ" />

  <java-symbol type="attr" name="lightRadius" />