From 3ff6f14f43f92be50d8c27851b9ee347d10b3d67 Mon Sep 17 00:00:00 2001
From: Arc Wang <arcwang@google.com>
Date: Wed, 27 Oct 2021 11:45:59 +0800
Subject: [PATCH] [Large screen] Shows SearchActivity at right pane

This change removes alwaysExpand ActivityRule registration
for SearchActivity.

Bug: 204260066
Test: manual
      Settings -> Click 'Search settings'
Change-Id: I4625756bf89568fcdf690e5930b76c3e2ece5043
---
 .../ActivityEmbeddingRulesController.java         | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
index e9dcea19471..d57c0c28d59 100644
--- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
+++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
@@ -17,7 +17,6 @@
 package com.android.settings.activityembedding;
 
 import android.app.Activity;
-import android.app.settings.SettingsEnums;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -26,7 +25,6 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.window.embedding.ActivityFilter;
-import androidx.window.embedding.ActivityRule;
 import androidx.window.embedding.SplitController;
 import androidx.window.embedding.SplitPairFilter;
 import androidx.window.embedding.SplitPairRule;
@@ -36,7 +34,6 @@ import com.android.settings.Settings;
 import com.android.settings.SubSettings;
 import com.android.settings.Utils;
 import com.android.settings.homepage.SettingsHomepageActivity;
-import com.android.settings.overlay.FeatureFactory;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -73,8 +70,6 @@ public class ActivityEmbeddingRulesController {
                 null /* secondaryIntentAction */,
                 true /* finishPrimaryWithSecondary */,
                 true /* finishSecondaryWithPrimary */);
-        // Set rules here to show full screen for specified Activity.
-        registerAlwaysExpandRule();
     }
 
     /** Register a SplitPairRule for 2-pane. */
@@ -98,16 +93,6 @@ public class ActivityEmbeddingRulesController {
                 LayoutDirection.LOCALE));
     }
 
-    private void registerAlwaysExpandRule() {
-        final Set<ActivityFilter> activityFilters = new HashSet<>();
-
-        final Intent searchIntent = FeatureFactory.getFactory(mContext).getSearchFeatureProvider()
-                .buildSearchIntent(mContext, SettingsEnums.SETTINGS_HOMEPAGE);
-        addActivityFilter(activityFilters, searchIntent);
-
-        mSplitController.registerRule(new ActivityRule(activityFilters, true /* alwaysExpand */));
-    }
-
     private void registerHomepagePlaceholderRule() {
         final Set<ActivityFilter> activityFilters = new HashSet<>();
         addActivityFilter(activityFilters, SettingsHomepageActivity.class);