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

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

Snap for 12763142 from d41b7cb3 to 25Q1-release 

Change-Id: Ib41e9ec2c3662e5d1892ec79c9934c7625218c38
parents 1d207494 d41b7cb3

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ android_library { 
    ],

    flags_packages: [

        "aconfig_settings_flags",

        "aconfig_settingslib_flags",

        "android.app.flags-aconfig",

        "android.provider.flags-aconfig",

        "android.security.flags-aconfig",

AndroidManifest.xml

+11 −0
Original line number Diff line number Diff line
@@ -5412,6 +5412,17 @@ 
            </intent-filter>

        </service>



        <!-- Service to expose Preference Metadata and Get/Set functionality -->

        <service

            android:name=".service.PreferenceService"

            android:exported="true"

            android:featureFlag="com.android.settingslib.flags.settings_catalyst"

            android:permission="android.permission.READ_SYSTEM_PREFERENCES">

            <intent-filter>

                <action android:name="android.service.settings.preferences.action.PREFERENCE_SERVICE" />

            </intent-filter>

        </service>



        <receiver android:name="com.android.settings.connecteddevice.audiosharing.AudioSharingReceiver"

            android:exported="false">

            <intent-filter>

res-product/values-af/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="7909547303183236140">"\'n App wil jou foon vir ander Bluetooth-toestelle sigbaar maak. Jy kan dit later in Bluetooth-instellings verander."</string>

    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="6187874232925632790">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth aanskakel en jou tablet <xliff:g id="TIMEOUT">%2$d</xliff:g> sekondes lank vir ander toestelle sigbaar maak."</string>

    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="1018495685727482700">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth aanskakel en jou foon <xliff:g id="TIMEOUT">%2$d</xliff:g> sekondes lank vir ander toestelle sigbaar maak."</string>

    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="3469927640700478737">"\'n Program wil Bluetooth aanskakel en jou tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes lank vir ander toestelle sigbaar maak."</string>

    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="3469927640700478737">"\'n App wil Bluetooth aanskakel en jou tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes lank vir ander toestelle sigbaar maak."</string>

    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="4847493437698663706">"\'n App wil Bluetooth aanskakel en jou foon <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes lank vir ander toestelle sigbaar maak."</string>

    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="487436507630570730">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth aanskakel en jou tablet vir ander toestelle sigbaar maak. Jy kan dit later in Bluetooth-instellings verander."</string>

    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="5169934906530139494">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth aanskakel en jou foon vir ander toestelle sigbaar maak. Jy kan dit later in Bluetooth-instellings verander."</string>

res-product/values-zh-rTW/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ 
    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="5609616352941038118">"當行動數據用量達到你設定的上限時，平板電腦將關閉行動數據功能。\n\n由於數據用量是由平板電腦自動計算，而電信業者對用量的計算方式可能有所不同，因此建議你設定保守的上限值。"</string>

    <string name="data_usage_limit_dialog_mobile" product="default" msgid="4552449053646826676">"當行動數據用量達到你設定的上限時，手機將關閉行動數據功能。\n\n由於數據用量是由手機自動計算，而電信業者對用量的計算方式可能有所不同，因此建議你設定保守的上限值。"</string>

    <string name="user_settings_footer_text" product="device" msgid="8543171604218174424">"新增使用者來共用你的裝置。每位使用者在裝置上都享有個人空間，並可自訂主畫面、帳戶、應用程式和設定等。"</string>

    <string name="user_settings_footer_text" product="tablet" msgid="4749331578207116797">"新增使用者來共用你的平板電腦。每位使用者在平板電腦上都享有個人空間，並可自訂主畫面、帳戶、應用程式和設定等。"</string>

    <string name="user_settings_footer_text" product="tablet" msgid="4749331578207116797">"新增可共用平板電腦的使用者。每位使用者在平板電腦上都享有個人空間，並可自訂主畫面、帳戶、應用程式和設定等。"</string>

    <string name="user_settings_footer_text" product="default" msgid="5440172971747221370">"你可以新增其他使用者，與他們共用同一支手機。每位使用者在你的手機上都有自己的個人空間，並可自訂主畫面、帳戶、應用程式和設定等等。"</string>

    <string name="user_cannot_manage_message" product="tablet" msgid="5566619500245432179">"只有平板電腦的擁有者可以管理使用者。"</string>

    <string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"只有手機的擁有者可以管理使用者。"</string>

res/drawable/satellite_sos_counter_1.xml

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960">

  <path

      android:pathData="M480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480q0,-83 31.5,-156T197,197q54,-54 127,-85.5T480,80q83,0 156,31.5T763,197q54,54 85.5,127T880,480q0,83 -31.5,156T763,763q-54,54 -127,85.5T480,880ZM480,800q134,0 227,-93t93,-227q0,-134 -93,-227t-227,-93q-134,0 -227,93t-93,227q0,134 93,227t227,93ZM480,480ZM460,680h80v-400L380,280v80h80v320Z"

      android:fillColor="#e8eaed"/>

</vector>