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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-14 03:57:18 +00:00
committed by Android (Google) Code Review
parent c3dfd37df6 1d4c5be0e9
commit 8b9f1d4f9e
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:key="open_by_default_supported_links"
android:title="@string/app_launch_open_domain_urls_title"/> 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 <PreferenceCategory
android:layout="@layout/preference_category_no_label" android:layout="@layout/preference_category_no_label"
android:key="open_by_default_main_category" 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; return;
} }
final Activity activity = getActivity(); final Activity activity = getActivity();
final String summary = activity.getString(R.string.app_launch_top_intro_message);
final Preference pref = EntityHeaderController final Preference pref = EntityHeaderController
.newInstance(activity, this, null /* header */) .newInstance(activity, this, null /* header */)
.setRecyclerView(getListView(), getSettingsLifecycle()) .setRecyclerView(getListView(), getSettingsLifecycle())
.setIcon(Utils.getBadgedIcon(mContext, mPackageInfo.applicationInfo)) .setIcon(Utils.getBadgedIcon(mContext, mPackageInfo.applicationInfo))
.setLabel(mPackageInfo.applicationInfo.loadLabel(mPm)) .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))
.setSummary("" /* summary */) // no version number .setSummary(summary) // add intro text
.setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo)) .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo))
.setPackageName(mPackageName) .setPackageName(mPackageName)
.setUid(mPackageInfo.applicationInfo.uid) .setUid(mPackageInfo.applicationInfo.uid)