From 413f0685363f83a7c2fbdd1f4c4f7d86237db704 Mon Sep 17 00:00:00 2001
From: Oli Lan <olilan@google.com>
Date: Mon, 15 Mar 2021 17:18:37 +0000
Subject: [PATCH 01/12] Use DeviceConfig property for default value of
 clipboard access notification setting.

This uses a new DeviceConfig property for the default value of the
setting that controls whether a notification is shown when an app
accesses clipboard.

Bug: 182349993
Test: manual, "adb shell device_config put clipboard
show_access_notifications false" and observe setting changes when
not set manually; also check notifications shown when expected.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.privacy.ShowClipAccessNotificationPreferenceControllerTest"

Change-Id: I452b1850ecc5fefb2ca9476d249866b32c885478
---
 ...ccessNotificationPreferenceController.java | 53 +++++++++++++++++--
 ...sNotificationPreferenceControllerTest.java | 44 ++++++++++++++-
 2 files changed, 91 insertions(+), 6 deletions(-)

diff --git a/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java b/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java
index 46224315992..cf05ff48cc6 100644
--- a/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java
+++ b/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java
@@ -16,33 +16,47 @@
 
 package com.android.settings.privacy;
 
+import android.content.ClipboardManager;
 import android.content.Context;
+import android.provider.DeviceConfig;
 import android.provider.Settings;
 
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.core.TogglePreferenceController;
 
 /**
  * Controller for preference to toggle whether clipboard access notifications should be shown.
  */
-public class ShowClipAccessNotificationPreferenceController extends TogglePreferenceController {
+public class ShowClipAccessNotificationPreferenceController
+        extends TogglePreferenceController implements LifecycleObserver {
 
     private static final String KEY_SHOW_CLIP_ACCESS_NOTIFICATION = "show_clip_access_notification";
 
+    private final DeviceConfig.OnPropertiesChangedListener mDeviceConfigListener =
+            properties -> updateConfig();
+    private boolean mDefault;
+    private Preference mPreference;
+
     public ShowClipAccessNotificationPreferenceController(Context context) {
         super(context, KEY_SHOW_CLIP_ACCESS_NOTIFICATION);
+        updateConfig();
     }
 
     @Override
     public boolean isChecked() {
-        // TODO(b/182349993) Retrieve default value from DeviceConfig.
         return Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS, 1) != 0;
+                Settings.Secure.CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS, (mDefault ? 1 : 0)) != 0;
     }
 
     @Override
     public boolean setChecked(boolean isChecked) {
         Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS, isChecked ? 1 : 0);
+                Settings.Secure.CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS, (isChecked ? 1 : 0));
         return true;
     }
 
@@ -51,4 +65,35 @@ public class ShowClipAccessNotificationPreferenceController extends TogglePrefer
         return AVAILABLE;
     }
 
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    /**
+     * Registers a DeviceConfig listener on start.
+     */
+    @OnLifecycleEvent(Lifecycle.Event.ON_START)
+    public void onStart() {
+        DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_CLIPBOARD,
+                mContext.getMainExecutor(), mDeviceConfigListener);
+    }
+
+    /**
+     * Removes the DeviceConfig listener on stop.
+     */
+    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
+    public void onStop() {
+        DeviceConfig.removeOnPropertiesChangedListener(mDeviceConfigListener);
+    }
+
+    private void updateConfig() {
+        mDefault = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_CLIPBOARD,
+                ClipboardManager.DEVICE_CONFIG_SHOW_ACCESS_NOTIFICATIONS,
+                ClipboardManager.DEVICE_CONFIG_DEFAULT_SHOW_ACCESS_NOTIFICATIONS);
+        updateState(mPreference);
+    }
+
 }
diff --git a/tests/robotests/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceControllerTest.java
index c707cd600ae..fdf81e733ce 100644
--- a/tests/robotests/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceControllerTest.java
@@ -18,8 +18,10 @@ package com.android.settings.privacy;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import android.content.ClipboardManager;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.provider.DeviceConfig;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 
@@ -27,14 +29,18 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
+import com.android.settings.testutils.shadow.ShadowDeviceConfig;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowDeviceConfig.class})
 public class ShowClipAccessNotificationPreferenceControllerTest {
 
     @Mock
@@ -54,19 +60,47 @@ public class ShowClipAccessNotificationPreferenceControllerTest {
     }
 
     @Test
-    public void isChecked_settingIsOff_shouldReturnFalse() throws Exception {
+    public void isChecked_settingIsOff_shouldReturnFalse() {
         setProperty(0);
 
         assertThat(mController.isChecked()).isFalse();
     }
 
     @Test
-    public void isChecked_settingIsOn_shouldReturnTrue() throws Exception {
+    public void isChecked_settingIsOn_shouldReturnTrue() {
         setProperty(1);
 
         assertThat(mController.isChecked()).isTrue();
     }
 
+    @Test
+    public void isChecked_settingIsUnset_deviceConfigProvidesDefaultOfTrue() {
+        clearProperty();
+
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_CLIPBOARD,
+                ClipboardManager.DEVICE_CONFIG_SHOW_ACCESS_NOTIFICATIONS,
+                "true", false);
+
+        ShowClipAccessNotificationPreferenceController controller =
+                new ShowClipAccessNotificationPreferenceController(mContext);
+
+        assertThat(controller.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_settingIsUnset_deviceConfigProvidesDefaultOfFalse() {
+        clearProperty();
+
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_CLIPBOARD,
+                ClipboardManager.DEVICE_CONFIG_SHOW_ACCESS_NOTIFICATIONS,
+                "false", false);
+
+        ShowClipAccessNotificationPreferenceController controller =
+                new ShowClipAccessNotificationPreferenceController(mContext);
+
+        assertThat(controller.isChecked()).isFalse();
+    }
+
     @Test
     public void onPreferenceChange_turnOn_shouldChangeSettingTo1() throws Exception {
         setProperty(0);
@@ -93,6 +127,12 @@ public class ShowClipAccessNotificationPreferenceControllerTest {
                 contentResolver, Settings.Secure.CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS, newValue);
     }
 
+    private void clearProperty() {
+        final ContentResolver contentResolver = mContext.getContentResolver();
+        Settings.Secure.putString(
+                contentResolver, Settings.Secure.CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS, null);
+    }
+
     private void assertProperty(int expectedValue) throws SettingNotFoundException {
         final ContentResolver contentResolver = mContext.getContentResolver();
         assertThat(Settings.Secure.getInt(

From a4788bdc819a5f6f45f815bc73bcd67dd19e1aa3 Mon Sep 17 00:00:00 2001
From: Ivan Chiang <chiangi@google.com>
Date: Thu, 1 Apr 2021 18:03:24 +0800
Subject: [PATCH 02/12] Update the strings for Media Management Apps

Bug: 184102095
Test: manual, screenshot
Change-Id: I0be92b600bc45fd805c01e6be5db39df40976ead
---
 res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 25535000e9b..cc64f2ec1be 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10499,9 +10499,9 @@
     <!-- Media management apps settings title [CHAR LIMIT=40] -->
     <string name="media_management_apps_title">Media management apps</string>
     <!-- Label for a setting which controls whether an app can manage media files [CHAR LIMIT=45] -->
-    <string name="media_management_apps_toggle_label">Allow app to manage media files</string>
+    <string name="media_management_apps_toggle_label">Allow app to manage media</string>
     <!-- Description for a setting which controls whether an app can manage media files [CHAR LIMIT=NONE] -->
-    <string name="media_management_apps_description">If allowed, this app can modify or delete media files on this device or connected storage device without asking you. App must have permission to access files and media.</string>
+    <string name="media_management_apps_description">If allowed, this app can modify or delete media files created with other apps without asking you. App must have permission to access files and media.</string>
     <!-- Search keywords for media management apps settings [CHAR_LIMIT=NONE] -->
     <string name="keywords_media_management_apps">Media, File, Management, Manager, Manage, Edit, Editor, App, Application, Program</string>
 

From a51780f35d868a8816c635ad717c139c51a2cf65 Mon Sep 17 00:00:00 2001
From: Jeremy Goldman <goldmanj@google.com>
Date: Wed, 7 Apr 2021 16:26:52 +0800
Subject: [PATCH 03/12] Subscription name has whitespace trimmed to determine
 uniqueness

For example, if a subscription has the name "subsc" and another has
"subsc    " the extra unique information will be added to the
subscriptions.

Test: atest -c SubscriptionUtilTest
Bug: 183664625
Change-Id: Ia137169f6cdd9804ab04126e5045c9fb61556d54
---
 .../settings/network/SubscriptionUtil.java    |  2 +-
 .../network/SubscriptionUtilTest.java         | 32 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index be8f2578a64..4ba7fc90617 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -256,7 +256,7 @@ public class SubscriptionUtil {
                 .map(i -> {
                     DisplayInfo info = new DisplayInfo();
                     info.subscriptionInfo = i;
-                    info.originalName = i.getDisplayName();
+                    info.originalName = i.getDisplayName().toString().trim();
                     return info;
                 });
 
diff --git a/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java b/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
index c0e5205a77b..3d192cf5456 100644
--- a/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
+++ b/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
@@ -48,7 +48,8 @@ public class SubscriptionUtilTest {
     private static final int SUBID_1 = 1;
     private static final int SUBID_2 = 2;
     private static final int SUBID_3 = 3;
-    private static final CharSequence CARRIER_1 = "carrier1111111";
+    private static final CharSequence CARRIER_1 = "carrier1";
+    private static final CharSequence CARRIER_1_SPACE = " carrier1       ";
     private static final CharSequence CARRIER_2 = "carrier2";
 
     private Context mContext;
@@ -195,6 +196,35 @@ public class SubscriptionUtilTest {
         assertEquals(CARRIER_1 + " 4444", idNames.get(SUBID_2));
     }
 
+    @Test
+    public void getUniqueDisplayNames_identicalCarriersAfterTrim_fourDigitsUsed() {
+        // Both subscriptoins have the same display name.
+        final SubscriptionInfo info1 = mock(SubscriptionInfo.class);
+        final SubscriptionInfo info2 = mock(SubscriptionInfo.class);
+        when(info1.getSubscriptionId()).thenReturn(SUBID_1);
+        when(info2.getSubscriptionId()).thenReturn(SUBID_2);
+        when(info1.getDisplayName()).thenReturn(CARRIER_1);
+        when(info2.getDisplayName()).thenReturn(CARRIER_1_SPACE);
+        when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(
+                Arrays.asList(info1, info2));
+
+        // Each subscription has a unique last 4 digits of the phone number.
+        TelephonyManager sub1Telmgr = mock(TelephonyManager.class);
+        TelephonyManager sub2Telmgr = mock(TelephonyManager.class);
+        when(sub1Telmgr.getLine1Number()).thenReturn("1112223333");
+        when(sub2Telmgr.getLine1Number()).thenReturn("2223334444");
+        when(mTelMgr.createForSubscriptionId(SUBID_1)).thenReturn(sub1Telmgr);
+        when(mTelMgr.createForSubscriptionId(SUBID_2)).thenReturn(sub2Telmgr);
+
+        final Map<Integer, CharSequence> idNames =
+                SubscriptionUtil.getUniqueSubscriptionDisplayNames(mContext);
+
+        assertThat(idNames).isNotNull();
+        assertThat(idNames).hasSize(2);
+        assertEquals(CARRIER_1 + " 3333", idNames.get(SUBID_1));
+        assertEquals(CARRIER_1 + " 4444", idNames.get(SUBID_2));
+    }
+
     @Test
     public void getUniqueDisplayNames_phoneNumberBlocked_subscriptoinIdFallback() {
         // Both subscriptoins have the same display name.

From fe885c96c1f071906de3205fc0620406f5b30640 Mon Sep 17 00:00:00 2001
From: Sunny Shao <sunnyshao@google.com>
Date: Wed, 7 Apr 2021 16:58:17 +0800
Subject: [PATCH 04/12] Use "Passwords & accounts" instead of "Passwords and
 accounts"

Bug: 184713810
Test: manual test
Change-Id: I48a7ae4f89b2a1df76254978173949ba463ed4a7
---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index fcf2f45b075..ea06c1f0b80 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7880,7 +7880,7 @@
     <!-- Toast shown when an app in the work profile attempts to open notification settings. The apps in the work profile cannot access notification settings. [CHAR LIMIT=NONE] -->
     <string name="notification_settings_work_profile">Notification access is not available for apps in the work profile.</string>
     <!-- Title for setting tile leading to saved autofill passwords, autofill, and account settings [CHAR LIMIT=40]-->
-    <string name="account_dashboard_title">Passwords and accounts</string>
+    <string name="account_dashboard_title">Passwords &amp; accounts</string>
     <!-- Summary for setting tile leading to saved autofill passwords, autofill, and account settings [CHAR LIMIT=NONE]-->
     <string name="account_dashboard_default_summary">Saved passwords, autofill, synced accounts</string>
     <!-- Title for setting tile leading to setting UI which allows user set default app to

From d62b2c23cfbbe92d1af37067d96b394564bc0113 Mon Sep 17 00:00:00 2001
From: Jeremy Goldman <goldmanj@google.com>
Date: Wed, 7 Apr 2021 16:53:02 +0800
Subject: [PATCH 05/12] Update string associated with Connected, Always On or
 Insecure VPNs

Previously these strings were separated with a comma, but the new design
is to separate them with a "/" and to not include always-on information
if the vpn is also insecure.

Comment thread on the strings doc: https://docs.google.com/document/d/1hjaYuGmvNzCKPOrmjixpmLLXBV8cbxgrZ3eN4KvC4E8/edit?resourcekey=0-zo7B2GVc9luQTut0o8THNA&hl=zh-TW&forcehl=1&disco=AAAAIF3eiQY
screenshot: https://screenshot.googleplex.com/BmBroUZtmUPJz9s
Test: atest -c SettingsUnitTests
Bug: 176821216

Change-Id: Ib9c273de61c9722b0beb6fba127e7481e6c64705
---
 res/values/strings.xml                              |  4 ++--
 .../android/settings/vpn2/ManageablePreference.java | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d06e8af2556..741e75da3c2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7170,9 +7170,9 @@
     <!-- Preference summary for app not supporting always-on VPN [CHAR LIMIT=40] -->
     <string name="vpn_always_on_summary_not_supported">Not supported by this app</string>
     <!-- Preference summary for a VPN app that is set to be always-on. [CHAR LIMIT=40]  -->
-    <string name="vpn_always_on_summary_active">Always-on active</string>
+    <string name="vpn_always_on_summary_active">Always on</string>
     <!-- Preference summary for a VPN app that has an insecure type. [CHAR LIMIT=40]  -->
-    <string name="vpn_insecure_summary">not secure VPN</string>
+    <string name="vpn_insecure_summary">Not secure</string>
     <!-- Preference title for the toggle that controls whether to force all network connections to
         go through VPN. [CHAR LIMIT=40] -->
     <string name="vpn_require_connection">Block connections without VPN</string>
diff --git a/src/com/android/settings/vpn2/ManageablePreference.java b/src/com/android/settings/vpn2/ManageablePreference.java
index c65073f2d60..b7851864da7 100644
--- a/src/com/android/settings/vpn2/ManageablePreference.java
+++ b/src/com/android/settings/vpn2/ManageablePreference.java
@@ -107,21 +107,20 @@ public abstract class ManageablePreference extends GearPreference {
         final Resources res = getContext().getResources();
         final String[] states = res.getStringArray(R.array.vpn_states);
         String summary = (mState == STATE_NONE ? "" : states[mState]);
-        if (mIsAlwaysOn) {
-            final String alwaysOnString = res.getString(R.string.vpn_always_on_summary_active);
-            summary = TextUtils.isEmpty(summary) ? alwaysOnString : res.getString(
-                    R.string.join_two_unrelated_items, summary, alwaysOnString);
-        }
         if (mIsInsecureVpn) {
             final String insecureString = res.getString(R.string.vpn_insecure_summary);
-            summary = TextUtils.isEmpty(summary) ? insecureString : res.getString(
-                    R.string.join_two_unrelated_items, summary, insecureString);
+            summary = TextUtils.isEmpty(summary) ? insecureString : summary + " / "
+                    + insecureString;
 
             SpannableString summarySpan = new SpannableString(summary);
             final int colorError = Utils.getColorErrorDefaultColor(getContext());
             summarySpan.setSpan(new ForegroundColorSpan(colorError), 0, summary.length(),
                     SPAN_EXCLUSIVE_INCLUSIVE);
             setSummary(summarySpan);
+        } else if (mIsAlwaysOn) {
+            final String alwaysOnString = res.getString(R.string.vpn_always_on_summary_active);
+            summary = TextUtils.isEmpty(summary) ? alwaysOnString : summary + " / "
+                    + alwaysOnString;
         } else {
             setSummary(summary);
         }

From 24fe5922de82b30c19f8be036a45d7905897f765 Mon Sep 17 00:00:00 2001
From: Arc Wang <arcwang@google.com>
Date: Wed, 7 Apr 2021 20:13:36 +0800
Subject: [PATCH 06/12] Sets Storage Settings progress bar unselectable

Since it does nothing if users click it.

Bug: 184712147
Test: manual
Change-Id: I7d243ad465a5fa3f23297ac80c82bef4d078e34a
---
 res/xml/storage_dashboard_fragment.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/xml/storage_dashboard_fragment.xml b/res/xml/storage_dashboard_fragment.xml
index 9bca65a6556..adc29d33d71 100644
--- a/res/xml/storage_dashboard_fragment.xml
+++ b/res/xml/storage_dashboard_fragment.xml
@@ -27,6 +27,7 @@
     <com.android.settingslib.widget.UsageProgressBarPreference
         android:key="storage_summary"
         android:order="2"
+        android:selectable="false"
         settings:searchable="false"
         settings:controller="com.android.settings.deviceinfo.storage.StorageUsageProgressBarPreferenceController"
         settings:allowDividerBelow="true"/>

From 741c1e42982e95fa593ba1664482ebaf9dc340d0 Mon Sep 17 00:00:00 2001
From: Arc Wang <arcwang@google.com>
Date: Wed, 7 Apr 2021 20:34:12 +0800
Subject: [PATCH 07/12] Pop up soft keyboard when rename dialog shows

Request focus for the EditText.

Bug: 184710864
Test: manual
      At Storage Settings, select USB drive -> option menu
      -> Rename. Observe if soft keyboard pops up.
Change-Id: Ia73829ee505c94a255306bd817d01b6bc1b80e26
---
 .../settings/deviceinfo/storage/StorageRenameFragment.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/settings/deviceinfo/storage/StorageRenameFragment.java b/src/com/android/settings/deviceinfo/storage/StorageRenameFragment.java
index c67fe338ffa..c6eb0c8ad6f 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageRenameFragment.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageRenameFragment.java
@@ -68,6 +68,7 @@ public class StorageRenameFragment extends InstrumentedDialogFragment {
         final View view = dialogInflater.inflate(R.layout.dialog_edittext, null, false);
         final EditText nickname = (EditText) view.findViewById(R.id.edittext);
         nickname.setText(rec.getNickname());
+        nickname.requestFocus();
 
         return builder.setTitle(R.string.storage_rename_title)
                 .setView(view)

From 209f2daeafff7698ab61152d77159bd7b6d18f33 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Wed, 7 Apr 2021 19:02:35 +0000
Subject: [PATCH 08/12] Add a divider line in safety settings

https: //screenshot.googleplex.com/BmYJmftnAF354GY.png

Bug: 184261824
Test: manual
Change-Id: I67223f2811c0bf9a738ad3aedcbcff1f00749641
---
 res/xml/emergency_settings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/xml/emergency_settings.xml b/res/xml/emergency_settings.xml
index f8067aa60fd..66c5fd1ef96 100644
--- a/res/xml/emergency_settings.xml
+++ b/res/xml/emergency_settings.xml
@@ -25,7 +25,6 @@
         android:layout="@layout/more_settings_button"
         android:order="0"
         android:selectable="false"
-        settings:allowDividerBelow="true"
         settings:controller="com.android.settings.emergency.MoreSettingsPreferenceController" />
     <Preference
         android:key="gesture_emergency_summary"
@@ -34,6 +33,10 @@
         android:order="100"
         android:fragment="com.android.settings.emergency.EmergencyGestureSettings"
         settings:controller="com.android.settings.emergency.EmergencyGestureEntrypointPreferenceController" />
+    <PreferenceCategory
+        android:order="170"
+        android:layout="@layout/preference_category_no_label"
+        settings:allowDividerAbove="true"/>
     <com.android.settingslib.RestrictedPreference
         android:key="app_and_notif_cell_broadcast_settings"
         android:title="@string/cell_broadcast_settings"

From eee07aacb9e877891f6a804d5f3cb4015876c708 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Wed, 7 Apr 2021 20:10:33 +0000
Subject: [PATCH 09/12] Add icon to "Open [safety app] button

https://screenshot.googleplex.com/AjFhMECtQ4E9QAa.png

Bug: 184261824
Test: manual
Change-Id: I2b9b74077aec29dee3a34105584c5364fa663a84
---
 res/layout/more_settings_button.xml           |  4 +-
 .../MoreSettingsPreferenceController.java     | 57 +++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/res/layout/more_settings_button.xml b/res/layout/more_settings_button.xml
index 84ef75a519e..7140d79425e 100644
--- a/res/layout/more_settings_button.xml
+++ b/res/layout/more_settings_button.xml
@@ -23,11 +23,13 @@
       <Button
          android:id="@+id/button"
          style="@style/ActionPrimaryButton"
+         android:theme="@style/RoundedCornerThemeOverlay"
+         android:paddingHorizontal="16dp"
+         android:drawablePadding="8dp"
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
          android:layout_marginVertical="8dp"
          android:layout_marginHorizontal="16dp"
-         android:theme="@style/RoundedCornerThemeOverlay"
          settings:allowDividerBelow="true"/>
 
 </FrameLayout>
diff --git a/src/com/android/settings/emergency/MoreSettingsPreferenceController.java b/src/com/android/settings/emergency/MoreSettingsPreferenceController.java
index 34c11c76780..3c9ae6ed106 100644
--- a/src/com/android/settings/emergency/MoreSettingsPreferenceController.java
+++ b/src/com/android/settings/emergency/MoreSettingsPreferenceController.java
@@ -25,9 +25,15 @@ import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.DisplayMetrics;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.View;
 import android.widget.Button;
 
@@ -35,6 +41,7 @@ import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settingslib.widget.LayoutPreference;
 
@@ -77,7 +84,17 @@ public class MoreSettingsPreferenceController extends BasePreferenceController i
         super.displayPreference(screen);
         final LayoutPreference pref = screen.findPreference(getPreferenceKey());
         final Button button = pref.findViewById(R.id.button);
+        final Drawable icon = getIcon();
         button.setText(getButtonText());
+        if (icon != null) {
+            button.setCompoundDrawablesWithIntrinsicBounds(
+                    /* left= */ icon,
+                    /* top= */null,
+                    /* right= */ null,
+                    /* bottom= */ null);
+            button.setVisibility(View.VISIBLE);
+        }
+
         button.setOnClickListener(this);
     }
 
@@ -100,6 +117,21 @@ public class MoreSettingsPreferenceController extends BasePreferenceController i
         mContext.startActivity(intent, bundle);
     }
 
+    private Drawable getIcon() {
+        final String packageName = mContext.getResources().getString(
+                R.string.config_emergency_package_name);
+        try {
+            final PackageManager pm = mContext.getPackageManager();
+            final ApplicationInfo appInfo = pm.getApplicationInfo(
+                    packageName, MATCH_DISABLED_COMPONENTS
+                            | MATCH_DISABLED_UNTIL_USED_COMPONENTS);
+            return getScaledDrawable(mContext, Utils.getBadgedIcon(mContext, appInfo), 24, 24);
+        } catch (Exception e) {
+            Log.d(TAG, "Failed to get open app button icon", e);
+            return null;
+        }
+    }
+
     private CharSequence getButtonText() {
         final String packageName = mContext.getResources().getString(
                 R.string.config_emergency_package_name);
@@ -114,4 +146,29 @@ public class MoreSettingsPreferenceController extends BasePreferenceController i
             return "";
         }
     }
+
+    private static Drawable getScaledDrawable(Context context, Drawable icon, int width,
+            int height) {
+        DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+        int widthInDp =
+                (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, width, displayMetrics);
+        int heightInDp =
+                (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, height,
+                        displayMetrics);
+
+        return new BitmapDrawable(context.getResources(),
+                convertToBitmap(icon, widthInDp, heightInDp));
+    }
+
+    private static Bitmap convertToBitmap(Drawable icon, int width, int height) {
+        if (icon == null) {
+            return null;
+        }
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        icon.setBounds(0, 0, width, height);
+        icon.draw(canvas);
+        return bitmap;
+    }
+
 }

From 11d74e7231c82d90f197936c8b56830a7155e3b6 Mon Sep 17 00:00:00 2001
From: "Wesley.CW Wang" <wesleycwwang@google.com>
Date: Tue, 6 Apr 2021 15:14:59 +0800
Subject: [PATCH 10/12] Update battery states text

 - Update progress bar bottom text when battery states changed(charging,
 discharging, power saver and low battery)

Bug: 183689347
Bug: 177407113
Test: make SettingsRoboTests
Change-Id: I0397eb1dea7fcb14357750f84d1d5b1a7dc7d19a
---
 .../BatteryHeaderPreferenceController.java    | 31 +++++++
 .../settings/fuelgauge/PowerUsageSummary.java |  4 +
 .../BatteryTipPreferenceController.java       | 14 ++++
 ...BatteryHeaderPreferenceControllerTest.java | 82 +++++++++++++++++--
 .../BatteryTipPreferenceControllerTest.java   | 19 +++++
 5 files changed, 145 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index ff8ff583034..a2cb9ae30cb 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -33,6 +33,7 @@ import androidx.preference.PreferenceScreen;
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.Utils;
@@ -60,6 +61,7 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
     private Activity mActivity;
     private PreferenceFragmentCompat mHost;
     private Lifecycle mLifecycle;
+    private BatteryTip mBatteryTip;
     private final PowerManager mPowerManager;
 
     public BatteryHeaderPreferenceController(Context context, String key) {
@@ -109,8 +111,26 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
         if (BatteryUtils.isBatteryDefenderOn(info)) {
             return null;
         } else if (info.remainingLabel == null) {
+            // Present status independently if no remaining time
             return info.statusLabel;
+        } else if (info.statusLabel != null && !info.discharging) {
+            // Charging state
+            return mContext.getString(
+                    R.string.battery_state_and_duration, info.statusLabel, info.remainingLabel);
+        } else if (mPowerManager.isPowerSaveMode()) {
+            // Power save mode is on
+            final String powerSaverOn = mContext.getString(
+                    R.string.battery_tip_early_heads_up_done_title);
+            return mContext.getString(
+                    R.string.battery_state_and_duration, powerSaverOn, info.remainingLabel);
+        } else if (mBatteryTip != null
+                && mBatteryTip.getType() == BatteryTip.TipType.LOW_BATTERY) {
+            // Low battery state
+            final String lowBattery = mContext.getString(R.string.low_battery_summary);
+            return mContext.getString(
+                    R.string.battery_state_and_duration, lowBattery, info.remainingLabel);
         } else {
+            // Discharging state
             return info.remainingLabel;
         }
     }
@@ -140,6 +160,17 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
         mBatteryUsageProgressBarPref.setPercent(batteryLevel, BATTERY_MAX_LEVEL);
     }
 
+    /**
+     * Update summary when battery tips changed.
+     */
+    public void updateHeaderByBatteryTips(BatteryTip batteryTip, BatteryInfo batteryInfo) {
+        mBatteryTip = batteryTip;
+
+        if (mBatteryTip != null && batteryInfo != null) {
+            updateHeaderPreference(batteryInfo);
+        }
+    }
+
     private CharSequence formatBatteryPercentageText(int batteryLevel) {
         return TextUtils.expandTemplate(mContext.getText(R.string.battery_header_title_alternate),
                 NumberFormat.getIntegerInstance().format(batteryLevel));
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 9e619973122..7dfca22f9c4 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -94,6 +94,8 @@ public class PowerUsageSummary extends PowerUsageBase implements
                 @Override
                 public void onLoadFinished(Loader<BatteryInfo> loader, BatteryInfo batteryInfo) {
                     mBatteryHeaderPreferenceController.updateHeaderPreference(batteryInfo);
+                    mBatteryHeaderPreferenceController.updateHeaderByBatteryTips(
+                            mBatteryTipPreferenceController.getCurrentBatteryTip(), batteryInfo);
                     mBatteryInfo = batteryInfo;
                 }
 
@@ -115,6 +117,8 @@ public class PowerUsageSummary extends PowerUsageBase implements
                 public void onLoadFinished(Loader<List<BatteryTip>> loader,
                         List<BatteryTip> data) {
                     mBatteryTipPreferenceController.updateBatteryTips(data);
+                    mBatteryHeaderPreferenceController.updateHeaderByBatteryTips(
+                            mBatteryTipPreferenceController.getCurrentBatteryTip(), mBatteryInfo);
                 }
 
                 @Override
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
index 00b1e874d33..c6afefe9961 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.fuelgauge.batterytip;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.os.Bundle;
 
@@ -162,6 +163,19 @@ public class BatteryTipPreferenceController extends BasePreferenceController {
         return mNeedUpdate;
     }
 
+    /**
+     * @return current battery tips, null if unavailable.
+     */
+    @Nullable
+    public BatteryTip getCurrentBatteryTip() {
+        if (mBatteryTips == null) {
+            return null;
+        }
+
+        return mBatteryTips.stream().anyMatch(BatteryTip::isVisible)
+                ? mBatteryTips.stream().filter(BatteryTip::isVisible).findFirst().get() : null;
+    }
+
     /**
      * Listener to give the control back to target fragment
      */
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index ad10fa8c975..038798adee5 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -27,6 +27,7 @@ import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.app.Activity;
@@ -44,6 +45,9 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip;
+import com.android.settings.fuelgauge.batterytip.tips.SmartBatteryTip;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settings.widget.EntityHeaderController;
@@ -58,7 +62,9 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowPowerManager;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowEntityHeaderController.class, ShadowUtils.class})
@@ -84,7 +90,7 @@ public class BatteryHeaderPreferenceControllerTest {
     private UsageProgressBarPreference mBatteryUsageProgressBarPref;
     private BatteryHeaderPreferenceController mController;
     private Context mContext;
-    private PowerManager mPowerManager;
+    private ShadowPowerManager mShadowPowerManager;
     private Intent mBatteryIntent;
     private LifecycleOwner mLifecycleOwner;
     private Lifecycle mLifecycle;
@@ -109,7 +115,7 @@ public class BatteryHeaderPreferenceControllerTest {
 
         mBatteryInfo.batteryLevel = BATTERY_LEVEL;
 
-        mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
+        mShadowPowerManager = Shadows.shadowOf(mContext.getSystemService(PowerManager.class));
 
         mController = spy(new BatteryHeaderPreferenceController(mContext, PREF_KEY));
         mLifecycle.addObserver(mController);
@@ -144,9 +150,7 @@ public class BatteryHeaderPreferenceControllerTest {
 
     @Test
     public void updatePreference_updateBatteryInfo() {
-        mBatteryInfo.remainingLabel = TIME_LEFT;
-        mBatteryInfo.batteryLevel = BATTERY_LEVEL;
-        mBatteryInfo.discharging = true;
+        setChargingState(/* isDischarging */ true);
 
         mController.updateHeaderPreference(mBatteryInfo);
 
@@ -165,6 +169,68 @@ public class BatteryHeaderPreferenceControllerTest {
         verify(mBatteryUsageProgressBarPref).setBottomSummary(BATTERY_STATUS);
     }
 
+    @Test
+    public void updatePreference_charging_showFullText() {
+        setChargingState(/* isDischarging */ false);
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        final String expectedResult = BATTERY_STATUS + " • " + TIME_LEFT;
+        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedResult);
+    }
+
+    @Test
+    public void updatePreference_powerSaverOn_showPowerSaverOn() {
+        setChargingState(/* isDischarging */ true);
+        mShadowPowerManager.setIsPowerSaveMode(true);
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        final String expectedResult = "Battery Saver is on • " + TIME_LEFT;
+        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedResult);
+    }
+
+    @Test
+    public void updateHeaderByBatteryTips_lowBatteryTip_showLowBattery() {
+        setChargingState(/* isDischarging */ true);
+        BatteryTip lowBatteryTip = new LowBatteryTip(
+                BatteryTip.StateType.NEW, /* powerSaveModeOn */false);
+
+        mController.updateHeaderByBatteryTips(lowBatteryTip, mBatteryInfo);
+
+        final String expectedResult = "Low battery • " + TIME_LEFT;
+        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedResult);
+    }
+
+    @Test
+    public void updateHeaderByBatteryTips_notLowBatteryTip_showRemainingLabel() {
+        setChargingState(/* isDischarging */ true);
+        BatteryTip lowBatteryTip = new SmartBatteryTip(BatteryTip.StateType.NEW);
+
+        mController.updateHeaderByBatteryTips(lowBatteryTip, mBatteryInfo);
+
+        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
+    }
+
+    @Test
+    public void updateHeaderByBatteryTips_noTip_noAction() {
+        setChargingState(/* isDischarging */ true);
+
+        mController.updateHeaderByBatteryTips(null, mBatteryInfo);
+
+        verifyZeroInteractions(mBatteryUsageProgressBarPref);
+    }
+
+    @Test
+    public void updateHeaderByBatteryTips_noBatteryInfo_noAction() {
+        BatteryTip lowBatteryTip = new LowBatteryTip(
+                BatteryTip.StateType.NEW, /* powerSaveModeOn */false);
+
+        mController.updateHeaderByBatteryTips(lowBatteryTip, null);
+
+        verifyZeroInteractions(mBatteryUsageProgressBarPref);
+    }
+
     @Test
     public void updatePreference_isOverheat_showEmptyText() {
         mBatteryInfo.isOverheated = true;
@@ -203,4 +269,10 @@ public class BatteryHeaderPreferenceControllerTest {
         return TextUtils.expandTemplate(mContext.getText(R.string.battery_header_title_alternate),
                 NumberFormat.getIntegerInstance().format(BATTERY_LEVEL));
     }
+
+    private void setChargingState(boolean isDischarging) {
+        mBatteryInfo.remainingLabel = TIME_LEFT;
+        mBatteryInfo.statusLabel = BATTERY_STATUS;
+        mBatteryInfo.discharging = isDischarging;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
index e9192889cd9..dbde3a7ed28 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
@@ -127,6 +127,25 @@ public class BatteryTipPreferenceControllerTest {
                 BatteryTip.StateType.NEW);
     }
 
+    @Test
+    public void testGetCurrentBatteryTip_noTips_isNull() {
+        assertThat(mBatteryTipPreferenceController.getCurrentBatteryTip()).isNull();
+    }
+
+    @Test
+    public void testGetCurrentBatteryTip_tipsInvisible_isNull() {
+        mBatteryTipPreferenceController.updateBatteryTips(mNewBatteryTips);
+        assertThat(mBatteryTipPreferenceController.getCurrentBatteryTip()).isNull();
+    }
+
+    @Test
+    public void testGetCurrentBatteryTip_tipsVisible_returnTips() {
+        mBatteryTipPreferenceController.updateBatteryTips(mOldBatteryTips);
+
+        assertThat(mBatteryTipPreferenceController.getCurrentBatteryTip().getType()).isEqualTo(
+                BatteryTip.TipType.SUMMARY);
+    }
+
     @Test
     public void testSaveAndRestore() {
         mBatteryTipPreferenceController.updateBatteryTips(mOldBatteryTips);

From d324393fac9dc29c6419f6fbad126de4b278365d Mon Sep 17 00:00:00 2001
From: "Wesley.CW Wang" <wesleycwwang@google.com>
Date: Wed, 7 Apr 2021 20:00:59 +0800
Subject: [PATCH 11/12] Update battery states text to support battery
 feature(1/2)

 - Update progress bar bottom text when receiving battery feature callback

Bug: 183689347
Bug: 177407113
Test: make SettingsRoboTests
Change-Id: Ic8b24cbb149f7e470d28327a9a1dd84bbd5673f7
---
 .../BatteryHeaderPreferenceController.java    |  5 +-
 ...BatteryHeaderPreferenceControllerTest.java | 60 ++++++++++++++++---
 2 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index a2cb9ae30cb..d0fa8e9f3b8 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -136,9 +136,12 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
     }
 
     public void updateHeaderPreference(BatteryInfo info) {
+        if (!mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) {
+            mBatteryUsageProgressBarPref.setBottomSummary(generateLabel(info));
+        }
+
         mBatteryUsageProgressBarPref.setUsageSummary(
                 formatBatteryPercentageText(info.batteryLevel));
-        mBatteryUsageProgressBarPref.setBottomSummary(generateLabel(info));
         mBatteryUsageProgressBarPref.setPercent(info.batteryLevel, BATTERY_MAX_LEVEL);
     }
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index 038798adee5..f6c292dea82 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -88,6 +88,8 @@ public class BatteryHeaderPreferenceControllerTest {
     private EntityHeaderController mEntityHeaderController;
     @Mock
     private UsageProgressBarPreference mBatteryUsageProgressBarPref;
+    @Mock
+    private BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
     private BatteryHeaderPreferenceController mController;
     private Context mContext;
     private ShadowPowerManager mShadowPowerManager;
@@ -123,6 +125,7 @@ public class BatteryHeaderPreferenceControllerTest {
         mController.setFragment(mPreferenceFragment);
         mController.setLifecycle(mLifecycle);
         mController.mBatteryUsageProgressBarPref = mBatteryUsageProgressBarPref;
+        mController.mBatteryStatusFeatureProvider = mBatteryStatusFeatureProvider;
     }
 
     @After
@@ -150,7 +153,7 @@ public class BatteryHeaderPreferenceControllerTest {
 
     @Test
     public void updatePreference_updateBatteryInfo() {
-        setChargingState(/* isDischarging */ true);
+        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
 
         mController.updateHeaderPreference(mBatteryInfo);
 
@@ -171,7 +174,7 @@ public class BatteryHeaderPreferenceControllerTest {
 
     @Test
     public void updatePreference_charging_showFullText() {
-        setChargingState(/* isDischarging */ false);
+        setChargingState(/* isDischarging */ false, /* updatedByStatusFeature */ false);
 
         mController.updateHeaderPreference(mBatteryInfo);
 
@@ -181,7 +184,7 @@ public class BatteryHeaderPreferenceControllerTest {
 
     @Test
     public void updatePreference_powerSaverOn_showPowerSaverOn() {
-        setChargingState(/* isDischarging */ true);
+        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
         mShadowPowerManager.setIsPowerSaveMode(true);
 
         mController.updateHeaderPreference(mBatteryInfo);
@@ -190,9 +193,49 @@ public class BatteryHeaderPreferenceControllerTest {
         verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedResult);
     }
 
+    @Test
+    public void updatePreference_triggerBatteryStatusUpdateTrue_updatePercentageAndUsageOnly() {
+        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ true);
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
+        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
+    }
+
+    @Test
+    public void updatePreference_triggerBatteryStatusUpdateFalse_updateBatteryInfo() {
+        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
+        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
+        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
+    }
+
+    @Test
+    public void updateBatteryStatus_nullLabel_updateSummaryOnly() {
+        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
+
+        mController.updateBatteryStatus(null, mBatteryInfo);
+
+        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
+    }
+
+    @Test
+    public void updateBatteryStatus_withLabel_showLabelText() {
+        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
+
+        final String label = "Update by battery status • " + TIME_LEFT;
+        mController.updateBatteryStatus(label, mBatteryInfo);
+
+        verify(mBatteryUsageProgressBarPref).setBottomSummary(label);
+    }
+
     @Test
     public void updateHeaderByBatteryTips_lowBatteryTip_showLowBattery() {
-        setChargingState(/* isDischarging */ true);
+        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
         BatteryTip lowBatteryTip = new LowBatteryTip(
                 BatteryTip.StateType.NEW, /* powerSaveModeOn */false);
 
@@ -204,7 +247,7 @@ public class BatteryHeaderPreferenceControllerTest {
 
     @Test
     public void updateHeaderByBatteryTips_notLowBatteryTip_showRemainingLabel() {
-        setChargingState(/* isDischarging */ true);
+        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
         BatteryTip lowBatteryTip = new SmartBatteryTip(BatteryTip.StateType.NEW);
 
         mController.updateHeaderByBatteryTips(lowBatteryTip, mBatteryInfo);
@@ -214,7 +257,7 @@ public class BatteryHeaderPreferenceControllerTest {
 
     @Test
     public void updateHeaderByBatteryTips_noTip_noAction() {
-        setChargingState(/* isDischarging */ true);
+        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
 
         mController.updateHeaderByBatteryTips(null, mBatteryInfo);
 
@@ -270,9 +313,12 @@ public class BatteryHeaderPreferenceControllerTest {
                 NumberFormat.getIntegerInstance().format(BATTERY_LEVEL));
     }
 
-    private void setChargingState(boolean isDischarging) {
+    private void setChargingState(boolean isDischarging, boolean updatedByStatusFeature) {
         mBatteryInfo.remainingLabel = TIME_LEFT;
         mBatteryInfo.statusLabel = BATTERY_STATUS;
         mBatteryInfo.discharging = isDischarging;
+
+        when(mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(
+                mController, mBatteryInfo)).thenReturn(updatedByStatusFeature);
     }
 }

From e69a08ffe7fd4eb43632e1bf88f5352df2035c27 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 8 Apr 2021 12:31:36 +0000
Subject: [PATCH 12/12] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I4f9492c1f18fb47712268b07137b028ed82b2ae5
---
 res/values-af/arrays.xml        |  7 ++++++-
 res/values-am/arrays.xml        |  7 ++++++-
 res/values-ar/arrays.xml        |  7 ++++++-
 res/values-as/arrays.xml        |  7 ++++++-
 res/values-az/arrays.xml        |  7 ++++++-
 res/values-b+sr+Latn/arrays.xml |  7 ++++++-
 res/values-be/arrays.xml        |  7 ++++++-
 res/values-bg/arrays.xml        |  7 ++++++-
 res/values-bn/arrays.xml        |  7 ++++++-
 res/values-bs/arrays.xml        |  7 ++++++-
 res/values-ca/arrays.xml        |  7 ++++++-
 res/values-cs/arrays.xml        |  7 ++++++-
 res/values-da/arrays.xml        |  7 ++++++-
 res/values-de/arrays.xml        |  7 ++++++-
 res/values-el/arrays.xml        |  7 ++++++-
 res/values-es-rUS/arrays.xml    |  7 ++++++-
 res/values-es/arrays.xml        |  7 ++++++-
 res/values-et/arrays.xml        |  7 ++++++-
 res/values-eu/arrays.xml        |  7 ++++++-
 res/values-fa/arrays.xml        |  9 +++++++--
 res/values-fi/arrays.xml        |  7 ++++++-
 res/values-fr-rCA/arrays.xml    |  7 ++++++-
 res/values-fr/arrays.xml        |  7 ++++++-
 res/values-gl/arrays.xml        |  7 ++++++-
 res/values-gu/arrays.xml        |  7 ++++++-
 res/values-hi/arrays.xml        |  7 ++++++-
 res/values-hr/arrays.xml        | 13 +++++++++----
 res/values-hu/arrays.xml        |  7 ++++++-
 res/values-hy/arrays.xml        |  7 ++++++-
 res/values-in/arrays.xml        |  7 ++++++-
 res/values-is/arrays.xml        |  7 ++++++-
 res/values-it/arrays.xml        |  9 +++++++--
 res/values-iw/arrays.xml        |  7 ++++++-
 res/values-ja/arrays.xml        |  9 +++++++--
 res/values-ka/arrays.xml        |  7 ++++++-
 res/values-kk/arrays.xml        | 23 ++++++++++++++---------
 res/values-km/arrays.xml        |  7 ++++++-
 res/values-ko/arrays.xml        |  7 ++++++-
 res/values-ky/arrays.xml        |  7 ++++++-
 res/values-lo/arrays.xml        |  7 ++++++-
 res/values-lt/arrays.xml        |  7 ++++++-
 res/values-lv/arrays.xml        |  7 ++++++-
 res/values-mk/arrays.xml        |  7 ++++++-
 res/values-ml/arrays.xml        |  9 +++++++--
 res/values-mn/arrays.xml        |  7 ++++++-
 res/values-mr/arrays.xml        |  7 ++++++-
 res/values-ms/arrays.xml        |  7 ++++++-
 res/values-my/arrays.xml        |  7 ++++++-
 res/values-nb/arrays.xml        |  7 ++++++-
 res/values-ne/arrays.xml        |  8 ++++----
 res/values-nl/arrays.xml        |  7 ++++++-
 res/values-or/arrays.xml        |  7 ++++++-
 res/values-pa/arrays.xml        |  7 ++++++-
 res/values-pl/arrays.xml        |  7 ++++++-
 res/values-pt-rBR/arrays.xml    |  7 ++++++-
 res/values-pt-rPT/arrays.xml    |  7 ++++++-
 res/values-pt/arrays.xml        |  7 ++++++-
 res/values-ro/arrays.xml        |  7 ++++++-
 res/values-ru/arrays.xml        | 23 ++++++++++++++---------
 res/values-si/arrays.xml        |  7 ++++++-
 res/values-sk/arrays.xml        |  7 ++++++-
 res/values-sl/arrays.xml        |  7 ++++++-
 res/values-sq/arrays.xml        |  7 ++++++-
 res/values-sr/arrays.xml        |  7 ++++++-
 res/values-sv/arrays.xml        |  7 ++++++-
 res/values-sw/arrays.xml        |  7 ++++++-
 res/values-ta/arrays.xml        |  7 ++++++-
 res/values-th/arrays.xml        |  7 ++++++-
 res/values-tl/arrays.xml        |  7 ++++++-
 res/values-tr/arrays.xml        |  7 ++++++-
 res/values-uk/arrays.xml        |  7 ++++++-
 res/values-uz/arrays.xml        |  7 ++++++-
 res/values-vi/arrays.xml        |  7 ++++++-
 res/values-zh-rCN/arrays.xml    |  7 ++++++-
 res/values-zh-rHK/arrays.xml    |  7 ++++++-
 res/values-zh-rTW/arrays.xml    |  7 ++++++-
 res/values-zu/arrays.xml        |  7 ++++++-
 77 files changed, 483 insertions(+), 103 deletions(-)

diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index edd9f2667ef..40aa78e057f 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Moenie verifieer nie"</item>
+    <item msgid="5703177653586269306">"Versoek sertifikaatstatus"</item>
+    <item msgid="326388247868439528">"Vereis sertifikaatstatus"</item>
+    <item msgid="1090956283885790552">"Vereis statusse van alle nievertroude sertifikate"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Druk knoppie"</item>
     <item msgid="2630618799033509548">"PIN van eweknietoestel"</item>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index be8415ac8af..656da914cc7 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"አታረጋግጥ"</item>
+    <item msgid="5703177653586269306">"የዕውቅና ማረጋገጫ ሁኔታን ጠይቅ"</item>
+    <item msgid="326388247868439528">"የዕውቅና ማረጋገጫ ሁኔታን ጠይቅ"</item>
+    <item msgid="1090956283885790552">"ሁሉንም ያልታመኑ የዕውቅና ማረጋገጫ ሁኔታዎችን ጠይቅ"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"አዝራር ተጫን"</item>
     <item msgid="2630618799033509548">"ፒን ከአቻ መሣሪያ"</item>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index debb1125b65..47191cafd9c 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"عدم التحقّق"</item>
+    <item msgid="5703177653586269306">"حالة الشهادة مطلوبة"</item>
+    <item msgid="326388247868439528">"حالة الشهادة مطلوبة"</item>
+    <item msgid="1090956283885790552">"جميع حالات الشهادات غير الموثوقة مطلوبة"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"زر الدفع"</item>
     <item msgid="2630618799033509548">"رقم تعريف شخصي من جهاز نظير"</item>
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
index eec0a1cf4c4..876a4fb72ec 100644
--- a/res/values-as/arrays.xml
+++ b/res/values-as/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"সত্যাপন নকৰিব"</item>
+    <item msgid="5703177653586269306">"প্ৰমাণপত্ৰৰ স্থিতিৰ অনুৰোধ কৰক"</item>
+    <item msgid="326388247868439528">"প্ৰমাণপত্ৰৰ স্থিতিৰ প্ৰয়োজন"</item>
+    <item msgid="1090956283885790552">"সকলো অবিশ্বাসযোগ্য প্ৰমাণপত্ৰৰ স্থিতিসমূহৰ প্ৰয়োজন"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"পুশ্ব বুটাম"</item>
     <item msgid="2630618799033509548">"সংযুক্ত ডিভাইচৰ পৰা পিন"</item>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index 052b495fa47..4c68dbd892c 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Doğrulamayın"</item>
+    <item msgid="5703177653586269306">"Sertifikat statusu tələb edin"</item>
+    <item msgid="326388247868439528">"Sertifikat statusu tələb edin"</item>
+    <item msgid="1090956283885790552">"Bütün etibarsız sertifikat statuslarını tələb edin"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Düyməyə basın"</item>
     <item msgid="2630618799033509548">"Eynisəviyyəli cihazdan PIN"</item>
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index bd3f204db4a..d0dacd4a60e 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Ne verifikuj"</item>
+    <item msgid="5703177653586269306">"Zatraži status sertifikata"</item>
+    <item msgid="326388247868439528">"Zahtevaj status sertifikata"</item>
+    <item msgid="1090956283885790552">"Zahtevaj statuse svih nepouzdanih sertifikata"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Pritiskanje dugmeta"</item>
     <item msgid="2630618799033509548">"PIN sa ravnopravnog uređaja"</item>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index b8ee1fb0145..fb8cbaa0d6f 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Не спраўджваць"</item>
+    <item msgid="5703177653586269306">"Запыт стану сертыфіката"</item>
+    <item msgid="326388247868439528">"Патрэбны стан сертыфіката"</item>
+    <item msgid="1090956283885790552">"Патрабуюцца станы ўсіх недавераных сертыфікатаў"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Націсніце кнопку"</item>
     <item msgid="2630618799033509548">"PIN-код ад пірынгавай прылады"</item>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index d2bafc62fa2..5785373f719 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Без потвърждаване"</item>
+    <item msgid="5703177653586269306">"Заявка за състоянието на сертификата"</item>
+    <item msgid="326388247868439528">"Изискване на състоянието на сертификата"</item>
+    <item msgid="1090956283885790552">"Изискване на състоянията на всички ненадеждни сертификати"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Бутон"</item>
     <item msgid="2630618799033509548">"ПИН от съответното устройство"</item>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index f11f2651236..fb1390a2724 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"যাচাই করবেন না"</item>
+    <item msgid="5703177653586269306">"সার্টিফিকেট স্ট্যাটাসের অনুরোধ করুন"</item>
+    <item msgid="326388247868439528">"সার্টিফিকেট স্ট্যাটাসের প্রয়োজন আছে"</item>
+    <item msgid="1090956283885790552">"বিশ্বস্ত নয় এমন সব সার্টিফিকেটের স্ট্যাটাসের প্রয়োজন"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"পুশ বোতাম"</item>
     <item msgid="2630618799033509548">"চেনা ডিভাইস থেকে পিন"</item>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 3394fec16db..80c81695626 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Nemoj potvrditi"</item>
+    <item msgid="5703177653586269306">"Zatraži status certifikata"</item>
+    <item msgid="326388247868439528">"Zahtijevaj status certifikata"</item>
+    <item msgid="1090956283885790552">"Zahtijevaj statuse svih nepouzdanih certifikata"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Pritisnite dugme"</item>
     <item msgid="2630618799033509548">"PIN ravnopravnog uređaja"</item>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 4e664ca2924..91e8cd07347 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"No verifiquis"</item>
+    <item msgid="5703177653586269306">"Sol·licita l\'estat de certificat"</item>
+    <item msgid="326388247868439528">"Requereix l\'estat de certificat"</item>
+    <item msgid="1090956283885790552">"Requereix tots els estats de certificat que no siguin de confiança"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Botó per prémer"</item>
     <item msgid="2630618799033509548">"PIN de l\'altre dispositiu"</item>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 8851ac39de7..c05ef3a583b 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Neověřovat"</item>
+    <item msgid="5703177653586269306">"Vyžadovat stav certifikátu"</item>
+    <item msgid="326388247868439528">"Požadovat stav certifikátu"</item>
+    <item msgid="1090956283885790552">"Požadovat stav všech nedůvěryhodných certifikátů"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Stisknutí tlačítka"</item>
     <item msgid="2630618799033509548">"PIN ze sdíleného zařízení"</item>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 03d806333cb..c11e3c99321 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Undlad at bekræfte"</item>
+    <item msgid="5703177653586269306">"Anmod om certifikatstatus"</item>
+    <item msgid="326388247868439528">"Kræv certifikatstatus"</item>
+    <item msgid="1090956283885790552">"Kræv alle ikke-godkendte certifikatstatusser"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Trykknap"</item>
     <item msgid="2630618799033509548">"Pinkode fra din vens enhed"</item>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 78870c41696..f80d005f270 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Nicht prüfen"</item>
+    <item msgid="5703177653586269306">"Zertifikatstatus auf Anforderung"</item>
+    <item msgid="326388247868439528">"Zertifikatstatus erforderlich"</item>
+    <item msgid="1090956283885790552">"Jeder nicht vertrauenswürdige Zertifikatstatus erforderlich"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Push-Schaltfläche"</item>
     <item msgid="2630618799033509548">"PIN von Peer-Gerät"</item>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index f4c1c4b14d7..29823a57c27 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Να μην γίνει επαλήθευση"</item>
+    <item msgid="5703177653586269306">"Αίτημα κατάστασης πιστοποιητικού"</item>
+    <item msgid="326388247868439528">"Απαίτηση κατάστασης πιστοποιητικού"</item>
+    <item msgid="1090956283885790552">"Απαίτηση των καταστάσεων όλων των μη αξιόπιστων πιστοποιητικών"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Πάτημα κουμπιού"</item>
     <item msgid="2630618799033509548">"PIN από ομότιμη συσκευή"</item>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index fd7d93700f1..3297206281e 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"No verificar"</item>
+    <item msgid="5703177653586269306">"Solicitar estado del certificado"</item>
+    <item msgid="326388247868439528">"Exigir estado del certificado"</item>
+    <item msgid="1090956283885790552">"Exigir estados de cert. no de confianza"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Presionar botón"</item>
     <item msgid="2630618799033509548">"PIN del dispositivo par"</item>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 04b9ed5db34..35e668d9de2 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"No verificar"</item>
+    <item msgid="5703177653586269306">"Solicitar estado de certificado"</item>
+    <item msgid="326388247868439528">"Pedir estado de certificado"</item>
+    <item msgid="1090956283885790552">"Pedir todos los estados de certificado no fiables"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Botón WPS"</item>
     <item msgid="2630618799033509548">"PIN del otro dispositivo"</item>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index b7fac13e69f..068098b1f39 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Ära kinnita"</item>
+    <item msgid="5703177653586269306">"Sertifikaadioleku taotlemine"</item>
+    <item msgid="326388247868439528">"Sertifikaadioleku nõudmine"</item>
+    <item msgid="1090956283885790552">"Kõigi mitteusaldusväärsete sertifikaadiolekute nõudmine"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Vajutusnupp"</item>
     <item msgid="2630618799033509548">"PIN-kood partnerseadmest"</item>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index cb86c4a8f8b..0332bda0f70 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Ez egiaztatu"</item>
+    <item msgid="5703177653586269306">"Eskatu ziurtagirien egoera emateko"</item>
+    <item msgid="326388247868439528">"Behartu ziurtagirien egoera ematera"</item>
+    <item msgid="1090956283885790552">"Behartu fidagarritzat jotzen ez diren ziurtagiri guztien egoera ematera"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Sakatu botoia"</item>
     <item msgid="2630618799033509548">"Pareko gailuaren PINa"</item>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 521eca7ff8a..6d490a36886 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"درستی‌سنجی نشود"</item>
+    <item msgid="5703177653586269306">"درخواست وضعیت گواهی"</item>
+    <item msgid="326388247868439528">"نیاز به وضعیت گواهی"</item>
+    <item msgid="1090956283885790552">"نیاز به همه وضعیت‌های گواهی غیرقابل‌اطمینان"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"فشار دکمه"</item>
     <item msgid="2630618799033509548">"پین از دستگاه مرتبط شده"</item>
@@ -466,7 +471,7 @@
   <string-array name="proc_stats_process_states">
     <item msgid="7389344075996860704">"دائمی"</item>
     <item msgid="5777152116210127847">"فعالیت برتر"</item>
-    <item msgid="1834030155560727324">"مهم (پیش‌زمینه)"</item>
+    <item msgid="1834030155560727324">"مهم (پیش‌نما)"</item>
     <item msgid="8494424742994426350">"مهم (پس‌زمینه)"</item>
     <item msgid="5099332663422156149">"پشتیبان‌گیری"</item>
     <item msgid="7701089238529887617">"سنگین وزن"</item>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 58a536302a8..af9e7a6876e 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Älä todenna"</item>
+    <item msgid="5703177653586269306">"Pyydä varmenteen status"</item>
+    <item msgid="326388247868439528">"Vaadi varmenteen status"</item>
+    <item msgid="1090956283885790552">"Vaadi kaikkien ei-luotettujen varmenteiden status"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Paina painiketta"</item>
     <item msgid="2630618799033509548">"Vertaislaitteen PIN-koodi"</item>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index c718c036db9..8b35f929592 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Ne pas vérifier"</item>
+    <item msgid="5703177653586269306">"Demander l\'état du certificat"</item>
+    <item msgid="326388247868439528">"Exiger l\'état du certificat"</item>
+    <item msgid="1090956283885790552">"Exiger tous les états de certificats non fiables"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Bouton de commande"</item>
     <item msgid="2630618799033509548">"NIP de l\'appareil associé"</item>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index e30f5f1468e..11690b58398 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Ne pas valider"</item>
+    <item msgid="5703177653586269306">"Demander l\'état du certificat"</item>
+    <item msgid="326388247868439528">"Exiger l\'état du certificat"</item>
+    <item msgid="1090956283885790552">"Exiger l\'état de tous les certificats non approuvés"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Appuyer sur le bouton"</item>
     <item msgid="2630618799033509548">"Code de l\'appareil associé"</item>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 89fd779a61e..9893d47b5a0 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Non verificar"</item>
+    <item msgid="5703177653586269306">"Solicitar estados de certificados"</item>
+    <item msgid="326388247868439528">"Requirir estados de certificados"</item>
+    <item msgid="1090956283885790552">"Pedir todos os estados de certificados non fiables"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Pulsar o botón"</item>
     <item msgid="2630618799033509548">"PIN do dispositivo mesmo nivel"</item>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index 2b3e1dc3174..343fe06cfdc 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"ચકાસણી કરશો નહીં"</item>
+    <item msgid="5703177653586269306">"પ્રમાણપત્રના સ્ટેટસ માટે વિનંતી કરો"</item>
+    <item msgid="326388247868439528">"પ્રમાણપત્રનું સ્ટેટસ જરુરી છે"</item>
+    <item msgid="1090956283885790552">"બધા અવિશ્વસનીય પ્રમાણપત્રના સ્ટેટસ જરૂરી છે"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"પુશ બટન"</item>
     <item msgid="2630618799033509548">"પીઅર ઉપકરણ પરથી પિન"</item>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 1956810102a..29cb7f8d975 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"पुष्टि न करें"</item>
+    <item msgid="5703177653586269306">"प्रमाणपत्र की स्थिति का अनुरोध करें"</item>
+    <item msgid="326388247868439528">"प्रमाणपत्र की स्थिति ज़रूरी है"</item>
+    <item msgid="1090956283885790552">"ऐसे सभी प्रमाणपत्र की स्थिति ज़रूरी है जो भरोसेमंद नहीं हैं"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"पुश बटन"</item>
     <item msgid="2630618799033509548">"साथी डिवाइस से पिन"</item>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 456a7d58b3f..72e81df6c1c 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -53,9 +53,9 @@
     <!-- no translation found for dark_ui_scheduler_preference_titles:2 (8842756744447000897) -->
   <string-array name="lock_after_timeout_entries">
     <item msgid="2223808927866488981">"Odmah"</item>
-    <item msgid="463591454172790676">"5 s"</item>
-    <item msgid="6981910499530067289">"15 sekunda"</item>
-    <item msgid="841968393904987343">"30 sekunda"</item>
+    <item msgid="463591454172790676">"5 sekundi"</item>
+    <item msgid="6981910499530067289">"15 sekundi"</item>
+    <item msgid="841968393904987343">"30 sekundi"</item>
     <item msgid="8209996803755081758">"1 min"</item>
     <item msgid="8532038695054819775">"2 minute"</item>
     <item msgid="230858078069711241">"5 minuta"</item>
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Nemoj potvrditi"</item>
+    <item msgid="5703177653586269306">"Zatraži status certifikata"</item>
+    <item msgid="326388247868439528">"Zahtijevaj status certifikata"</item>
+    <item msgid="1090956283885790552">"Zahtijevaj statuse svih nepouzdanih certifikata"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Gumb"</item>
     <item msgid="2630618799033509548">"PIN s paralelnog uređaja"</item>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 6c5d9a0e025..0811a64052d 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Nincs ellenőrzés"</item>
+    <item msgid="5703177653586269306">"Tanúsítvány állapotának kérése"</item>
+    <item msgid="326388247868439528">"Tanúsítvány állapotának kötelező kérése"</item>
+    <item msgid="1090956283885790552">"Az összes nem megbízható tanúsítvány állapotának kötelező kérése"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Nyomógomb"</item>
     <item msgid="2630618799033509548">"Partnereszköztől kapott PIN"</item>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index fe5aa0f0502..5d2e80fd960 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Չստուգել"</item>
+    <item msgid="5703177653586269306">"Հարցնել հավաստագրի կարգավիճակը"</item>
+    <item msgid="326388247868439528">"Պահանջել հավաստագրի կարգավիճակը"</item>
+    <item msgid="1090956283885790552">"Պահանջել բոլոր չհաստատված հավաստագրերի կարգավիճակները"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Սեղմման կոճակ"</item>
     <item msgid="2630618799033509548">"Հավասարազոր սարքի PIN-ը"</item>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index cefc2d422c5..99e4bdd5f7d 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Jangan verifikasi"</item>
+    <item msgid="5703177653586269306">"Minta status sertifikat"</item>
+    <item msgid="326388247868439528">"Wajibkan status sertifikat"</item>
+    <item msgid="1090956283885790552">"Wajibkan semua status sertifikat yang tidak dipercaya"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Tekan tombol"</item>
     <item msgid="2630618799033509548">"PIN dari perangkat rekan"</item>
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index f503a1939fd..e3b5da9c262 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Ekki staðfesta"</item>
+    <item msgid="5703177653586269306">"Óska eftir stöðu vottorðs"</item>
+    <item msgid="326388247868439528">"Krefjast stöðu vottorðs"</item>
+    <item msgid="1090956283885790552">"Krefjast stöðu allra vottorða sem ekki er treystandi"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Hnappur"</item>
     <item msgid="2630618799033509548">"PIN-númer úr tengdu tæki"</item>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index bb0048a8eed..cb2b4030117 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Non verificare"</item>
+    <item msgid="5703177653586269306">"Chiedi stato dei certificati"</item>
+    <item msgid="326388247868439528">"Esigi stato dei certificati"</item>
+    <item msgid="1090956283885790552">"Esigi stati di tutti i certificati non attendibili"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Pulsante di comando"</item>
     <item msgid="2630618799033509548">"PIN del dispositivo peer"</item>
@@ -504,7 +509,7 @@
     <item msgid="2047166446768045816">"Considera non a consumo"</item>
   </string-array>
   <string-array name="wifi_privacy_entries">
-    <item msgid="3485945604919292489">"Usa MAC casuale (predefinito)"</item>
+    <item msgid="3485945604919292489">"Usa MAC casuale (opzione predefinita)"</item>
     <item msgid="741680937828608749">"Usa MAC del dispositivo"</item>
   </string-array>
   <string-array name="wifi_hidden_entries">
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index db6bb15154c..dae4ebc9fba 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"אין לאמת"</item>
+    <item msgid="5703177653586269306">"יש לבקש סטטוס של אישורים"</item>
+    <item msgid="326388247868439528">"יש לדרוש סטטוס של אישורים"</item>
+    <item msgid="1090956283885790552">"יש לדרוש סטטוסים של כל האישורים שאינם מהימנים"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"לחצן דחיפה"</item>
     <item msgid="2630618799033509548">"קוד גישה ממכשיר עמית"</item>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index f0d94634f1e..ef189700df3 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -52,7 +52,7 @@
     <!-- no translation found for dark_ui_scheduler_preference_titles:1 (4057198235664064478) -->
     <!-- no translation found for dark_ui_scheduler_preference_titles:2 (8842756744447000897) -->
   <string-array name="lock_after_timeout_entries">
-    <item msgid="2223808927866488981">"すぐ"</item>
+    <item msgid="2223808927866488981">"直後"</item>
     <item msgid="463591454172790676">"5秒"</item>
     <item msgid="6981910499530067289">"15秒"</item>
     <item msgid="841968393904987343">"30秒"</item>
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"検証しない"</item>
+    <item msgid="5703177653586269306">"認証ステータスをリクエストする"</item>
+    <item msgid="326388247868439528">"認証ステータスを要求する"</item>
+    <item msgid="1090956283885790552">"信頼できない認証ステータスをすべて要求する"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"ボタンを押す"</item>
     <item msgid="2630618799033509548">"ピアデバイスのPIN"</item>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index 4902c852781..486ee42cb1d 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"არ დადასტურდეს"</item>
+    <item msgid="5703177653586269306">"მოითხოვეთ სერტიფიკატის სტატუსი"</item>
+    <item msgid="326388247868439528">"მოითხოვეთ სერტიფიკატის სტატუსი"</item>
+    <item msgid="1090956283885790552">"მოითხოვეთ ყველა არასანდო სერტ. სტატუსები"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Push ღილაკი"</item>
     <item msgid="2630618799033509548">"ერთრანგიანი მოწყობილობის პინი"</item>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index e833cecdf6e..c7c4e620eec 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Растамау"</item>
+    <item msgid="5703177653586269306">"Сертификат күйін сұрау"</item>
+    <item msgid="326388247868439528">"Сертификат күйін талап ету"</item>
+    <item msgid="1090956283885790552">"Барлық сенімсіз сертификат күйлерін талап ету"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Итеру түймесі"</item>
     <item msgid="2630618799033509548">"Басқа құрылғының PIN коды"</item>
@@ -217,7 +222,7 @@
     <item msgid="2362840341195111674">"Жүйені өзі шешсін"</item>
   </string-array>
   <string-array name="app_ops_categories">
-    <item msgid="528483497841471005">"Орналасу"</item>
+    <item msgid="528483497841471005">"Геодерек"</item>
     <item msgid="7786376598377098070">"Жеке мағлұмат"</item>
     <item msgid="7707692387382449990">"Хабар алмасу"</item>
     <item msgid="2235402926760712958">"Meдиа"</item>
@@ -291,9 +296,9 @@
     <item msgid="2553974920157061225">"арнайы мүмкіндіктердің дыбыс деңгейі"</item>
   </string-array>
   <string-array name="app_ops_labels">
-    <item msgid="7780927354556651567">"Орналасу"</item>
-    <item msgid="364182753727575631">"Орналасу"</item>
-    <item msgid="5728662879095632194">"Орналасу"</item>
+    <item msgid="7780927354556651567">"Геодерек"</item>
+    <item msgid="364182753727575631">"Геодерек"</item>
+    <item msgid="5728662879095632194">"Геодерек"</item>
     <item msgid="4104617224667554750">"Діріл"</item>
     <item msgid="1623646715189708947">"Контактілерді оқу"</item>
     <item msgid="5060760609109972207">"Контактілерді жөндеу"</item>
@@ -301,9 +306,9 @@
     <item msgid="2348589304974534308">"Қоңыраулар тіркелімін өзгерту"</item>
     <item msgid="4089146706115315300">"Күнтізбені оқу"</item>
     <item msgid="1305780729690198918">"Күнтізбені жөндеу"</item>
-    <item msgid="3461096740171440592">"Орналасу"</item>
+    <item msgid="3461096740171440592">"Геодерек"</item>
     <item msgid="6657539556093198883">"Пост хабарлары"</item>
-    <item msgid="8112680908829570200">"Орналасу"</item>
+    <item msgid="8112680908829570200">"Геодерек"</item>
     <item msgid="5019327268152480733">"Қоңырау шалу"</item>
     <item msgid="8001855901083066554">"SMS/MMS оқу"</item>
     <item msgid="187744670643011148">"SMS/MMS жазу"</item>
@@ -332,8 +337,8 @@
     <item msgid="8608084169623998854">"Хабар дыбысының қаттылығы"</item>
     <item msgid="7948784184567841794">"Bluetooth дыбысының қаттылығы"</item>
     <item msgid="1148968792599973150">"Ұйқы бермеу"</item>
-    <item msgid="8482874682804856549">"Орналасу"</item>
-    <item msgid="5186169827582545242">"Орналасу"</item>
+    <item msgid="8482874682804856549">"Геодерек"</item>
+    <item msgid="5186169827582545242">"Локация"</item>
     <item msgid="6122293931012635638">"Пайдалану статистикасын алу"</item>
     <item msgid="2526677383312751932">"Микрофон дыбысын өшіру/қосу"</item>
     <item msgid="4000577305179914546">"Қалқымалы хабарландыру көрсету"</item>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index 4afbdf7f36a..286cfc775c0 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"កុំផ្ទៀងផ្ទាត់"</item>
+    <item msgid="5703177653586269306">"ស្នើស្ថានភាព​វិញ្ញាបនបត្រ"</item>
+    <item msgid="326388247868439528">"តម្រូវឱ្យ​មានស្ថានភាព​វិញ្ញាបនបត្រ"</item>
+    <item msgid="1090956283885790552">"តម្រូវឱ្យ​មានស្ថានភាព​វិញ្ញាបនបត្រដែលមិនជឿ​ទុកចិត្តទាំងអស់"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"ប៊ូតុង​ចុច"</item>
     <item msgid="2630618799033509548">"កូដ PIN ពី​ឧបករណ៍​"</item>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 2bb32ed6fe0..db606c1b1c4 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"인증 안함"</item>
+    <item msgid="5703177653586269306">"인증서 상태 요청"</item>
+    <item msgid="326388247868439528">"인증서 상태 필요"</item>
+    <item msgid="1090956283885790552">"신뢰할 수 없는 모든 인증서 상태 필요"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"누름 버튼"</item>
     <item msgid="2630618799033509548">"피어 기기 PIN"</item>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index a22543bc517..25c93edbc74 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Текшерилбесин"</item>
+    <item msgid="5703177653586269306">"Тастыктаманын статусун көрсөтүүнү сурануу"</item>
+    <item msgid="326388247868439528">"Тастыктаманын статусун талап кылуу"</item>
+    <item msgid="1090956283885790552">"Ишенимсиз тастыктамалардын статустарын талап кылуу"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Баскычты басыңыз"</item>
     <item msgid="2630618799033509548">"Туташуучу түзмөктүн PIN\'и"</item>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index ac9c6ed1373..beb6b38dc52 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"ຢ່າຢັ້ງຢືນ"</item>
+    <item msgid="5703177653586269306">"ຂໍສະຖານະໃບຮັບຮອງ"</item>
+    <item msgid="326388247868439528">"ຈຳເປັນຕ້ອງມີສະຖານະໃບຮັບຮອງ"</item>
+    <item msgid="1090956283885790552">"ຈຳເປັນຕ້ອງມີສະຖານະໃບຮັບຮອງທີ່ບໍ່ແມ່ນເຊື່ອຖືໄດ້ທັງໝົດ"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"ປຸ່ມ Push"</item>
     <item msgid="2630618799033509548">"PIN ຈາກອຸປະກອນທີ່ເຊື່ອມຕໍ່ກັນ"</item>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 9acd9d15151..be2796d2e3b 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Nepatvirtinti"</item>
+    <item msgid="5703177653586269306">"Pateikti sertifikato būsenos užklausą"</item>
+    <item msgid="326388247868439528">"Reikalauti sertifikato būsenos"</item>
+    <item msgid="1090956283885790552">"Reikalauti visų nepatikimų sertifikatų būsenų"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Mygtuko paspaudimas"</item>
     <item msgid="2630618799033509548">"PIN kodas iš susieto įrenginio"</item>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 11e79ee1123..c4ba76554c4 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Neverificēt"</item>
+    <item msgid="5703177653586269306">"Pieprasīt sertifikāta statusu"</item>
+    <item msgid="326388247868439528">"Pieprasīt sertifikāta statusu"</item>
+    <item msgid="1090956283885790552">"Pieprasīt visu neuzticamo sertifikātu statusu"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Spiedpoga"</item>
     <item msgid="2630618799033509548">"Vienādranga ierīces PIN kods"</item>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index 9bc06df53d6..bd6f2afeb63 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Не потврдувај"</item>
+    <item msgid="5703177653586269306">"Побарај статус на сертификатот"</item>
+    <item msgid="326388247868439528">"Статусот на сертификатот е задолжителен"</item>
+    <item msgid="1090956283885790552">"Статусите на сите недоверливи сертификати се задолжителни"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Копче „Притисни“"</item>
     <item msgid="2630618799033509548">"PIN од спарен уред"</item>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index 512953883ac..e3ea6796fc2 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"പരിശോധിച്ചുറപ്പിക്കരുത്"</item>
+    <item msgid="5703177653586269306">"സർട്ടിഫിക്കറ്റ് നിലകൾ അഭ്യർത്ഥിക്കുക"</item>
+    <item msgid="326388247868439528">"സർട്ടിഫിക്കറ്റ് നിലകൾ ആവശ്യമാണ്"</item>
+    <item msgid="1090956283885790552">"വിശ്വസനീയമല്ലാത്ത എല്ലാ സർട്ടിഫിക്കറ്റുകളുടെയും നിലകൾ ആവശ്യമാണ്"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"പുഷ് ബട്ടൺ"</item>
     <item msgid="2630618799033509548">"പിയർ ഉപകരണത്തിൽ നിന്നുള്ള പിൻ"</item>
@@ -317,7 +322,7 @@
     <item msgid="8997371825401751421">"ക്രമീകരണങ്ങൾ പരിഷ്‌ക്കരിക്കുക"</item>
     <item msgid="7005755175240764443">"മുകളിൽ ഡ്രോ ചെയ്യുക"</item>
     <item msgid="8267704990417682222">"ആക്‌സസ്സ് അറിയിപ്പുകൾ"</item>
-    <item msgid="3180676986290096851">"Camera"</item>
+    <item msgid="3180676986290096851">"ക്യാമറ"</item>
     <item msgid="9174072114281872917">"ഓഡിയോ റെക്കോർഡുചെയ്യുക"</item>
     <item msgid="1444183972646890539">"ഓഡിയോ പ്ലേ ചെയ്യുക"</item>
     <item msgid="4337542044275236638">"ക്ലിപ്പ്ബോർഡ് റീഡുചെയ്യുക"</item>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index f49ee0ce23c..beab7f26ea0 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Бүү баталгаажуул"</item>
+    <item msgid="5703177653586269306">"Сертификатын статусын хүсэлт тавих"</item>
+    <item msgid="326388247868439528">"Сертификатын статус шаардлагатай"</item>
+    <item msgid="1090956283885790552">"Бүх итгэмжлэгдээгүй сертификатын статус шаардлагатай"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Товчлуур"</item>
     <item msgid="2630618799033509548">"Түнш төхөөрөмжийн PIN"</item>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index ac004eb62dc..92d4a8bd177 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"पडताळणी करू नका"</item>
+    <item msgid="5703177653586269306">"प्रमाणपत्र स्थितीची विनंती करा"</item>
+    <item msgid="326388247868439528">"प्रमाणपत्र स्थिती आवश्यक आहे"</item>
+    <item msgid="1090956283885790552">"सर्व विश्वास नसलेल्या प्रमाणपत्रांची स्थिती आवश्यक आहे"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"पुश बटण"</item>
     <item msgid="2630618799033509548">"पीअर डिव्हाइसवरील पिन"</item>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 91a11794db3..ca4ee9d1d7b 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Jangan sahkan"</item>
+    <item msgid="5703177653586269306">"Minta status sijil"</item>
+    <item msgid="326388247868439528">"Perlukan status sijil"</item>
+    <item msgid="1090956283885790552">"Perlukan semua status sijil yang tidak dipercayai"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Butang tekan"</item>
     <item msgid="2630618799033509548">"PIN daripada peranti rakan"</item>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index e10d6224986..3a1332c4997 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"မစိစစ်ပါနှင့်"</item>
+    <item msgid="5703177653586269306">"အသိအမှတ်ပြုလက်မှတ် အခြေအနေ တောင်းဆိုပါ"</item>
+    <item msgid="326388247868439528">"အသိအမှတ်ပြုလက်မှတ် လိုအပ်သည်"</item>
+    <item msgid="1090956283885790552">"ယုံကြည်စိတ်ချရခြင်းမရှိသည့် အသိအမှတ်ပြုလက်မှတ် အခြေအနေများအားလုံး လိုအပ်သည်"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"နှိပ်ရန်ခလုတ်"</item>
     <item msgid="2630618799033509548">"တန်းတူစက်ပစ္စည်းမှပင်နံပါတ်"</item>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index dd4a823dc7f..b8460f5a9ae 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Ikke bekreft"</item>
+    <item msgid="5703177653586269306">"Be om sertifikatstatus"</item>
+    <item msgid="326388247868439528">"Krev sertifikatstatus"</item>
+    <item msgid="1090956283885790552">"Krev statuser for alle ikke-klarerte sertifikater"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Trykk på knappen"</item>
     <item msgid="2630618799033509548">"Personlig kode fra motpart"</item>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index 45113783507..a3185a417c3 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -73,7 +73,7 @@
     <item msgid="7388036070768806193">"स्क्यान गरिँदै..."</item>
     <item msgid="1656176059757237036">"जडान हुँदै..."</item>
     <item msgid="3249903732481917388">"प्रमाणित गर्दै ..."</item>
-    <item msgid="7789156794775399931">"IP ठेगाना पत्ता लगाउँदै ..."</item>
+    <item msgid="7789156794775399931">"IP एड्रेस पत्ता लगाउँदै ..."</item>
     <item msgid="492518447401534767">"कनेक्ट छ"</item>
     <item msgid="4322989558568666518">"निलम्बित"</item>
     <item msgid="286164147080824297">"विच्छेदन गर्दै..."</item>
@@ -87,7 +87,7 @@
     <item msgid="155483314608049961">"स्क्यान गर्दै..."</item>
     <item msgid="3409219643606946053">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>सँग जडान हुँदै..."</item>
     <item msgid="7891463004457278422">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>को साथ प्रमाणित गर्दै…"</item>
-    <item msgid="3193388999810487137">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>बाट IP ठेगाना प्राप्त गर्दै…"</item>
+    <item msgid="3193388999810487137">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>बाट IP एड्रेस प्राप्त गर्दै…"</item>
     <item msgid="2227930004124157952">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> मा जोडिएको छ"</item>
     <item msgid="7104168043537022445">"निलम्बित"</item>
     <item msgid="2595938203187002544">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>बाट विच्छेदन गर्दै..."</item>
@@ -466,7 +466,7 @@
   <string-array name="proc_stats_process_states">
     <item msgid="7389344075996860704">"लगातार"</item>
     <item msgid="5777152116210127847">"उच्च गतिविधि"</item>
-    <item msgid="1834030155560727324">"महत्वपूर्ण (अग्रभूमि)"</item>
+    <item msgid="1834030155560727324">"महत्वपूर्ण (फ‍ोरग्राउन्ड)"</item>
     <item msgid="8494424742994426350">"महत्वपूर्ण (पृष्ठभूमि)"</item>
     <item msgid="5099332663422156149">"जगेडा"</item>
     <item msgid="7701089238529887617">"भारी वजन"</item>
@@ -505,7 +505,7 @@
   </string-array>
   <string-array name="wifi_privacy_entries">
     <item msgid="3485945604919292489">"क्रमरहित MAC प्रयोग गर्नुहोस् (पूर्वनिर्धारित)"</item>
-    <item msgid="741680937828608749">"यन्त्रको MAC प्रयोग गर्नुहोस्"</item>
+    <item msgid="741680937828608749">"डिभाइसको MAC प्रयोग गर्नुहोस्"</item>
   </string-array>
   <string-array name="wifi_hidden_entries">
     <item msgid="342232116597649254">"होइन"</item>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index b33aa120397..8d3df92083a 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Niet verifiëren"</item>
+    <item msgid="5703177653586269306">"Certificaatstatus opvragen"</item>
+    <item msgid="326388247868439528">"Certificaatstatus vereisen"</item>
+    <item msgid="1090956283885790552">"Alle niet-vertrouwde certificaatstatussen vereisen"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Knop indrukken"</item>
     <item msgid="2630618799033509548">"Pincode van peerapparaat"</item>
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
index 65dcf98e12d..d95ff15e97a 100644
--- a/res/values-or/arrays.xml
+++ b/res/values-or/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"ଯାଞ୍ଚ କରନ୍ତୁ ନାହିଁ"</item>
+    <item msgid="5703177653586269306">"ସାର୍ଟିଫିକେଟ୍ ସ୍ଥିତି ପାଇଁ ଅନୁରୋଧ କରନ୍ତୁ"</item>
+    <item msgid="326388247868439528">"ସାର୍ଟିଫିକେଟ୍ ସ୍ଥିତିର ଆବଶ୍ୟକତା ଅଛି"</item>
+    <item msgid="1090956283885790552">"ସମସ୍ତ ଅବିଶ୍ୱସନୀୟ ସାର୍ଟିଫିକେଟ୍ ସ୍ଥିତିର ଆବଶ୍ୟକତା ଅଛି"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"ପୁଶ୍‌ ବଟନ୍‌"</item>
     <item msgid="2630618799033509548">"ପୀଅର୍‌ ଡିଭାଇସ୍‌ରୁ PIN‌"</item>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 10a3aa0d455..827a9cfabaa 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"ਪੁਸ਼ਟੀ ਨਾ ਕਰੋ"</item>
+    <item msgid="5703177653586269306">"ਪ੍ਰਮਾਣ-ਪੱਤਰ ਦੀ ਸਥਿਤੀ ਲਈ ਬੇਨਤੀ ਕਰੋ"</item>
+    <item msgid="326388247868439528">"ਪ੍ਰਮਾਣ-ਪੱਤਰ ਦੀ ਸਥਿਤੀ ਦੀ ਲੋੜ ਹੈ"</item>
+    <item msgid="1090956283885790552">"ਸਾਰੀਆਂ ਗੈਰ-ਭਰੋਸੇਯੋਗ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਦੀਆਂ ਸਥਿਤੀਆਂ ਦੀ ਲੋੜ ਹੈ"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"ਪੁਸ਼ ਬਟਨ"</item>
     <item msgid="2630618799033509548">"ਪੀਅਰ ਡੀਵਾਈਸ ਤੋਂ ਪਿੰਨ"</item>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index b4a4e3c9c78..78d56101a30 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Nie weryfikuj"</item>
+    <item msgid="5703177653586269306">"Żądaj stanu certyfikatu"</item>
+    <item msgid="326388247868439528">"Wymagaj stanu certyfikatu"</item>
+    <item msgid="1090956283885790552">"Wymagaj stanów wszystkich niezaufanych certyfikatów"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Naciśnij przycisk"</item>
     <item msgid="2630618799033509548">"Kod PIN z drugiego urządzenia"</item>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 00526eb2de2..3ee87a20fdf 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Não verificar"</item>
+    <item msgid="5703177653586269306">"Solicitar status de certificados"</item>
+    <item msgid="326388247868439528">"Exigir status de certificados"</item>
+    <item msgid="1090956283885790552">"Exigir todos os status de certificados não confiáveis"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Pressione o botão"</item>
     <item msgid="2630618799033509548">"PIN do dispositivo pareado"</item>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index f4e7628bb2c..e20dd3eae36 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Não validar"</item>
+    <item msgid="5703177653586269306">"Solicitar estado do certificado"</item>
+    <item msgid="326388247868439528">"Exigir estado do certificado"</item>
+    <item msgid="1090956283885790552">"Exigir estados de todos os certificados não fidedignos"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Premir botão"</item>
     <item msgid="2630618799033509548">"PIN do aparelho do elemento"</item>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 00526eb2de2..3ee87a20fdf 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Não verificar"</item>
+    <item msgid="5703177653586269306">"Solicitar status de certificados"</item>
+    <item msgid="326388247868439528">"Exigir status de certificados"</item>
+    <item msgid="1090956283885790552">"Exigir todos os status de certificados não confiáveis"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Pressione o botão"</item>
     <item msgid="2630618799033509548">"PIN do dispositivo pareado"</item>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index ad7f052edbe..37975e64a56 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Nu verifica"</item>
+    <item msgid="5703177653586269306">"Solicitați starea certificatelor"</item>
+    <item msgid="326388247868439528">"Solicitați obligatoriu starea certificatelor"</item>
+    <item msgid="1090956283885790552">"Solicitați toate stările certif. care nu prezintă încredere"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Buton WPS"</item>
     <item msgid="2630618799033509548">"Codul PIN de la disp. pereche"</item>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 8bdff7d87a2..6b46b008033 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -53,14 +53,14 @@
     <!-- no translation found for dark_ui_scheduler_preference_titles:2 (8842756744447000897) -->
   <string-array name="lock_after_timeout_entries">
     <item msgid="2223808927866488981">"Сразу"</item>
-    <item msgid="463591454172790676">"Через 5 сек."</item>
-    <item msgid="6981910499530067289">"Через 15 сек."</item>
-    <item msgid="841968393904987343">"Через 30 сек."</item>
-    <item msgid="8209996803755081758">"Через 1 мин."</item>
-    <item msgid="8532038695054819775">"Через 2 мин."</item>
-    <item msgid="230858078069711241">"Через 5 мин."</item>
-    <item msgid="7289395602286160723">"Через 10 мин."</item>
-    <item msgid="3142577549730704595">"Через 30 мин."</item>
+    <item msgid="463591454172790676">"Через 5 секунд"</item>
+    <item msgid="6981910499530067289">"Через 15 секунд"</item>
+    <item msgid="841968393904987343">"Через 30 секунд"</item>
+    <item msgid="8209996803755081758">"Через 1 минуту"</item>
+    <item msgid="8532038695054819775">"Через 2 минуты"</item>
+    <item msgid="230858078069711241">"Через 5 минут"</item>
+    <item msgid="7289395602286160723">"Через 10 минут"</item>
+    <item msgid="3142577549730704595">"Через 30 минут"</item>
   </string-array>
   <string-array name="entries_font_size">
     <item msgid="4649244712522775149">"Мелкий"</item>
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Не проверять"</item>
+    <item msgid="5703177653586269306">"Запрашивать статус сертификата"</item>
+    <item msgid="326388247868439528">"Требовать статус сертификата"</item>
+    <item msgid="1090956283885790552">"Требовать статусы всех ненадежных сертификатов"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Push-кнопка"</item>
     <item msgid="2630618799033509548">"PIN-код с обнаруженного устройства"</item>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index 604b96590b3..cbe4f30435e 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"සත්‍යාපනය නොකරන්න"</item>
+    <item msgid="5703177653586269306">"සහතික තත්ත්වය ඉල්ලන්න"</item>
+    <item msgid="326388247868439528">"සහතික තත්ත්වය අවශ්‍යයි"</item>
+    <item msgid="1090956283885790552">"සියලු විශ්වාසදායි නොවන සහතික තත්ත්ව අවශ්‍යයි"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"ඔබන බොත්තම"</item>
     <item msgid="2630618799033509548">"සමයන්ගේ උපාංග වෙතින් PIN"</item>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index c70efd432f6..fc32d47c0a7 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Neoverovať"</item>
+    <item msgid="5703177653586269306">"Požiadať o stav certifikátu"</item>
+    <item msgid="326388247868439528">"Vyžadovať stav certifikátu"</item>
+    <item msgid="1090956283885790552">"Vyžadovať stavy všetkých nedôveryhodných certifikátov"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Stlačenie tlačidla"</item>
     <item msgid="2630618799033509548">"PIN zo zdieľaného zariadenia"</item>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 26667484f88..608206e27c5 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Brez preverjanja"</item>
+    <item msgid="5703177653586269306">"Zahtevaj stanje potrdila"</item>
+    <item msgid="326388247868439528">"Obvezno stanje potrdila"</item>
+    <item msgid="1090956283885790552">"Obvezna vsa stanja potrdil, ki niso zaupanja vredna"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Pritisnite gumb"</item>
     <item msgid="2630618799033509548">"PIN iz enakovredne naprave"</item>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index 74888771f4a..48460715e0a 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Mos e verifiko"</item>
+    <item msgid="5703177653586269306">"Kërko statusin e certifikatës"</item>
+    <item msgid="326388247868439528">"Kërko detyrimisht statusin e certifikatës"</item>
+    <item msgid="1090956283885790552">"Kërko detyrimisht të gjitha statutet e certifikatave të pacertifikuara"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Shtyp butonin"</item>
     <item msgid="2630618799033509548">"Kodi PIN nga pajisja homologe"</item>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index b522928c54a..5dbf56b390e 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Не верификуј"</item>
+    <item msgid="5703177653586269306">"Затражи статус сертификата"</item>
+    <item msgid="326388247868439528">"Захтевај статус сертификата"</item>
+    <item msgid="1090956283885790552">"Захтевај статусе свих непоузданих сертификата"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Притискање дугмета"</item>
     <item msgid="2630618799033509548">"PIN са равноправног уређаја"</item>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 85f3f14a1ad..9d8d1c53f80 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Verifiera inte"</item>
+    <item msgid="5703177653586269306">"Begär certifikatstatus"</item>
+    <item msgid="326388247868439528">"Kräv certifikatstatus"</item>
+    <item msgid="1090956283885790552">"Kräv status för alla icke-betrodda certifikat"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Tryckknapp"</item>
     <item msgid="2630618799033509548">"PIN-kod från den andra enheten"</item>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 331b5fd6cad..0b28c9fbe76 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Usithibitishe"</item>
+    <item msgid="5703177653586269306">"Omba hali ya cheti"</item>
+    <item msgid="326388247868439528">"Onyesha hali ya cheti"</item>
+    <item msgid="1090956283885790552">"Onyesha hali za vyeti vyote visivyo vya kuaminika"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Kichupo cha kusukuma"</item>
     <item msgid="2630618799033509548">"PIN kutoka kwa kifaa cha rika"</item>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index c8cb5da04f4..e737c9a0ecd 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"சரிபார்க்க வேண்டாம்"</item>
+    <item msgid="5703177653586269306">"சான்றிதழ் கோரிக்கை நிலை"</item>
+    <item msgid="326388247868439528">"சான்றிதழ் தேவை நிலை"</item>
+    <item msgid="1090956283885790552">"அனைத்து நம்பகத்தன்மை இல்லாத சான்றிதழ்களுக்கான தேவை நிலைகள்"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"புஷ் பட்டன்"</item>
     <item msgid="2630618799033509548">"பியர் சாதனத்திலிருந்து பின்"</item>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 7b25b813501..3434c292820 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"ไม่ต้องยืนยัน"</item>
+    <item msgid="5703177653586269306">"ขอสถานะใบรับรอง"</item>
+    <item msgid="326388247868439528">"ต้องมีสถานะใบรับรอง"</item>
+    <item msgid="1090956283885790552">"ต้องมีสถานะใบรับรองที่ไม่ใช่ \"เชื่อถือได้\" ทุกสถานะ"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"ปุ่มกด"</item>
     <item msgid="2630618799033509548">"PIN จากอุปกรณ์เพียร์"</item>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 38548009dc8..29bcc697e79 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Huwag i-verify"</item>
+    <item msgid="5703177653586269306">"Hilingin ang status ng certificate"</item>
+    <item msgid="326388247868439528">"Hingin ang status ng certificate"</item>
+    <item msgid="1090956283885790552">"Hingin ang lahat ng status ng hindi pinagkakatiwalaang certificate"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"button na Push"</item>
     <item msgid="2630618799033509548">"PIN mula sa device ng kaibigan"</item>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 6cdeaebe8f2..1ef519606ca 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Doğrulama"</item>
+    <item msgid="5703177653586269306">"Sertifika durumunu iste"</item>
+    <item msgid="326388247868439528">"Sertifika durumunu gerektir"</item>
+    <item msgid="1090956283885790552">"Tüm güvenilmeyen sertifika durumlarını gerektir"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Düğme"</item>
     <item msgid="2630618799033509548">"Eş cihazın PIN\'i"</item>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index e87a2951552..60f659b711d 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Не перевіряти"</item>
+    <item msgid="5703177653586269306">"Запит статусу сертифіката"</item>
+    <item msgid="326388247868439528">"Потрібен статус сертифіката"</item>
+    <item msgid="1090956283885790552">"Потрібні статуси всіх несхвалених сертифікатів"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Кнопка Push"</item>
     <item msgid="2630618799033509548">"PIN з однорангового пристрою"</item>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index 9cea63b59e2..9ff889bd3f0 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Tekshirilmasin"</item>
+    <item msgid="5703177653586269306">"Sertifikat holatini talab qilish"</item>
+    <item msgid="326388247868439528">"Sertifikat holatini talab qilish"</item>
+    <item msgid="1090956283885790552">"Barcha ishonchsiz sertifikat holatlarini talab qilish"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Bog‘lash tugmasi"</item>
     <item msgid="2630618799033509548">"ulashma qurilmadagi PIN-kod"</item>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 460f0abe54d..dba8acb1b7c 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Không xác minh"</item>
+    <item msgid="5703177653586269306">"Yêu cầu trạng thái chứng chỉ"</item>
+    <item msgid="326388247868439528">"Cần có trạng thái chứng chỉ"</item>
+    <item msgid="1090956283885790552">"Cần có tất cả trạng thái chứng chỉ không đáng tin cậy"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Nút bấm"</item>
     <item msgid="2630618799033509548">"Mã PIN từ thiết bị ngang hàng"</item>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 23ea7c175a5..2241ba6f810 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"不要验证"</item>
+    <item msgid="5703177653586269306">"要求证书状态（非强制）"</item>
+    <item msgid="326388247868439528">"需要证书状态"</item>
+    <item msgid="1090956283885790552">"需要所有非信任证书的状态"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"按钮"</item>
     <item msgid="2630618799033509548">"从对等设备获取的 PIN 码"</item>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index a0bc67e34ea..9875625ecc5 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"不要驗證"</item>
+    <item msgid="5703177653586269306">"要求憑證狀態"</item>
+    <item msgid="326388247868439528">"需要憑證狀態"</item>
+    <item msgid="1090956283885790552">"需要所有不受信任的憑證狀態"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"按鈕"</item>
     <item msgid="2630618799033509548">"來自對端裝置的 PIN"</item>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 4804f6423bf..6fa22194924 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"不要驗證"</item>
+    <item msgid="5703177653586269306">"要求取得憑證狀態"</item>
+    <item msgid="326388247868439528">"需要取得憑證狀態"</item>
+    <item msgid="1090956283885790552">"需要取得所有非信任憑證的狀態"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"按鈕"</item>
     <item msgid="2630618799033509548">"來自對端裝置的 PIN"</item>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 1c2c690237c..1091a6b8e89 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -100,7 +100,12 @@
     <!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
-    <!-- no translation found for eap_ocsp_type:0 (8568170800958331461) -->
+  <string-array name="eap_ocsp_type">
+    <item msgid="8568170800958331461">"Ungaqinisekisi"</item>
+    <item msgid="5703177653586269306">"Cela isimo sesitifiketi"</item>
+    <item msgid="326388247868439528">"Kudinga isimo sesitifiketi"</item>
+    <item msgid="1090956283885790552">"Kudinga zonke izimo zesitifiketi ezingathembeki"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="1446717102923442720">"Cindezela inkinobho"</item>
     <item msgid="2630618799033509548">"Iphinikhodi kusuka kudivaysisi yabangani"</item>