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

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

Snap for 11151698 from d4e09de3 to 24Q1-release 

Change-Id: I1797d483b344229ec88ac2d5be74de751bc00dbd
parents 64948bff d4e09de3

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ android_library { 
        "battery-event-protos-lite",

        "battery-usage-slot-protos-lite",

        "contextualcards",

        "development_settings_flag_lib",

        "factory_reset_flags_lib",

        "fuelgauge-log-protos-lite",

        "fuelgauge-usage-state-protos-lite",

AndroidManifest.xml

+9 −5
Original line number Diff line number Diff line
@@ -16,11 +16,6 @@ 
        android:name="com.android.settings.USE_BIOMETRIC_PROVIDER"

        android:protectionLevel="signature|privileged"/>



    <!-- Permissions for acting as the factory reset preparation application. -->

    <permission

        android:name="com.android.settings.permissions.PREPARE_FACTORY_RESET"

        android:protectionLevel="signature|privileged"/>



    <uses-permission android:name="android.permission.REQUEST_NETWORK_SCORES" />

    <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />

    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
@@ -4290,6 +4285,15 @@ 
                       android:value="true" />

        </activity>



        <!-- Access to the Credential Manager list. -->

        <activity android:name=".applications.credentials.CredentialsPickerActivity"

                android:excludeFromRecents="true"

                android:launchMode="singleInstance"

                android:exported="false">

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

                       android:value="com.android.settings.applications.credentials.DefaultCombinedPicker" />

        </activity>



        <activity

            android:name=".Settings$SystemDashboardActivity"

            android:label="@string/header_category_system"

aconfig/Android.bp

+13 −0
Original line number Diff line number Diff line
@@ -47,3 +47,16 @@ java_aconfig_library { 
    name: "accessibility_settings_flags_lib",

    aconfig_declarations: "accessibility_flags",

}



aconfig_declarations {

    name: "development_settings_flags",

    package: "com.android.settings.development",

    srcs: [

        "development/**/*.aconfig"

    ],

}



java_aconfig_library {

    name: "development_settings_flag_lib",

    aconfig_declarations: "development_settings_flags",

}

aconfig/development/settings_core_flag_declarations.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.settings.development"



flag {

  name: "deprecate_list_activity"

  namespace: "android_settings"

  description: "Feature flag for deprecating ListActivity in Settings"

  bug: "299195099"

}

res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -950,7 +950,7 @@ 
    </style>



    <style name="ScreenLockPasswordHintTextFontStyle">

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:textColor">?android:attr/colorError</item>

        <item name="android:fontFamily">google-sans-text</item>

    </style>