app_Settings

Go to file

Brad Ebinger fa18b88225 Allow SimDialogActivity to be started for result

In Telephony, we sometimes need to be able to launch
the SIM pick dialog activity for SMS without setting
a new default (i.e. user chose "ask every time") for
default SMS subscription.

Adds the ability for the SimDialogActivity to be
called using startActivityForResult and not set the
user's choice as the default.

Bug: 130853716
Bug: 130567323
Test: run Telephony SmsManagerTestApp
Merged-In: Ib448a6901581294050fc988ed9c16f7e93066860
Change-Id: If9f9ebbfe9b7b6718ed759937abbcfa6d22c6295

2019-05-22 00:37:21 +00:00

res

Merge "Adding new strings needed for Enable MMS toggle."

2019-05-01 14:58:44 -07:00

src/com/android/settings

Allow SimDialogActivity to be started for result

2019-05-22 00:37:21 +00:00

tests

Merge "Ignore the outdated entitlement check"

2019-04-19 20:26:15 -07:00

Android.mk

Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""""