PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Log metrics for pointer icon settings changes.

Browse Source 
Bug: 269100659
Test: PointerFillStylePreferenceControllerTest
Test: PointerStrokeStylePreferenceControllerTest
Test: PointerScaleSeekBarControllerTest
Flag: android.view.flags.enable_vector_cursor_a11y_settings
Change-Id: I5966abff27122269e59f20e63bd708b9739f4875
This commit is contained in:
Pat Manning
2024-07-19 14:58:16 +00:00
parent d133ec93ab
commit 15ed707dbc
6 changed files with 252 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/android/settings/inputmethod/PointerFillStylePreferenceController.java
View File

@@ -16,25 +16,39 @@
package com.android.settings.inputmethod;
import static android.view.PointerIcon.POINTER_ICON_VECTOR_STYLE_FILL_BLACK;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleEventObserver;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceDataStore;
import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
public class PointerFillStylePreferenceController extends BasePreferenceController {
public class PointerFillStylePreferenceController extends BasePreferenceController
implements LifecycleEventObserver {
private MetricsFeatureProvider mMetricsFeatureProvider;
@VisibleForTesting
static final String KEY_POINTER_FILL_STYLE = "pointer_fill_style";
public PointerFillStylePreferenceController(@NonNull Context context) {
super(context, KEY_POINTER_FILL_STYLE);
mMetricsFeatureProvider =
FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
}
@AvailabilityStatus
@@ -64,4 +78,17 @@ public class PointerFillStylePreferenceController extends BasePreferenceControll
}
});
}
@Override
public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,
@NonNull Lifecycle.Event event) {
if (event == Lifecycle.Event.ON_PAUSE) {
int currentValue =
Settings.System.getIntForUser(mContext.getContentResolver(),
Settings.System.POINTER_FILL_STYLE,
POINTER_ICON_VECTOR_STYLE_FILL_BLACK, UserHandle.USER_CURRENT);
mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_POINTER_ICON_FILL_STYLE_CHANGED, currentValue);
}
}
}

28
src/com/android/settings/inputmethod/PointerScaleSeekBarController.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.inputmethod;
import static android.view.PointerIcon.DEFAULT_POINTER_SCALE;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.res.Resources;
import android.os.UserHandle;
@@ -25,19 +26,27 @@ import android.provider.Settings;
import android.widget.SeekBar;
import androidx.annotation.NonNull;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleEventObserver;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.LabeledSeekBarPreference;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
public class PointerScaleSeekBarController extends BasePreferenceController {
public class PointerScaleSeekBarController extends BasePreferenceController
implements LifecycleEventObserver {
private final int mProgressMin;
private final int mProgressMax;
private final float mScaleMin;
private final float mScaleMax;
private MetricsFeatureProvider mMetricsFeatureProvider;
public PointerScaleSeekBarController(@NonNull Context context, @NonNull String key) {
super(context, key);
@@ -46,6 +55,9 @@ public class PointerScaleSeekBarController extends BasePreferenceController {
mProgressMax = res.getInteger(R.integer.pointer_scale_seek_bar_end);
mScaleMin = res.getFloat(R.dimen.pointer_scale_size_start);
mScaleMax = res.getFloat(R.dimen.pointer_scale_size_end);
mMetricsFeatureProvider =
FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
}
@AvailabilityStatus
@@ -92,4 +104,18 @@ public class PointerScaleSeekBarController extends BasePreferenceController {
(((scale - mScaleMin) * (mProgressMax - mProgressMin)) / (mScaleMax - mScaleMin))
+ mProgressMin);
}
@Override
public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,
@NonNull Lifecycle.Event event) {
if (event == Lifecycle.Event.ON_PAUSE) {
float currentValue =
Settings.System.getFloatForUser(mContext.getContentResolver(),
Settings.System.POINTER_SCALE, DEFAULT_POINTER_SCALE,
UserHandle.USER_CURRENT);
mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_POINTER_ICON_SCALE_CHANGED,
Float.toString(currentValue));
}
}
}

29
src/com/android/settings/inputmethod/PointerStrokeStylePreferenceController.java
View File

@@ -16,25 +16,39 @@
package com.android.settings.inputmethod;
import static android.view.PointerIcon.POINTER_ICON_VECTOR_STYLE_STROKE_WHITE;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleEventObserver;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceDataStore;
import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
public class PointerStrokeStylePreferenceController extends BasePreferenceController {
public class PointerStrokeStylePreferenceController extends BasePreferenceController
implements LifecycleEventObserver {
private MetricsFeatureProvider mMetricsFeatureProvider;
@VisibleForTesting
static final String KEY_POINTER_STROKE_STYLE = "pointer_stroke_style";
public PointerStrokeStylePreferenceController(@NonNull Context context) {
super(context, KEY_POINTER_STROKE_STYLE);
mMetricsFeatureProvider =
FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
}
@AvailabilityStatus
@@ -64,4 +78,17 @@ public class PointerStrokeStylePreferenceController extends BasePreferenceContro
}
});
}
@Override
public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,
@NonNull Lifecycle.Event event) {
if (event == Lifecycle.Event.ON_PAUSE) {
int currentValue =
Settings.System.getIntForUser(mContext.getContentResolver(),
Settings.System.POINTER_STROKE_STYLE,
POINTER_ICON_VECTOR_STYLE_STROKE_WHITE, UserHandle.USER_CURRENT);
mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_POINTER_ICON_STROKE_STYLE_CHANGED, currentValue);
}
}
}