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

Merge "Small refactor to allow more customization of AutoRotate settings in extending classes"

Browse Source
This commit is contained in:
Christian Göllner
2022-01-27 12:59:04 +00:00
committed by Android (Google) Code Review
parent 6d4870f996 e0169ec1fa
commit f1128f0c21
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.widget.OnMainSwitchChangeListener; import com.android.settingslib.widget.OnMainSwitchChangeListener;
/** /**
* The switch controller for the location. * The switch controller for auto-rotate.
*/ */
public class AutoRotateSwitchBarController implements OnMainSwitchChangeListener, public class AutoRotateSwitchBarController implements OnMainSwitchChangeListener,
LifecycleObserver, OnStart, OnStop { LifecycleObserver, OnStart, OnStop {

15
src/com/android/settings/display/SmartAutoRotateController.java
View File

@@ -63,7 +63,7 @@ public class SmartAutoRotateController extends TogglePreferenceController implem
updateState(mPreference); updateState(mPreference);
} }
}; };
private Preference mPreference; protected Preference mPreference;
private RotationPolicy.RotationPolicyListener mRotationPolicyListener; private RotationPolicy.RotationPolicyListener mRotationPolicyListener;
public SmartAutoRotateController(Context context, String preferenceKey) { public SmartAutoRotateController(Context context, String preferenceKey) {
@@ -84,10 +84,14 @@ public class SmartAutoRotateController extends TogglePreferenceController implem
if (!isRotationResolverServiceAvailable(mContext)) { if (!isRotationResolverServiceAvailable(mContext)) {
return UNSUPPORTED_ON_DEVICE; return UNSUPPORTED_ON_DEVICE;
} }
return !RotationPolicy.isRotationLocked(mContext) && hasSufficientPermission(mContext) return !isRotationLocked() && hasSufficientPermission(mContext)
&& !isCameraLocked() && !isPowerSaveMode() ? AVAILABLE : DISABLED_DEPENDENT_SETTING; && !isCameraLocked() && !isPowerSaveMode() ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
} }
protected boolean isRotationLocked() {
return RotationPolicy.isRotationLocked(mContext);
}
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
super.updateState(preference); super.updateState(preference);
@@ -136,7 +140,7 @@ public class SmartAutoRotateController extends TogglePreferenceController implem
@Override @Override
public boolean isChecked() { public boolean isChecked() {
return !RotationPolicy.isRotationLocked(mContext) && hasSufficientPermission(mContext) return !isRotationLocked() && hasSufficientPermission(mContext)
&& !isCameraLocked() && !isPowerSaveMode() && Settings.Secure.getInt( && !isCameraLocked() && !isPowerSaveMode() && Settings.Secure.getInt(
mContext.getContentResolver(), mContext.getContentResolver(),
CAMERA_AUTOROTATE, 0) == 1; CAMERA_AUTOROTATE, 0) == 1;
@@ -163,7 +167,10 @@ public class SmartAutoRotateController extends TogglePreferenceController implem
return R.string.menu_key_display; return R.string.menu_key_display;
} }
static boolean isRotationResolverServiceAvailable(Context context) { /**
* Returns true if there is a {@link RotationResolverService} available
*/
public static boolean isRotationResolverServiceAvailable(Context context) {
final PackageManager packageManager = context.getPackageManager(); final PackageManager packageManager = context.getPackageManager();
final String resolvePackage = packageManager.getRotationResolverPackageName(); final String resolvePackage = packageManager.getRotationResolverPackageName();
if (TextUtils.isEmpty(resolvePackage)) { if (TextUtils.isEmpty(resolvePackage)) {