From 16d58e78df3cc4f2cd3002470298b2655b3a4254 Mon Sep 17 00:00:00 2001 From: Anna Galusza Date: Tue, 22 Mar 2016 13:07:44 -0700 Subject: [PATCH] Add Tron Logging to portion of A11y SUW that lives in Settings. Bug: 27777706 Change-Id: I0c0f0f1c30ba5b1d40bc4e74faadacbdb93dbc51 --- proguard.flags | 4 +- .../accessibility_settings_for_setup_wizard.xml | 8 ++-- .../AccessibilitySettingsForSetupWizard.java | 4 +- .../FontSizePreferenceFragmentForSetupWizard.java | 40 +++++++++++++++++ ...nificationPreferenceFragmentForSetupWizard.java | 51 ++++++++++++++++++++++ ...reenReaderPreferenceFragmentForSetupWizard.java | 51 ++++++++++++++++++++++ .../settings/display/ScreenZoomPreference.java | 4 +- ...ScreenZoomPreferenceFragmentForSetupWizard.java | 41 +++++++++++++++++ 8 files changed, 196 insertions(+), 7 deletions(-) create mode 100644 src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java create mode 100644 src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java create mode 100644 src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java create mode 100644 src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java diff --git a/proguard.flags b/proguard.flags index 2b5d4fa42f..3c3300e806 100644 --- a/proguard.flags +++ b/proguard.flags @@ -17,6 +17,8 @@ -keep class com.android.settings.users.* -keep class com.android.settings.nfc.* -keep class com.android.settings.notification.* +-keep class com.android.settings.accessibility.*FragmentForSetupWizard +-keep class com.android.settings.display.*FragmentForSetupWizard # Keep click responders -keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity { @@ -25,4 +27,4 @@ -keep public class * extends com.android.setupwizardlib.items.ItemHierarchy { public (android.content.Context, android.util.AttributeSet); -} \ No newline at end of file +} diff --git a/res/xml/accessibility_settings_for_setup_wizard.xml b/res/xml/accessibility_settings_for_setup_wizard.xml index 5d83590e90..c938f240cd 100644 --- a/res/xml/accessibility_settings_for_setup_wizard.xml +++ b/res/xml/accessibility_settings_for_setup_wizard.xml @@ -26,25 +26,27 @@ diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java index 12e58c468e..f21e467fed 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java @@ -27,7 +27,7 @@ import android.support.v7.preference.Preference; import android.text.TextUtils; import android.view.accessibility.AccessibilityManager; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.DialogCreatable; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -54,7 +54,7 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm @Override protected int getMetricsCategory() { - return MetricsProto.MetricsEvent.ACCESSIBILITY; + return MetricsEvent.SUW_ACCESSIBILITY; } @Override diff --git a/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java new file mode 100644 index 0000000000..6e906774fe --- /dev/null +++ b/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.accessibility; + +import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; + +public class FontSizePreferenceFragmentForSetupWizard + extends ToggleFontSizePreferenceFragment { + + @Override + protected int getMetricsCategory() { + return MetricsEvent.SUW_ACCESSIBILITY_FONT_SIZE; + } + + @Override + public void onStop() { + // Log the final choice in value if it's different from the previous value. + if (mCurrentIndex != mInitialIndex) { + MetricsLogger.action(getContext(), MetricsEvent.SUW_ACCESSIBILITY_FONT_SIZE, + mCurrentIndex); + } + + super.onStop(); + } +} diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java new file mode 100644 index 0000000000..135a78fa78 --- /dev/null +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.accessibility; + +import android.os.Bundle; + +import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; + +public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard + extends ToggleScreenMagnificationPreferenceFragment { + + private boolean mToggleSwitchWasInitiallyChecked; + + @Override + protected void onProcessArguments(Bundle arguments) { + super.onProcessArguments(arguments); + mToggleSwitchWasInitiallyChecked = mToggleSwitch.isChecked(); + } + + @Override + protected int getMetricsCategory() { + return MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION; + } + + @Override + public void onStop() { + // Log the final choice in value if it's different from the previous value. + if (mToggleSwitch.isChecked() != mToggleSwitchWasInitiallyChecked) { + MetricsLogger.action(getContext(), + MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION, + mToggleSwitch.isChecked()); + } + + super.onStop(); + } +} diff --git a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java new file mode 100644 index 0000000000..05e48d3837 --- /dev/null +++ b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.accessibility; + +import android.os.Bundle; + +import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; + +public class ToggleScreenReaderPreferenceFragmentForSetupWizard + extends ToggleAccessibilityServicePreferenceFragment { + + private boolean mToggleSwitchWasInitiallyChecked; + + @Override + protected void onProcessArguments(Bundle arguments) { + super.onProcessArguments(arguments); + mToggleSwitchWasInitiallyChecked = mToggleSwitch.isChecked(); + } + + @Override + protected int getMetricsCategory() { + return MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER; + } + + @Override + public void onStop() { + // Log the final choice in value if it's different from the previous value. + if (mToggleSwitch.isChecked() != mToggleSwitchWasInitiallyChecked) { + MetricsLogger.action(getContext(), + MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER, mToggleSwitch.isChecked()); + } + + super.onStop(); + } +} + diff --git a/src/com/android/settings/display/ScreenZoomPreference.java b/src/com/android/settings/display/ScreenZoomPreference.java index 2afc3c3f1d..ee2ac954d9 100644 --- a/src/com/android/settings/display/ScreenZoomPreference.java +++ b/src/com/android/settings/display/ScreenZoomPreference.java @@ -34,7 +34,9 @@ public class ScreenZoomPreference extends PreferenceGroup { android.support.v7.preference.R.attr.preferenceScreenStyle, android.R.attr.preferenceScreenStyle)); - setFragment("com.android.settings.display.ScreenZoomSettings"); + if (TextUtils.isEmpty(getFragment())) { + setFragment("com.android.settings.display.ScreenZoomSettings"); + } final DisplayDensityUtils density = new DisplayDensityUtils(context); final int defaultIndex = density.getCurrentIndex(); diff --git a/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java b/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java new file mode 100644 index 0000000000..8892f4dedc --- /dev/null +++ b/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.display; + +import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; + +public class ScreenZoomPreferenceFragmentForSetupWizard + extends ScreenZoomSettings { + + @Override + protected int getMetricsCategory() { + return MetricsEvent.SUW_ACCESSIBILITY_DISPLAY_SIZE; + } + + @Override + public void onStop() { + // Log the final choice in value if it's different from the previous value. + if (mCurrentIndex != mInitialIndex) { + MetricsLogger.action(getContext(), MetricsEvent.SUW_ACCESSIBILITY_DISPLAY_SIZE, + mCurrentIndex); + } + + super.onStop(); + } +} + -- 2.11.0