Merge "Add Tron Logging to portion of A11y SUW that lives in Settings. Bug: 27777706" into nyc-dev (da0e4d32) · Commits · e / os / android_packages_apps_Settings

proguard.flags

+3 −1

Original line number	Diff line number	Diff line
		@@ -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 {

res/xml/accessibility_settings_for_setup_wizard.xml

+5 −3

Original line number	Diff line number	Diff line
		@@ -26,25 +26,27 @@

		<Preference
		android:fragment=
		"com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"
		"com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragmentForSetupWizard"
		android:key="screen_magnification_preference"
		android:title="@string/accessibility_screen_magnification_title"
		android:summary="@string/accessibility_screen_magnification_short_summary" />

		<Preference
		android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"
		android:fragment=
		"com.android.settings.accessibility.FontSizePreferenceFragmentForSetupWizard"
		android:key="font_size_preference"
		android:title="@string/title_font_size"
		android:summary="@string/short_summary_font_size" />

		<com.android.settings.display.ScreenZoomPreference
		android:fragment="com.android.settings.display.ScreenZoomPreferenceFragmentForSetupWizard"
		android:key="force_density_preference"
		android:title="@string/screen_zoom_title"
		android:summary="@string/screen_zoom_short_summary" />

		<Preference
		android:fragment=
		"com.android.settings.accessibility.ToggleAccessibilityServicePreferenceFragment"
		"com.android.settings.accessibility.ToggleScreenReaderPreferenceFragmentForSetupWizard"
		android:key="screen_reader_preference"
		android:summary="@string/talkback_summary"
		android:persistent="true" />

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

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

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		/*
		* 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();
		}
		}

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

0 → 100644

+51 −0

Original line number	Diff line number	Diff line
		/*
		* 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();
		}
		}