commit 9e1e4f18a3449cb98225b1c5222cbafd5319fb49
author Matthew DeVore <matvore@google.com> Mon Mar 03 11:10:00 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 03 11:10:00 2025 -0800
tree e4cb4ced0f532c4501ce985f06a8750ee159a9cb
parent b0103842f54e2e6348c34f195356db7b9f1078c8
parent 0a583b223e18e3a0051368edb60399299e0c9e57

Merge changes I95721d9b,Id43d2f10 into main

* changes:
  Connected displays: use Robolectric for tests
  CD settings: minimal DisplayDevice metadata class

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d3c82d6..7eb8910 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1803,6 +1803,38 @@
         </activity>
 
         <activity
+            android:name=".Settings$MagnificationActivity"
+            android:label="@string/accessibility_screen_magnification_title"
+            android:exported="true">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.MAGNIFICATION_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.ToggleScreenMagnificationPreferenceFragment" />
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_accessibility"/>
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
+        <activity
+            android:name=".Settings$FlashNotificationsActivity"
+            android:label="@string/flash_notifications_title"
+            android:exported="true">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.FLASH_NOTIFICATIONS_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.FlashNotificationsPreferenceFragment" />
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_accessibility"/>
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
+        <activity
             android:name="SettingsLicenseActivity"
             android:label="@string/settings_license_activity_title"
             android:exported="true"

src/com/android/settings/Settings.java

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index c8b0783..8dbae01 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -536,4 +536,6 @@
     public static class HearingDevicesPairingActivity extends SettingsActivity { /* empty */ }
     public static class ContactsStorageSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ContentProtectionSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class MagnificationActivity extends SettingsActivity { /* empty */ }
+    public static class FlashNotificationsActivity extends SettingsActivity { /* empty */ }
 }

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

diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 81dc3ad..a26bd14 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -30,12 +30,14 @@
 import com.android.settings.accessibility.AccessibilitySettingsForSetupWizard;
 import com.android.settings.accessibility.CaptioningPropertiesFragment;
 import com.android.settings.accessibility.ColorAndMotionFragment;
+import com.android.settings.accessibility.FlashNotificationsPreferenceFragment;
 import com.android.settings.accessibility.HearingDevicePairingFragment;
 import com.android.settings.accessibility.TextReadingPreferenceFragment;
 import com.android.settings.accessibility.TextReadingPreferenceFragmentForSetupWizard;
 import com.android.settings.accessibility.ToggleColorInversionPreferenceFragment;
 import com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment;
 import com.android.settings.accessibility.ToggleReduceBrightColorsPreferenceFragment;
+import com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment;
 import com.android.settings.accessibility.VibrationIntensitySettingsFragment;
 import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment;
 import com.android.settings.accounts.AccountDashboardFragment;
@@ -418,6 +420,8 @@
             ZenModeFragment.class.getName(),
             ContactsStorageSettings.class.getName(),
             ContentProtectionPreferenceFragment.class.getName(),
+            ToggleScreenMagnificationPreferenceFragment.class.getName(),
+            FlashNotificationsPreferenceFragment.class.getName(),
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {