From 1d4c5be0e90e5ea93cf7004c2c0183f660065eb3 Mon Sep 17 00:00:00 2001
From: Sunny Shao <sunnyshao@google.com>
Date: Thu, 13 May 2021 16:53:20 +0800
Subject: [PATCH] Fixed extra padding in "Open by default" page

- Page layout redesign.

Bug: 184228266
Test: manual test
Change-Id: I1323ca14b1843a95ba1210674595ee3ba1a94c67
---
 res/xml/installed_app_launch_settings.xml                     | 4 ----
 .../settings/applications/intentpicker/AppLaunchSettings.java | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/res/xml/installed_app_launch_settings.xml b/res/xml/installed_app_launch_settings.xml
index d631e56eaa0..7d971b07d2b 100644
--- a/res/xml/installed_app_launch_settings.xml
+++ b/res/xml/installed_app_launch_settings.xml
@@ -23,10 +23,6 @@
         android:key="open_by_default_supported_links"
         android:title="@string/app_launch_open_domain_urls_title"/>
 
-    <com.android.settingslib.widget.TopIntroPreference
-        android:key="open_by_default_top_intro"
-        android:title="@string/app_launch_top_intro_message"/>
-
     <PreferenceCategory
         android:layout="@layout/preference_category_no_label"
         android:key="open_by_default_main_category"
diff --git a/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java b/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java
index a2771697373..8683f56af79 100644
--- a/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java
+++ b/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java
@@ -191,12 +191,13 @@ public class AppLaunchSettings extends AppInfoBase implements
             return;
         }
         final Activity activity = getActivity();
+        final String summary = activity.getString(R.string.app_launch_top_intro_message);
         final Preference pref = EntityHeaderController
                 .newInstance(activity, this, null /* header */)
                 .setRecyclerView(getListView(), getSettingsLifecycle())
                 .setIcon(Utils.getBadgedIcon(mContext, mPackageInfo.applicationInfo))
                 .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))
-                .setSummary("" /* summary */)  // no version number
+                .setSummary(summary)  // add intro text
                 .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo))
                 .setPackageName(mPackageName)
                 .setUid(mPackageInfo.applicationInfo.uid)