commit d3a7ec88a0fd9ee0cb918408b7483b5edab061db
author Menghan Li <menghanli@google.com> Thu Feb 24 21:22:18 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 24 21:22:18 2022 +0000
tree 6cff2f2adf12dad2a12745f191e8de499bb74cff
parent 4b6efee1a3a01425cb9a532a31938ea1075a1d0a
parent 3c24caf3570281ca3fbd424b8a56949b054c6d09

Merge "Refine A11y Tile Service javadoc" into tm-dev

src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java

diff --git a/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java b/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
index 2cdbb33..911e2fc 100644
--- a/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
@@ -222,7 +222,7 @@
                     new ComponentName(packageName, settingsClassName).flattenToString());
         }
 
-        final String tileServiceClassName = info.getTileServiceClassName();
+        final String tileServiceClassName = info.getTileServiceName();
         if (!TextUtils.isEmpty(tileServiceClassName)) {
             extras.putString(AccessibilitySettings.EXTRA_TILE_SERVICE_COMPONENT_NAME,
                     new ComponentName(packageName, tileServiceClassName).flattenToString());

src/com/android/settings/accessibility/AccessibilitySettings.java

diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 6539f32..680ddb7 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -576,7 +576,7 @@
                         serviceEnabled);
                 final String htmlDescription = info.loadHtmlDescription(mPm);
                 final String settingsClassName = info.getSettingsActivityName();
-                final String tileServiceClassName = info.getTileServiceClassName();
+                final String tileServiceClassName = info.getTileServiceName();
 
                 putBasicExtras(preference, prefKey, title, intro, description, imageRes,
                         htmlDescription, componentName);
@@ -637,7 +637,7 @@
                 final int imageRes = info.getAnimatedImageRes();
                 final String htmlDescription = info.loadHtmlDescription(mPm);
                 final String settingsClassName = info.getSettingsActivityName();
-                final String tileServiceClassName = info.getTileServiceClassName();
+                final String tileServiceClassName = info.getTileServiceName();
 
                 putBasicExtras(preference, prefKey, title, intro, description, imageRes,
                         htmlDescription, componentName);