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

Commit 9f8fe43c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11142129 from b76f32ef to 24Q1-release 

Change-Id: Ifbf4d550b06186cfce8ca6fb423666ff80591355
parents df97bd32 b76f32ef

AndroidManifest.xml

+0 −10
Original line number Diff line number Diff line
@@ -3389,16 +3389,6 @@ 
                <action android:name="android.settings.USER_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.order" android:value="-45"/>

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

                       android:value="com.android.settings.category.ia.system" />

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

                       android:value="content://com.android.settings.dashboard.SummaryProvider/user" />

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

                       android:resource="@drawable/ic_settings_multiuser" />

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

                       android:value="com.android.settings.users.UserSettings" />

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

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -2656,6 +2656,8 @@ 
    <string name="adaptive_sleep_contextual_slice_title">Turn on screen attention</string>

    <!-- Description about the contextual adaptive sleep card [CHAR LIMIT=NONE]-->

    <string name="adaptive_sleep_contextual_slice_summary">Keep screen on when looking at it</string>

    <!-- Description about the power consumption implication in screen timeout footer [CHAR LIMIT=NONE]-->

    <string name="power_consumption_footer_summary">Longer screen timeout will use more battery.</string>

    <!-- auto_rotate settings screen, title about the camera privacy lock enabled [CHAR LIMIT=NONE]-->

    <string name="auto_rotate_camera_lock_title">Camera is locked</string>

    <!-- Description feature's privacy sensitive details to make sure users understand what feature users, what it saves/sends etc [CHAR LIMIT=NONE]-->

res/xml/system_dashboard_fragment.xml

+8 −0
Original line number Diff line number Diff line
@@ -92,6 +92,14 @@ 
        <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS"/>

    </Preference>



    <Preference

        android:key="system_multiuser"

        android:title="@string/user_settings_title"

        android:icon="@drawable/ic_settings_multiuser"

        android:order="-45"

        android:fragment="com.android.settings.users.UserSettings"

        settings:controller="com.android.settings.users.MultiUserPreferenceController"/>



    <Preference

        android:key="reset_dashboard"

        android:title="@string/reset_dashboard_title"

src/com/android/settings/SettingsActivity.java

+0 −6
Original line number Diff line number Diff line
@@ -781,12 +781,6 @@ public class SettingsActivity extends SettingsBaseActivity 
                Utils.isBandwidthControlEnabled(), isAdmin)

                || somethingChanged;



        somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,

                        Settings.UserSettingsActivity.class.getName()),

                UserHandle.MU_ENABLED && UserManager.supportsMultipleUsers()

                        && !Utils.isMonkeyRunning(), isAdmin)

                || somethingChanged;



        final boolean showDev = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)

                && !Utils.isMonkeyRunning();

        somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,

src/com/android/settings/connecteddevice/audiosharing/AudioSharingBasePreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public abstract class AudioSharingBasePreferenceController extends BasePreferenc 
        mPreference.setVisible(isVisible);

    }



    private boolean isBroadcasting() {

    protected boolean isBroadcasting() {

        return mBroadcast != null && mBroadcast.isEnabled(null);

    }

}