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

Commit f2759be9 authored by Xin Li's avatar Xin Li
Browse files

Merge 24Q3 to AOSP main 

Bug: 357762254
Merged-In: I92cce5f51a6d2463731ac5817e39a3934d538a52
Change-Id: I6eead3d09c08add04d1c3c4b9b43ccdb3a121c55
parents 88aa37e8 d68e0ea8

proguard.cfg

+0 −6
Original line number Diff line number Diff line
@@ -24,9 +24,3 @@ 
-keepclasseswithmembers class * {

    public <init>(android.content.Context, android.util.AttributeSet, int);

}
 


# Keep annotated classes or class members.

-keep @androidx.annotation.Keep class *

-keepclassmembers class * {

    @androidx.annotation.Keep *;

}

res/values-en-rCA/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    <string name="accessibility_settings" msgid="1488998032020612740">"Accessibility"</string>

    <string name="physical_keyboard_title" msgid="3955072245281785000">"Physical keyboard"</string>

    <string name="add_virtual_keyboard" msgid="542703692821933851">"Manage keyboards"</string>

    <string name="app_name_settings_intelligence" msgid="8701735500346011661">"Settings suggestions"</string>

    <string name="app_name_settings_intelligence" msgid="8701735500346011661">"Settings Suggestions"</string>

    <string name="search_clear_history" msgid="6232116698940067519">"Clear history"</string>

    <string name="search_no_results" msgid="6855095945475439835">"No results"</string>

</resources>

res/values-fr-rCA/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="applications_settings" msgid="3446736638853404682">"Détails de l\'application"</string>

    <string name="applications_settings" msgid="3446736638853404682">"Détails de l\'appli"</string>

    <string name="accessibility_settings_classname" msgid="973410590374198997">"com.android.settings.accessibility.AccessibilitySettings"</string>

    <string name="accessibility_settings" msgid="1488998032020612740">"Accessibilité"</string>

    <string name="physical_keyboard_title" msgid="3955072245281785000">"Clavier physique"</string>

res/values-ta/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="applications_settings" msgid="3446736638853404682">"ஆப்ஸ் தகவல்கள்"</string>

    <string name="accessibility_settings_classname" msgid="973410590374198997">"com.android.settings.accessibility.AccessibilitySettings"</string>

    <string name="accessibility_settings" msgid="1488998032020612740">"அணுகல்தன்மை"</string>

    <string name="accessibility_settings" msgid="1488998032020612740">"மாற்றுத்திறன் வசதி"</string>

    <string name="physical_keyboard_title" msgid="3955072245281785000">"கீபோர்டு"</string>

    <string name="add_virtual_keyboard" msgid="542703692821933851">"கீபோர்டுகளை நிர்வகியுங்கள்"</string>

    <string name="app_name_settings_intelligence" msgid="8701735500346011661">"Settings Suggestions"</string>