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

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

Snap for 7502225 from 89af43a4 to sc-d1-release

Change-Id: I7e79792be9a0c4749b67f4af51499630c48ae305
parents dae1bb7c 89af43a4
Loading
Loading
Loading
Loading
+1 −18
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@

        <activity android:name=".network.telephony.MobileNetworkActivity"
                  android:label="@string/network_settings_title"
                  android:theme="@style/Theme.SubSettings"
                  android:exported="true"
                  android:launchMode="singleTask">
            <intent-filter android:priority="1">
@@ -181,7 +180,6 @@

        <activity android:name=".Settings$CreateShortcutActivity"
                  android:exported="true"
                  android:theme="@style/Theme.SubSettings"
                  android:label="@string/settings_shortcut">
            <intent-filter>
                <action android:name="android.intent.action.CREATE_SHORTCUT" />
@@ -418,7 +416,6 @@
                android:label="@string/apn_settings"
                android:launchMode="singleTask"
                android:exported="true"
                android:theme="@style/Theme.SubSettings"
                android:configChanges="orientation|keyboardHidden|screenSize">
            <intent-filter android:priority="1">
                <action android:name="android.settings.APN_SETTINGS" />
@@ -473,7 +470,6 @@

        <activity android:name="Settings$FaceSettingsActivity"
            android:label="@string/security_settings_face_preference_title"
            android:theme="@style/Theme.SubSettings"
            android:exported="true"
            android:icon="@drawable/ic_face_header">
            <intent-filter>
@@ -498,7 +494,6 @@

        <activity android:name="Settings$CombinedBiometricSettingsActivity"
                  android:label="@string/security_settings_biometric_preference_title"
                  android:theme="@style/Theme.SubSettings"
                  android:exported="false">
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                       android:value="com.android.settings.biometrics.combination.CombinedBiometricSettings" />
@@ -506,7 +501,6 @@

        <activity android:name="Settings$CombinedBiometricProfileSettingsActivity"
                  android:label="@string/security_settings_biometric_preference_title"
                  android:theme="@style/Theme.SubSettings"
                  android:exported="false">
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                       android:value="com.android.settings.biometrics.combination.CombinedBiometricProfileSettings" />
@@ -712,8 +706,7 @@
        <activity
            android:name="Settings$ManageAssistActivity"
            android:exported="true"
            android:label="@string/assist_and_voice_input_title"
            android:theme="@style/Theme.SubSettings">
            android:label="@string/assist_and_voice_input_title">
            <intent-filter android:priority="1">
                <action android:name="android.settings.VOICE_INPUT_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
@@ -1153,7 +1146,6 @@
        <activity
            android:name="Settings$ManageDomainUrlsActivity"
            android:exported="true"
            android:theme="@style/Theme.SubSettings"
            android:label="@string/domain_urls_title">
            <intent-filter>
                <action android:name="android.settings.MANAGE_DOMAIN_URLS" />
@@ -1331,7 +1323,6 @@
        <activity
            android:name=".notification.history.NotificationHistoryActivity"
            android:exported="true"
            android:theme="@style/Theme.SubSettings"
            android:label="@string/notification_history_title">
            <intent-filter android:priority="1">
                <action android:name="android.settings.NOTIFICATION_HISTORY" />
@@ -1494,7 +1485,6 @@
        </activity>

        <activity android:name=".security.RequestManageCredentials"
                  android:theme="@style/Theme.SubSettings"
                  android:exported="true">
            <intent-filter>
                <action android:name="android.security.MANAGE_CREDENTIALS"/>
@@ -1527,7 +1517,6 @@
        <activity android:name=".applications.specialaccess.deviceadmin.DeviceAdminAdd"
                  android:label="@string/device_admin_add_title"
                  android:exported="true"
                  android:theme="@style/Theme.SubSettings"
                  android:clearTaskOnLaunch="true">
            <intent-filter>
                <action android:name="android.app.action.ADD_DEVICE_ADMIN" />
@@ -2087,7 +2076,6 @@
        <activity android:name="Settings$ApnEditorActivity"
                android:configChanges="orientation|keyboardHidden|screenSize"
                android:exported="true"
                android:theme="@style/Theme.SubSettings"
                android:label="@string/apn_edit">
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
@@ -2458,7 +2446,6 @@

        <activity
            android:name="com.android.settings.accounts.AddAccountSettings"
            android:theme="@style/Theme.SubSettings"
            android:configChanges="orientation|keyboardHidden|screenSize"
            android:exported="true"
            android:label="@string/header_add_an_account">
@@ -2472,7 +2459,6 @@

        <activity android:name="Settings$ChooseAccountActivity"
            android:label="@string/header_add_an_account"
                  android:theme="@style/Theme.SubSettings"
            android:configChanges="orientation|keyboardHidden|screenSize">
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                       android:value="com.android.settings.accounts.ChooseAccountFragment" />
@@ -3033,7 +3019,6 @@
        <activity
            android:name="Settings$WifiCallingSettingsActivity"
            android:exported="true"
            android:theme="@style/Theme.SubSettings"
            android:label="@string/wifi_calling_settings_title">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
@@ -3723,7 +3708,6 @@
            android:name="Settings$GestureNavigationSettingsActivity"
            android:label="@string/gesture_settings_activity_title"
            android:exported="true"
            android:theme="@style/Theme.SubSettings"
            android:enabled="true">
            <intent-filter android:priority="32">
                <action android:name="android.intent.action.MAIN" />
@@ -3807,7 +3791,6 @@
                 android:permission="android.permission.BIND_JOB_SERVICE" />

        <activity android:name=".sim.smartForwarding.SmartForwardingActivity"
            android:theme="@style/Theme.SubSettings.Base"
            android:exported="true"
            android:launchMode="singleTask">
        </activity>
+12 −13
Original line number Diff line number Diff line
@@ -15,20 +15,19 @@
  limitations under the License.
  -->

<FrameLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content">
<com.google.android.material.card.MaterialCardView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/container"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_margin="8dp"
    android:foreground="@drawable/contextual_card_background"
    android:clickable="true"
    style="@style/ContextualCardStyle">

    <include
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginStart="-8dp"
        layout="@layout/settingslib_preference"/>
</com.google.android.material.card.MaterialCardView>
</FrameLayout>
+16 −10
Original line number Diff line number Diff line
@@ -556,8 +556,7 @@
    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"Jy kan jou vingerafdruk nie net gebruik om jou foon te ontsluit nie, maar ook om aankope en programtoegang te magtig. "<annotation id="url">"Kom meer te wete"</annotation></string>
    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="4260983700868889294">" Die skermslotopsie is gedeaktiveer. Kontak jou organisasie se administrateur om meer te wete te kom. "<annotation id="admin_details">"Nog besonderhede"</annotation>\n\n"Jy kan steeds jou vingerafdruk gebruik om aankope en programtoegang te magtig. "<annotation id="url">"Kom meer te wete"</annotation></string>
    <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Lig vinger op en raak sensor dan weer"</string>
    <!-- no translation found for security_settings_fingerprint_bad_calibration (2193097225615229726) -->
    <skip />
    <string name="security_settings_fingerprint_bad_calibration" msgid="598502302101068608">"Kan nie vingerafdruksensor gebruik nie. Besoek \'n verskaffer wat herstelwerk doen"</string>
    <string name="fingerprint_add_max" msgid="8639321019299347447">"Jy kan tot <xliff:g id="COUNT">%d</xliff:g> vingerafdrukke byvoeg"</string>
    <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Jy het die maksimum aantal vingerafdrukke bygevoeg"</string>
    <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Kan nie nog vingerafdrukke byvoeg nie"</string>
@@ -1917,6 +1916,15 @@
    <string name="lockpassword_choose_your_profile_pin_header" msgid="4581749963670819048">"Stel \'n werk-PIN"</string>
    <string name="lockpassword_choose_your_pattern_header" msgid="5674909390779586252">"Stel \'n patroon"</string>
    <string name="lockpassword_choose_your_profile_pattern_header" msgid="3101811498330756641">"Stel \'n werkpatroon"</string>
    <string name="lockpassword_choose_password_description" product="phone" msgid="5577129054698844787">"Stel \'n wagwoord om die foon te ontsluit vir bykomende sekuriteit"</string>
    <string name="lockpassword_choose_pin_description" product="phone" msgid="6918551978526104693">"Stel \'n PIN om die foon te ontsluit vir bykomende sekuriteit"</string>
    <string name="lockpattern_choose_pattern_description" product="phone" msgid="9192075941504119893">"Stel \'n patroon om die foon te ontsluit vir bykomende sekuriteit"</string>
    <string name="lockpassword_choose_password_description" product="tablet" msgid="8643302878337665976">"Stel \'n wagwoord om die tablet te ontsluit vir bykomende sekuriteit"</string>
    <string name="lockpassword_choose_pin_description" product="tablet" msgid="4655253942098525998">"Stel \'n PIN om die tablet te ontsluit vir bykomende sekuriteit"</string>
    <string name="lockpattern_choose_pattern_description" product="tablet" msgid="6921239531465577215">"Stel \'n patroon om die tablet te ontsluit vir bykomende sekuriteit"</string>
    <string name="lockpassword_choose_password_description" product="default" msgid="5003299048956319434">"Stel \'n wagwoord om die toestel te ontsluit vir bykomende sekuriteit"</string>
    <string name="lockpassword_choose_pin_description" product="default" msgid="4979785114465985543">"Stel \'n PIN om die toestel te ontsluit vir bykomende sekuriteit"</string>
    <string name="lockpattern_choose_pattern_description" product="default" msgid="3226044648785762351">"Stel \'n patroon om die toestel te ontsluit vir bykomende sekuriteit"</string>
    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="3167261267229254090">"Stel wagwoord vir vingerafdruk"</string>
    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="4707788269512303400">"Stel patroon vir vingerafdruk"</string>
    <string name="lockpassword_choose_your_pin_message" msgid="7230665212172041837">"Stel PIN vir sekuriteit"</string>
@@ -1939,9 +1947,9 @@
    <string name="lockpassword_choose_your_password_header_for_face" msgid="622276003801157839">"Stel wagwoord om Gesigslot te gebruik"</string>
    <string name="lockpassword_choose_your_pattern_header_for_face" msgid="7333603579958317102">"Stel patroon om Gesigslot te gebruik"</string>
    <string name="lockpassword_choose_your_pin_header_for_face" msgid="704061826984851309">"Stel PIN om Gesigslot te gebruik"</string>
    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Stel wagwoord om biometrie te gebruik"</string>
    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Stel patroon om biometrie te gebruik"</string>
    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Stel PIN om biometrie te gebruik"</string>
    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="2053366309272487015">"Stel \'n wagwoord om gesig of vingerafdruk te gebruik"</string>
    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4038476475293734905">"Stel \'n patroon om gesig of vingerafdruk te gebruik"</string>
    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="9086039918921009380">"Stel \'n PIN om gesig of vingerafdruk te gebruik"</string>
    <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Jou wagwoord vergeet?"</string>
    <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Jou patroon vergeet?"</string>
    <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Jou PIN vergeet?"</string>
@@ -4052,7 +4060,7 @@
    <string name="zen_mode_schedule_alarm_summary" msgid="9162760856136645133">"Skedule skakel af wanneer wekker lui"</string>
    <string name="zen_mode_custom_behavior_title" msgid="92525364576358085">"Moenie Steur Nie-gedrag"</string>
    <string name="zen_mode_custom_behavior_summary_default" msgid="3259312823717839148">"Gebruik verstekinstellings"</string>
    <string name="zen_mode_custom_behavior_summary" msgid="5390522750884328843">"Skep gepasmaakte instellings vir hierdie skedule"</string>
    <string name="zen_mode_custom_behavior_summary" msgid="5390522750884328843">"Skep gepasmaakte instellings vir dié skedule"</string>
    <string name="zen_mode_custom_behavior_category_title" msgid="7815612569425733764">"Vir \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\""</string>
    <string name="summary_divider_text" msgid="8836285171484563986">", "</string>
    <string name="summary_range_symbol_combination" msgid="8447490077794415525">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
@@ -4396,10 +4404,8 @@
    <string name="usb_use_file_transfers" msgid="483915710802018503">"Lêeroordrag"</string>
    <string name="usb_use_file_transfers_desc" msgid="1020257823387107336">"Dra lêers na \'n ander toestel oor"</string>
    <string name="usb_use_photo_transfers" msgid="4641181628966036093">"PTP"</string>
    <!-- no translation found for usb_transcode_files (2441954752105119109) -->
    <skip />
    <!-- no translation found for usb_transcode_files_summary (307102635711961513) -->
    <skip />
    <string name="usb_transcode_files" msgid="2441954752105119109">"Skakel video\'s om na AVC"</string>
    <string name="usb_transcode_files_summary" msgid="307102635711961513">"Video\'s sal op meer mediaspelers speel, maar die gehalte kan swakker wees"</string>
    <string name="usb_use_photo_transfers_desc" msgid="7490250033610745765">"Dra foto\'s of lêers oor as MTP nie gesteun word nie (PTP)"</string>
    <string name="usb_use_tethering" msgid="2897063414491670531">"USB-verbinding"</string>
    <string name="usb_use_MIDI" msgid="8621338227628859789">"MIDI"</string>
+15 −9
Original line number Diff line number Diff line
@@ -556,8 +556,7 @@
    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"ስልክዎን ከማስከፈት በተጨማሪም እንዲሁም ግዢዎችን እና የመተግበሪያ መዳረሻን ለመፍቀድ የጣት አሻራዎንም መጠቀም ይችላሉ። "<annotation id="url">"ተጨማሪ ለመረዳት"</annotation></string>
    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="4260983700868889294">" የማያ ገጽ ቁልፍ አማራጩ ተሰናክሏል። ተጨማሪ ለማወቅ የድርጅትዎን አስተዳዳሪ ያነጋግሩ። "<annotation id="admin_details">"ተጨማሪ ዝርዝሮች"</annotation>\n\n"ለግዢዎች እና የመተግበሪያ መዳረሻ ፈቃድ ለመስጠት አሁንም የጣት አሻራዎን መጠቀም ይችላሉ። "<annotation id="url">"የበለጠ ለመረዳት"</annotation></string>
    <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"ጣትዎን ያንሱ፣ ከዚያ በድጋሚ ዳሳሽ ይንኩ"</string>
    <!-- no translation found for security_settings_fingerprint_bad_calibration (2193097225615229726) -->
    <skip />
    <string name="security_settings_fingerprint_bad_calibration" msgid="598502302101068608">"የጣት አሻራ ዳሳሽን መጠቀም አይቻልም። የጥገና አገልግሎት ሰጪን ይጎብኙ"</string>
    <string name="fingerprint_add_max" msgid="8639321019299347447">"እስከ <xliff:g id="COUNT">%d</xliff:g> የሚደርሱ የጣት አሻራዎችን ማከል ይችላሉ"</string>
    <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"የሚፈቀደውን ከፍተኛ የጣት አሻራ ብዛት አክለዋል"</string>
    <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"ተጨማሪ የጣት አሻራዎችን ማከል አይቻልም"</string>
@@ -1917,6 +1916,15 @@
    <string name="lockpassword_choose_your_profile_pin_header" msgid="4581749963670819048">"የሥራ ፒን ያቀናብሩ"</string>
    <string name="lockpassword_choose_your_pattern_header" msgid="5674909390779586252">"ስርዓተ-ጥለት ያቀናብሩ"</string>
    <string name="lockpassword_choose_your_profile_pattern_header" msgid="3101811498330756641">"የሥራ ስርዓተ-ጥለት ያቀናብሩ"</string>
    <string name="lockpassword_choose_password_description" product="phone" msgid="5577129054698844787">"ለተጨማሪ ደህንነት ሲባል ስልኩን ለመክፈት የይለፍ ቃል ያቀናብሩ"</string>
    <string name="lockpassword_choose_pin_description" product="phone" msgid="6918551978526104693">"ለተጨማሪ ደህንነት ሲባል ስልኩን ለመክፈት ፒን ያቀናብሩ"</string>
    <string name="lockpattern_choose_pattern_description" product="phone" msgid="9192075941504119893">"ለተጨማሪ ደህንነት ሲባል ስልኩን ለመክፈት ስርዓተ ጥለት ያቀናብሩ"</string>
    <string name="lockpassword_choose_password_description" product="tablet" msgid="8643302878337665976">"ለተጨማሪ ደህንነት ሲባል ጡባዊውን ለመክፈት የይለፍ ቃል ያቀናብሩ"</string>
    <string name="lockpassword_choose_pin_description" product="tablet" msgid="4655253942098525998">"ለተጨማሪ ደህንነት ሲባል ጡባዊውን ለመክፈት ፒን ያቀናብሩ"</string>
    <string name="lockpattern_choose_pattern_description" product="tablet" msgid="6921239531465577215">"ለተጨማሪ ደህንነት ሲባል ጡባዊውን ለመክፈት ስርዓተ ጥለት ያቀናብሩ"</string>
    <string name="lockpassword_choose_password_description" product="default" msgid="5003299048956319434">"ለተጨማሪ ደህንነት ሲባል መሣሪያውን ለመክፈት የይለፍ ቃል ያቀናብሩ"</string>
    <string name="lockpassword_choose_pin_description" product="default" msgid="4979785114465985543">"ለተጨማሪ ደህንነት ሲባል መሣሪያውን ለመክፈት ፒን ያቀናብሩ"</string>
    <string name="lockpattern_choose_pattern_description" product="default" msgid="3226044648785762351">"ለተጨማሪ ደህንነት ሲባል መሣሪያውን ለመክፈት ስርዓተ ጥለት ያቀናብሩ"</string>
    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="3167261267229254090">"የጣት አሻራን ለመጠቀም የይለፍ ቃል ያቀናብሩ"</string>
    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="4707788269512303400">"የጣት አሻራን ለመጠቀም፣ ሥርዓተ ጥለትን ያቀናብሩ"</string>
    <string name="lockpassword_choose_your_pin_message" msgid="7230665212172041837">"ለደህንነት ሲባል ፒን ያቀናብሩ"</string>
@@ -1939,9 +1947,9 @@
    <string name="lockpassword_choose_your_password_header_for_face" msgid="622276003801157839">"በመልክ መክፈትን ለመጠቀም የይለፍ ቃልን ያቀናብሩ"</string>
    <string name="lockpassword_choose_your_pattern_header_for_face" msgid="7333603579958317102">"በመልክ መክፈትን ለመጠቀም ስርዓተ-ጥለትን ያቀናብሩ"</string>
    <string name="lockpassword_choose_your_pin_header_for_face" msgid="704061826984851309">"በመልክ መክፈትን ለመጠቀም ፒን ያቀናብሩ"</string>
    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ባዮሜትሪክስን ለመጠቀም የይለፍ ቃል ያቀናብሩ"</string>
    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ባዮሜትሪክስን ለመጠቀም ርዓተ ጥለት ያቀናብሩ"</string>
    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ባዮሜትሪክስን ለመጠቀም ፒን ያቀናብሩ"</string>
    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="2053366309272487015">"መልክ ወይም የጣት አሻራ ለመጠቀም የይለፍ ቃል ያቀናብሩ"</string>
    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4038476475293734905">"መልክ ወይም የጣት አሻራ ለመጠቀም ርዓተ ጥለት ያቀናብሩ"</string>
    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="9086039918921009380">"መልክ ወይም የጣት አሻራ ለመጠቀም ፒን ያቀናብሩ"</string>
    <string name="lockpassword_forgot_password" msgid="5730587692489737223">"የእርስዎን የይለፍ ቃል ረሱት?"</string>
    <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"የእርስዎን ስርዓተ-ጥለት ረሱት?"</string>
    <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"የእርስዎን ፒን ረሱት?"</string>
@@ -4396,10 +4404,8 @@
    <string name="usb_use_file_transfers" msgid="483915710802018503">"ፋይልን ማስተላለፍ"</string>
    <string name="usb_use_file_transfers_desc" msgid="1020257823387107336">"ወደ ሌላ መሣሪያ ፋይሎችን ያስተላልፉ"</string>
    <string name="usb_use_photo_transfers" msgid="4641181628966036093">"PTP"</string>
    <!-- no translation found for usb_transcode_files (2441954752105119109) -->
    <skip />
    <!-- no translation found for usb_transcode_files_summary (307102635711961513) -->
    <skip />
    <string name="usb_transcode_files" msgid="2441954752105119109">"ቪዲዮዎችን ወደ AVC ይቀይሩ"</string>
    <string name="usb_transcode_files_summary" msgid="307102635711961513">"ቪዲዮዎች በተጨማሪ Media Player ላይ ይጫወታሉ፣ ነገር ግን ጥራቱ ሊቀንስ ይችላል"</string>
    <string name="usb_use_photo_transfers_desc" msgid="7490250033610745765">"MTP የማይደገፍ ከሆነ ፎቶዎችን ወይም ፋይሎችን ማዛወር (PTP)"</string>
    <string name="usb_use_tethering" msgid="2897063414491670531">"ዩኤስቢን እንደ ሞደም መሰካት"</string>
    <string name="usb_use_MIDI" msgid="8621338227628859789">"MIDI"</string>
Loading