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

Commit 87433395 authored by Menghan Li's avatar Menghan Li Committed by Automerger Merge Worker
Browse files

Merge "Refine A11y Tile Service javadoc" into tm-dev am: d3a7ec88 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932278

Change-Id: I8c308d9cca65765de769dfde277376f05f9976b8
parents caa3d0c4 d3a7ec88

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

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment { 
                    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

+2 −2
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ public class AccessibilitySettings extends DashboardFragment { 
                        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 @@ public class AccessibilitySettings extends DashboardFragment { 
                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);