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

Commit ee251006 authored by Riley Jones's avatar Riley Jones Committed by Android (Google) Code Review
Browse files

Merge "Change EditShortcutsPreferenceFragment to use a Preference for... 

Merge "Change EditShortcutsPreferenceFragment to use a Preference for subtitle/description" into main
parents 739647a4 f8237aee

res/xml/accessibility_edit_shortcuts.xml

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

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



    <PreferenceCategory

        android:key="@string/accessibility_shortcut_description_pref">

    <Preference

        android:key="@string/accessibility_shortcut_description_pref"

        android:persistent="false"

        android:selectable="false"

        settings:allowDividerAbove="false"

        settings:allowDividerBelow="false"/>



    <com.android.settings.accessibility.shortcuts.ShortcutOptionPreference

        android:key="@string/accessibility_shortcut_fab_pref"
@@ -78,6 +82,4 @@ 
        settings:allowDividerAbove="false"

        settings:allowDividerBelow="false"

        settings:controller="com.android.settings.accessibility.shortcuts.TripleTapShortcutOptionController" />

    </PreferenceCategory>



</PreferenceScreen>
 
 No newline at end of file

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

+2 −2
Original line number Diff line number Diff line
@@ -207,9 +207,9 @@ public class EditShortcutsPreferenceFragment extends DashboardFragment { 


        activity.setTitle(titles.first);



        String categoryKey = activity.getResources().getString(

        String screenDescriptionPrefKey = getString(

                R.string.accessibility_shortcut_description_pref);

        findPreference(categoryKey).setTitle(titles.second);

        findPreference(screenDescriptionPrefKey).setSummary(titles.second);

    }



    @NonNull