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

Commit ee4691f1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "feat(expressive) Move description to TopIntroPreference" into main

parents 1117982b 89212917

res/xml/accessibility_edit_shortcuts.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto">



    <Preference

    <com.android.settingslib.widget.TopIntroPreference

        android:key="@string/accessibility_shortcut_description_pref"

        android:persistent="false"

        android:selectable="false"

src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ public class EditShortcutsPreferenceFragment extends DashboardFragment { 


        activity.setTitle(titles.first);

        if (titles.second != null || !Flags.toggleFeatureFragmentCollectionInfo()) {

            descriptionPref.setSummary(titles.second);

            descriptionPref.setTitle(titles.second);

        } else {

            descriptionPref.setVisible(false);

        }