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

Commit f8500d9f authored by Jason Hsu's avatar Jason Hsu Committed by Automerger Merge Worker
Browse files

Merge "Change to use ComponentName instead of String in log." into rvc-dev am: 7af9c771 

Change-Id: I155a13af01fa103d8600199ab329768f84820b7f
parents 6544d4b4 7af9c771

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

+6 −7
Original line number Diff line number Diff line
@@ -29,16 +29,15 @@ public final class AccessibilityStatsLogUtils { 
     * 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 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;

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ public class LaunchAccessibilityActivityPreferenceFragment extends 


    @Override

    protected void onPreferenceToggled(String preferenceKey, boolean enabled) {

        logServiceStatus(mComponentName.flattenToString(), enabled);

        logAccessibilityServiceEnabled(mComponentName, enabled);

        launchShortcutTargetActivity(getPrefContext().getDisplayId(), mComponentName);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ public class ToggleAccessibilityServicePreferenceFragment extends 
    @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);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere 


    @Override

    protected void onPreferenceToggled(String preferenceKey, boolean enabled) {

        logServiceStatus(mComponentName.flattenToString(), enabled);

        logAccessibilityServiceEnabled(mComponentName, enabled);

        Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? ON : OFF);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe 


    @Override

    protected void onPreferenceToggled(String preferenceKey, boolean enabled) {

        logServiceStatus(mComponentName.flattenToString(), enabled);

        logAccessibilityServiceEnabled(mComponentName, enabled);

        Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? ON : OFF);

    }