Merge "Import translations. DO NOT MERGE" into rvc-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 66aa0b1..3684056 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2191,8 +2191,8 @@
<string name="wifi_connect">Connect</string>
<!-- Turned on notification for Wi-Fi [CHAR LIMIT=40] -->
<string name="wifi_turned_on_message">Wi\u2011Fi turned on</string>
- <!-- Connected to notification for Wi-Fi [CHAR LIMIT=NONE] -->
- <string name="wifi_connected_to_message">@string/bluetooth_connected_summary</string>
+ <!-- A notification for connected to a Wi-Fi network [CHAR LIMIT=NONE] -->
+ <string name="wifi_connected_to_message">Connected to <xliff:g id="network_name" example="MyNetwork">%1$s</xliff:g></string>
<!-- Button label to connecting progress to a Wi-Fi network [CHAR LIMIT=20] -->
<string name="wifi_connecting">Connecting\u2026</string>
<!-- Failured notification for connect -->
diff --git a/src/com/android/settings/accessibility/AccessibilityStatsLogUtils.java b/src/com/android/settings/accessibility/AccessibilityStatsLogUtils.java
index da889e9..d15988f 100644
--- a/src/com/android/settings/accessibility/AccessibilityStatsLogUtils.java
+++ b/src/com/android/settings/accessibility/AccessibilityStatsLogUtils.java
@@ -29,16 +29,15 @@
* Logs accessibility service name and its enabled status. Calls this when the user trigger
* the accessibility service to be enabled/disabled.
*
- * @param packageName the package name of the service. Need to be the flattened {@link
- * ComponentName}
- * @param enabled {@code true} if the service is enabled
+ * @param componentName component name of the service
+ * @param enabled {@code true} if the service is enabled
*/
- static void logServiceStatus(String packageName, boolean enabled) {
- SettingsStatsLog.write(SettingsStatsLog.ACCESSIBILITY_SERVICE_REPORTED, packageName,
- convertToLoggingServiceStatus(enabled));
+ static void logAccessibilityServiceEnabled(ComponentName componentName, boolean enabled) {
+ SettingsStatsLog.write(SettingsStatsLog.ACCESSIBILITY_SERVICE_REPORTED,
+ componentName.flattenToString(), convertToLoggingServiceEnabled(enabled));
}
- private static int convertToLoggingServiceStatus(boolean enabled) {
+ private static int convertToLoggingServiceEnabled(boolean enabled) {
return enabled ? SettingsStatsLog.ACCESSIBILITY_SERVICE_REPORTED__SERVICE_STATUS__ENABLED
: SettingsStatsLog.ACCESSIBILITY_SERVICE_REPORTED__SERVICE_STATUS__DISABLED;
}
diff --git a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
index 40955cf..6078cc1 100644
--- a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
@@ -16,7 +16,7 @@
package com.android.settings.accessibility;
-import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logServiceStatus;
+import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logAccessibilityServiceEnabled;
import android.accessibilityservice.AccessibilityShortcutInfo;
import android.app.ActivityOptions;
@@ -57,7 +57,7 @@
@Override
protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
- logServiceStatus(mComponentName.flattenToString(), enabled);
+ logAccessibilityServiceEnabled(mComponentName, enabled);
launchShortcutTargetActivity(getPrefContext().getDisplayId(), mComponentName);
}
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index d62ef29..05147a8 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -16,7 +16,7 @@
package com.android.settings.accessibility;
-import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logServiceStatus;
+import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logAccessibilityServiceEnabled;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.Activity;
@@ -101,7 +101,7 @@
@Override
public void onPreferenceToggled(String preferenceKey, boolean enabled) {
ComponentName toggledService = ComponentName.unflattenFromString(preferenceKey);
- logServiceStatus(toggledService.flattenToString(), enabled);
+ logAccessibilityServiceEnabled(toggledService, enabled);
AccessibilityUtils.setAccessibilityServiceState(getPrefContext(), toggledService, enabled);
}
diff --git a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
index 3799043..cae1b25 100644
--- a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
@@ -17,7 +17,7 @@
package com.android.settings.accessibility;
import static com.android.internal.accessibility.AccessibilityShortcutController.COLOR_INVERSION_COMPONENT_NAME;
-import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logServiceStatus;
+import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logAccessibilityServiceEnabled;
import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
@@ -52,7 +52,7 @@
@Override
protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
- logServiceStatus(mComponentName.flattenToString(), enabled);
+ logAccessibilityServiceEnabled(mComponentName, enabled);
Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? ON : OFF);
}
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 6b52c85..8a4b7f8 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -17,7 +17,7 @@
package com.android.settings.accessibility;
import static com.android.internal.accessibility.AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME;
-import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logServiceStatus;
+import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logAccessibilityServiceEnabled;
import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
@@ -168,7 +168,7 @@
@Override
protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
- logServiceStatus(mComponentName.flattenToString(), enabled);
+ logAccessibilityServiceEnabled(mComponentName, enabled);
Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? ON : OFF);
}