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

This commit is contained in:
Adam Powell
2016-03-18 16:41:30 +00:00
committed by Android (Google) Code Review
3 changed files with 11 additions and 2 deletions

View File

@@ -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),

View File

@@ -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

View File

@@ -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" />