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

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

Merge "Created a dedicated activity for EditShortcutsPreferenceFragment. This... 

Merge "Created a dedicated activity for EditShortcutsPreferenceFragment. This will allow it to be reached via intent." into main
parents 4db26987 4e195505

AndroidManifest.xml

+15 −0
Original line number Diff line number Diff line
@@ -2283,6 +2283,21 @@ 
                android:value="true" />

        </activity>



        <activity

            android:name="Settings$AccessibilityEditShortcutsActivity"

            android:label="@string/accessibility_settings"

            android:exported="true"

            android:permission="android.permission.MANAGE_ACCESSIBILITY">

            <intent-filter android:priority="1">

                <action android:name="android.settings.ACCESSIBILITY_SHORTCUT_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                       android:value="@string/menu_key_accessibility"/>

        </activity>



        <activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity"

                android:icon="@drawable/ic_accessibility_suggestion"

                android:label="@string/vision_settings_title"

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ public class Settings extends SettingsActivity { 
    public static class DevelopmentSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AccessibilitySettingsActivity extends SettingsActivity { /* empty */ }

    public static class AccessibilityDetailsSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AccessibilityEditShortcutsActivity extends SettingsActivity { /* empty */ }

    public static class CaptioningSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AccessibilityInversionSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AccessibilityContrastSettingsActivity extends SettingsActivity { /* empty */ }

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

+1 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ public class EditShortcutsPreferenceFragment extends DashboardFragment { 
        }



        mShortcutTargets = Set.of(targets);

        // TODO(318748373): use 'targets' to populate title when no title is given

    }



    @Override

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.settings.accessibility.TextReadingPreferenceFragmentForSetupW 
import com.android.settings.accessibility.ToggleColorInversionPreferenceFragment;

import com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment;

import com.android.settings.accessibility.ToggleReduceBrightColorsPreferenceFragment;

import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment;

import com.android.settings.accounts.AccountDashboardFragment;

import com.android.settings.accounts.AccountSyncSettings;

import com.android.settings.accounts.ChooseAccountFragment;
@@ -250,6 +251,7 @@ public class SettingsGateway { 
            AccessibilityDetailsSettingsFragment.class.getName(),

            AccessibilitySettings.class.getName(),

            AccessibilitySettingsForSetupWizard.class.getName(),

            EditShortcutsPreferenceFragment.class.getName(),

            TextReadingPreferenceFragment.class.getName(),

            TextReadingPreferenceFragmentForSetupWizard.class.getName(),

            CaptioningPropertiesFragment.class.getName(),