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

Commit 8ed0cd07 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7985315 from c51a58d8 to sc-v2-release

Change-Id: Ibd4c7dec32a87e8f4f012cb08875ab133f22ddb5
parents 8a43b9e0 c51a58d8
Loading
Loading
Loading
Loading
+15 −1
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@
        </receiver>

        <activity android:name=".SubSettings"
                  android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"
                  android:theme="@style/Theme.SubSettings" />

        <activity android:name=".Settings$CreateShortcutActivity"
@@ -242,6 +241,11 @@
                  android:exported="true"
                  android:launchMode="singleTask"
                  android:configChanges="orientation|screenSize|keyboardHidden">
            <!-- Note: Since the framework does not support the multiple requests of network scan
            from the UI, this singleTask can protect that there is only one
            Settings$NetworkSelectActivity which can request the network scan.
            If removing the "singleTask" in the future, please also modify the
            Settings$NetworkSelectActivity's structure. -->
            <intent-filter android:priority="1">
                <!-- Displays the MobileNetworkActivity and opt-in dialog for capability discovery. -->
                <action android:name="android.telephony.ims.action.SHOW_CAPABILITY_DISCOVERY_OPT_IN" />
@@ -370,6 +374,16 @@
                       android:value="true"/>
        </activity>

        <activity
            android:name="Settings$NetworkSelectActivity"
            android:label="@string/choose_network_title"
            android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize">
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.network.telephony.NetworkSelectSettings" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                android:value="true" />
        </activity>

        <activity
            android:name="Settings$WifiDetailsSettingsActivity"
            android:label="@string/wifi_details_title"
+6 −6
Original line number Diff line number Diff line
@@ -5280,13 +5280,13 @@
    <!-- Message of the magnification mode option to choose the magnification mode. [CHAR LIMIT=none] -->
    <string name="accessibility_magnification_area_settings_mode_switch_summary">Tap the switch button to move between both options</string>
    <!-- Title for the accessibility magnification switch shortcut dialog. [CHAR LIMIT=48] -->
    <string name="accessibility_magnification_switch_shortcut_title">Switch to accessibility button?</string>
    <string name="accessibility_magnification_switch_shortcut_title">This may slow down your keyboard</string>
    <!-- Message for the accessibility magnification switch shortcut dialog. [CHAR LIMIT=none] -->
    <string name="accessibility_magnification_switch_shortcut_message">Using triple-tap to magnify part of your screen causes typing and other delays.\n\nThe accessibility button floats on your screen over other apps. Tap it to magnify.</string>
    <!-- Title for the switch shortcut button in accessibility switch shortcut dialog to change the config shortcut value. [CHAR LIMIT=45] -->
    <string name="accessibility_magnification_switch_shortcut_positive_button">Switch to accessibility button</string>
    <!-- Title for the cancel button in accessibility switch shortcut dialog to keep the config shortcut value. [CHAR LIMIT=54] -->
    <string name="accessibility_magnification_switch_shortcut_negative_button">Use triple-tap</string>
    <string name="accessibility_magnification_switch_shortcut_message">When using triple-tap to magnify part of your screen, you may notice issues over the keyboard.\n\nTo avoid this, you can change your magnification shortcut from triple-tap to another option.\n<annotation id="link">Change setting</annotation></string>
    <!-- Title for the switch shortcut button in accessibility switch shortcut dialog to confirm the action. [CHAR LIMIT=45] -->
    <string name="accessibility_magnification_switch_shortcut_positive_button">Continue anyway</string>
    <!-- Title for the cancel button in accessibility switch shortcut dialog to go back to edit. [CHAR LIMIT=54] -->
    <string name="accessibility_magnification_switch_shortcut_negative_button">Cancel</string>
    <!-- Title for the accessibility preference screen to enable screen magnification settings. [CHAR LIMIT=35] -->
    <string name="accessibility_magnification_service_settings_title">Magnification settings</string>
    <!-- Title for the accessibility preference screen to enable triple-tap gesture screen magnification. [CHAR LIMIT=35] -->
+0 −1
Original line number Diff line number Diff line
@@ -223,7 +223,6 @@
            <Preference
                android:key="choose_network_key"
                android:title="@string/choose_network_title"
                android:fragment="com.android.phone.NetworkSelectSetting"
                settings:controller="com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenceController"/>
        </PreferenceCategory>

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ public class Settings extends SettingsActivity {
    public static class PublicVolumeSettingsActivity extends SettingsActivity { /* empty */ }
    public static class WifiSettingsActivity extends SettingsActivity { /* empty */ }
    public static class NetworkProviderSettingsActivity extends SettingsActivity { /* empty */ }
    public static class NetworkSelectActivity extends SettingsActivity { /* empty */ }
    /** Activity for the Wi-Fi network details settings. */
    public static class WifiDetailsSettingsActivity extends SettingsActivity { /* empty */ }
    public static class WifiP2pSettingsActivity extends SettingsActivity { /* empty */ }
+3 −2
Original line number Diff line number Diff line
@@ -377,8 +377,9 @@ public class SettingsActivity extends SettingsBaseActivity
    public static Intent getTrampolineIntent(Intent intent, String highlightMenuKey) {
        final Intent detailIntent = new Intent(intent);
        // It's a deep link intent, SettingsHomepageActivity will set SplitPairRule and start it.
        final Intent trampolineIntent = new Intent(ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY);
        trampolineIntent.replaceExtras(detailIntent);
        final Intent trampolineIntent = new Intent(ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY)
                .setPackage(Utils.SETTINGS_PACKAGE_NAME)
                .replaceExtras(detailIntent);

        // Relay detail intent data to prevent failure of Intent#ParseUri.
        // If Intent#getData() is not null, Intent#toUri will return an Uri which has the scheme of
Loading