Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: 976b3690fe am: 70f0c6a53f am: 8a009ac35d

Change-Id: If31a5ac9df256919696df72de5452e68b914deb3

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

@@ -20,9 +20,6 @@ import android.content.Context;
 import android.os.UserHandle;
 import android.provider.Settings;
 
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
 import com.android.settings.core.TogglePreferenceController;
 
 /** Controller that shows the magnification enable mode summary. */

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

@@ -54,6 +54,7 @@ public class MagnificationGesturesPreferenceController extends TogglePreferenceC
             populateMagnificationGesturesPreferenceExtras(extras, mContext);
             extras.putBoolean(AccessibilitySettings.EXTRA_CHECKED, isChecked());
             extras.putBoolean(AccessibilitySettings.EXTRA_LAUNCHED_FROM_SUW, mIsFromSUW);
+            return true;
         }
         return false;
     }

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

@@ -59,6 +59,7 @@ public class MagnificationNavbarPreferenceController extends TogglePreferenceCon
                     mContext.getText(R.string.accessibility_screen_magnification_navbar_summary));
             extras.putBoolean(AccessibilitySettings.EXTRA_CHECKED, isChecked());
             extras.putBoolean(AccessibilitySettings.EXTRA_LAUNCHED_FROM_SUW, mIsFromSUW);
+            return true;
         }
         return false;
     }