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

Merge "Fixed extra padding in "Open by default" page" into sc-dev am: 8b9f1d4f9e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540523

Change-Id: Ibc8307713676c3a8bf26282265feb1e297ed1eb4
This commit is contained in:
TreeHugger Robot
2021-05-14 04:33:12 +00:00
committed by Automerger Merge Worker
parent b970beb0c3 8b9f1d4f9e
commit ac21d38d3a
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/xml/installed_app_launch_settings.xml
View File

@@ -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"

3
src/com/android/settings/applications/intentpicker/AppLaunchSettings.java
View File

@@ -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)