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

Commit 2118ea58 authored by Jason Chiu's avatar Jason Chiu
Browse files

Support target intent data relay in SearchResultTrampoline 

Bug: 240391954
Test: manual & robotest
Change-Id: I2798839dd03f3f2fd165c8cba86b748aa6257804
parent f2bbdf50

src/com/android/settings/homepage/SettingsHomepageActivity.java

+2 −3
Original line number Diff line number Diff line
@@ -438,6 +438,8 @@ public class SettingsHomepageActivity extends FragmentActivity implements 
            return;

        }



        targetIntent.setData(intent.getParcelableExtra(

                SettingsHomepageActivity.EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_DATA));

        final ComponentName targetComponentName = targetIntent.resolveActivity(getPackageManager());

        if (targetComponentName == null) {

            Log.e(TAG, "No valid target for the deep link intent: " + targetIntent);
@@ -457,9 +459,6 @@ public class SettingsHomepageActivity extends FragmentActivity implements 
        targetIntent.putExtra(EXTRA_IS_FROM_SETTINGS_HOMEPAGE, true);

        targetIntent.putExtra(SettingsActivity.EXTRA_IS_FROM_SLICE, false);



        targetIntent.setData(intent.getParcelableExtra(

                SettingsHomepageActivity.EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_DATA));



        // Set 2-pane pair rule for the deep link page.

        ActivityEmbeddingRulesController.registerTwoPanePairRule(this,

                new ComponentName(getApplicationContext(), getClass()),

src/com/android/settings/search/SearchResultTrampoline.java

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB; 
import android.app.Activity;

import android.content.ComponentName;

import android.content.Intent;

import android.net.Uri;

import android.os.Bundle;

import android.provider.Settings;

import android.text.TextUtils;
@@ -86,8 +87,12 @@ public class SearchResultTrampoline extends Activity { 
                return;

            }



            final Uri data = intent.getParcelableExtra(

                    SettingsHomepageActivity.EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_DATA,

                    Uri.class);

            try {

                intent = Intent.parseUri(intentUriString, Intent.URI_INTENT_SCHEME);

                intent.setData(data);

            } catch (URISyntaxException e) {

                Log.e(TAG, "Failed to parse deep link intent: " + e);

                finish();