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

Add referrer when launching search intent.

Browse Source 
Bug: 123294739
Test: robotests
Change-Id: I600abf1d764e828d52f3b8d35ad24cdc94dfba01
This commit is contained in:
Fan Zhang
2019-01-29 13:52:12 -08:00
parent c52a581bb7
commit beedd3abe5
7 changed files with 77 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
View File

@@ -20,10 +20,12 @@ package com.android.settings.search;
import static com.google.common.truth.Truth.assertThat;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ResolveInfo;
import android.net.Uri;
import android.provider.Settings;
import android.widget.Toolbar;
@@ -60,19 +62,19 @@ public class SearchFeatureProviderImplTest {
@Test
@Config(shadows = ShadowUtils.class)
public void initSearchToolbar_hasResolvedInfo_shouldStartCorrectIntent() {
final Intent searchIntent = new Intent(SearchFeatureProvider.SEARCH_UI_INTENT)
final Intent searchIntent = new Intent(Settings.ACTION_APP_SEARCH_SETTINGS)
.setPackage(mActivity.getString(R.string.config_settingsintelligence_package_name));
final ResolveInfo info = new ResolveInfo();
info.activityInfo = new ActivityInfo();
mPackageManager.addResolveInfoForIntent(searchIntent, info);
// Should not crash.
mProvider.initSearchToolbar(mActivity, null);
mProvider.initSearchToolbar(mActivity, null, SettingsEnums.TESTING);
final Toolbar toolbar = new Toolbar(mActivity);
// This ensures navigationView is created.
toolbar.setNavigationContentDescription("test");
mProvider.initSearchToolbar(mActivity, toolbar);
mProvider.initSearchToolbar(mActivity, toolbar, SettingsEnums.TESTING);
toolbar.performClick();
@@ -87,7 +89,7 @@ public class SearchFeatureProviderImplTest {
final Toolbar toolbar = new Toolbar(mActivity);
// This ensures navigationView is created.
toolbar.setNavigationContentDescription("test");
mProvider.initSearchToolbar(mActivity, toolbar);
mProvider.initSearchToolbar(mActivity, toolbar, SettingsEnums.TESTING);
toolbar.performClick();
@@ -108,6 +110,15 @@ public class SearchFeatureProviderImplTest {
assertThat(Shadows.shadowOf(mActivity).getNextStartedActivity()).isNull();
}
@Test
public void buildSearchIntent_shouldIncludeReferrer() {
final Intent searchIntent = mProvider.buildSearchIntent(mActivity, SettingsEnums.TESTING);
final Uri referrer = searchIntent.getParcelableExtra(Intent.EXTRA_REFERRER);
assertThat(referrer.toSafeString()).isEqualTo(
"android-app://" + mActivity.getPackageName() + "/" + SettingsEnums.TESTING);
}
@Test(expected = IllegalArgumentException.class)
public void verifyLaunchSearchResultPageCaller_nullCaller_shouldCrash() {
mProvider.verifyLaunchSearchResultPageCaller(mActivity, null /* caller */);