PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add intent fields when launching instant app." into pi-dev

Browse Source 
am: dce675c158

Change-Id: I2934676d8253bb6df67834f2d02a38154c7b3eb0
This commit is contained in:
Doris Ling
2018-03-07 03:01:09 +00:00
committed by android-build-merger
parent b5884f48d5 dce675c158
commit 5675610456
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java
View File

@@ -147,7 +147,10 @@ public class InstantAppButtonsPreferenceController extends BasePreferenceControl
if (!TextUtils.isEmpty(mLaunchUri)) { if (!TextUtils.isEmpty(mLaunchUri)) {
installButton.setVisibility(View.GONE); installButton.setVisibility(View.GONE);
final Intent intent = new Intent(Intent.ACTION_VIEW); final Intent intent = new Intent(Intent.ACTION_VIEW);
intent.addCategory(Intent.CATEGORY_BROWSABLE);
intent.setPackage(mPackageName);
intent.setData(Uri.parse(mLaunchUri)); intent.setData(Uri.parse(mLaunchUri));
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
launchButton.setOnClickListener(v -> mParent.startActivity(intent)); launchButton.setOnClickListener(v -> mParent.startActivity(intent));
} else { } else {
launchButton.setVisibility(View.GONE); launchButton.setVisibility(View.GONE);

3
tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java
View File

@@ -262,6 +262,9 @@ public class InstantAppButtonsPreferenceControllerTest {
verify(mFragment).startActivity(argThat(intent-> intent != null verify(mFragment).startActivity(argThat(intent-> intent != null
&& intent.getAction().equals(Intent.ACTION_VIEW) && intent.getAction().equals(Intent.ACTION_VIEW)
&& intent.hasCategory(Intent.CATEGORY_BROWSABLE)
&& (intent.getFlags() & Intent.FLAG_ACTIVITY_NEW_TASK) != 0
&& TextUtils.equals(intent.getPackage(), TEST_AIA_PACKAGE_NAME)
&& TextUtils.equals(intent.getDataString(), launchUri))); && TextUtils.equals(intent.getDataString(), launchUri)));
} }