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

Merge "Start logging rotation lock history + include caller information" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-09-26 09:43:48 +00:00
committed by Android (Google) Code Review
parent 00b04826e3 f09a5ce94c
commit 51e3fc3388
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/accessibility/LockScreenRotationPreferenceController.java
View File

@@ -54,7 +54,8 @@ public class LockScreenRotationPreferenceController extends TogglePreferenceCont
*/ */
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
RotationPolicy.setRotationLock(mContext, !isChecked); RotationPolicy.setRotationLock(mContext, !isChecked,
/* caller= */ "LockScreenRotationPreferenceController#setChecked");
return true; return true;
} }

3
src/com/android/settings/display/AutoRotatePreferenceController.java
View File

@@ -103,7 +103,8 @@ public class AutoRotatePreferenceController extends TogglePreferenceController i
final boolean isLocked = !isChecked; final boolean isLocked = !isChecked;
mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ROTATION_LOCK, mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ROTATION_LOCK,
isLocked); isLocked);
RotationPolicy.setRotationLock(mContext, isLocked); RotationPolicy.setRotationLock(mContext, isLocked,
/* caller= */ "AutoRotatePreferenceController#setChecked");
return true; return true;
} }
} }

3
src/com/android/settings/display/AutoRotateSwitchBarController.java
View File

@@ -82,7 +82,8 @@ public class AutoRotateSwitchBarController extends SettingsMainSwitchPreferenceC
final boolean isLocked = !isChecked; final boolean isLocked = !isChecked;
mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ROTATE_ROTATE_MASTER_TOGGLE, mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ROTATE_ROTATE_MASTER_TOGGLE,
isLocked); isLocked);
RotationPolicy.setRotationLock(mContext, isLocked); RotationPolicy.setRotationLock(mContext, isLocked,
/* caller= */ "AutoRotateSwitchBarController#setChecked");
return true; return true;
} }

3
src/com/android/settings/display/SmartAutoRotatePreferenceController.java
View File

@@ -169,7 +169,8 @@ public class SmartAutoRotatePreferenceController extends TogglePreferenceControl
final boolean isLocked = !isChecked; final boolean isLocked = !isChecked;
mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ROTATION_LOCK, mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ROTATION_LOCK,
isLocked); isLocked);
RotationPolicy.setRotationLock(mContext, isLocked); RotationPolicy.setRotationLock(mContext, isLocked,
/* caller= */ "SmartAutoRotatePreferenceController#setChecked");
return true; return true;
} }

5
tests/robotests/src/com/android/settings/testutils/shadow/ShadowRotationPolicy.java
View File

@@ -30,12 +30,13 @@ public class ShadowRotationPolicy {
private static boolean rotationSupported = true; private static boolean rotationSupported = true;
@Implementation @Implementation
protected static void setRotationLock(Context context, final boolean enabled) { protected static void setRotationLock(Context context, final boolean enabled, String caller) {
rotationLockEnabled = enabled; rotationLockEnabled = enabled;
} }
@Implementation @Implementation
protected static void setRotationLockForAccessibility(Context context, final boolean enabled) { protected static void setRotationLockForAccessibility(
Context context, final boolean enabled, String caller) {
rotationLockEnabled = enabled; rotationLockEnabled = enabled;
} }