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

Commit c326b50f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixing issue with wrong translatable attribute."

parents 67842ba0 592484b2

core/res/res/values/config.xml

+4 −4
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ 
    <bool name="config_hotswapCapable">false</bool>



    <!-- Component name of the ICC hotswap prompt for restart dialog -->

    <string name="config_iccHotswapPromptForRestartDialogComponent" translateable="false">@null</string>

    <string name="config_iccHotswapPromptForRestartDialogComponent" translatable="false">@null</string>



    <!-- Enable puk unlockscreen by default.

         If unlock screen is disabled, the puk should be unlocked through Emergency Dialer -->
@@ -1425,7 +1425,7 @@ 
         permission.

         [This is only used if config_enableUpdateableTimeZoneRules and

         config_timeZoneRulesUpdateTrackingEnabled are true.] -->

    <string name="config_timeZoneRulesUpdaterPackage" translateable="false">com.android.timezone.updater</string>

    <string name="config_timeZoneRulesUpdaterPackage" translatable="false">com.android.timezone.updater</string>



    <!-- The package of the time zone rules data application. Expected to be configured

         by OEMs to reference their own priv-app APK package.
@@ -1434,7 +1434,7 @@ 
         data app packages.

         [This is only used if config_enableUpdateableTimeZoneRules and

         config_timeZoneRulesUpdateTrackingEnabled are true.] -->

    <string name="config_timeZoneRulesDataPackage" translateable="false"></string>

    <string name="config_timeZoneRulesDataPackage" translatable="false"></string>



    <!-- The allowed time in milliseconds between an update check intent being broadcast and the

         response being considered overdue. Reliability triggers will not fire in this time.
@@ -3252,7 +3252,7 @@ 
    <string translatable="false" name="config_deviceSpecificAudioService"></string>



    <!-- Component name of media projection permission dialog -->

    <string name="config_mediaProjectionPermissionDialogComponent" translateable="false">com.android.systemui/com.android.systemui.media.MediaProjectionPermissionActivity</string>

    <string name="config_mediaProjectionPermissionDialogComponent" translatable="false">com.android.systemui/com.android.systemui.media.MediaProjectionPermissionActivity</string>



    <!-- Corner radius of system dialogs -->

    <dimen name="config_dialogCornerRadius">2dp</dimen>

packages/SystemUI/res/values-af/config.xml

+0 −1
Original line number Diff line number Diff line
@@ -22,6 +22,5 @@ 


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

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

    <string name="config_overviewServiceComponent" msgid="2288311504315574053">"com.android.launcher3/com.android.quickstep.TouchInteractionService"</string>

    <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>

</resources>

packages/SystemUI/res/values-am/config.xml

+0 −1
Original line number Diff line number Diff line
@@ -22,6 +22,5 @@ 


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

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

    <string name="config_overviewServiceComponent" msgid="2288311504315574053">"com.android.launcher3/com.android.quickstep.TouchInteractionService"</string>

    <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>

</resources>

packages/SystemUI/res/values-ar/config.xml

+0 −1
Original line number Diff line number Diff line
@@ -22,6 +22,5 @@ 


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

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

    <string name="config_overviewServiceComponent" msgid="2288311504315574053">"com.android.launcher3/com.android.quickstep.TouchInteractionService"</string>

    <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>

</resources>

packages/SystemUI/res/values-az/config.xml

+0 −1
Original line number Diff line number Diff line
@@ -22,6 +22,5 @@ 


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

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

    <string name="config_overviewServiceComponent" msgid="2288311504315574053">"com.android.launcher3/com.android.quickstep.TouchInteractionService"</string>

    <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>

</resources>