Merge "Move content resolver call to constructor and cache" into ub-launcher3-rvc-dev

This commit is contained in:
TreeHugger Robot
2020-05-28 05:55:42 +00:00
committed by Android (Google) Code Review
3 changed files with 10 additions and 6 deletions
@@ -610,7 +610,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.PAUSE_NOT_DETECTED, "handleOrientationSetup.1");
}
if (!isFixedRotationTransformEnabled(this)) {
if (!isFixedRotationTransformEnabled()) {
return;
}
mDeviceState.enableMultipleRegions(baseInputConsumer instanceof OtherActivityInputConsumer);
@@ -178,7 +178,7 @@ public class RecentsAnimationDeviceState implements
}
private void setupOrientationSwipeHandler() {
if (!isFixedRotationTransformEnabled(mContext)) {
if (!isFixedRotationTransformEnabled()) {
return;
}
@@ -123,6 +123,9 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
private SysUINavigationMode.NavigationModeChangeListener mNavModeChangeListener =
newMode -> setFlag(FLAG_ROTATION_WATCHER_SUPPORTED, newMode != TWO_BUTTONS);
/** TODO: Remove once R ships. This is unlikely to change across different swipe gestures. */
private static boolean sFixedRotationEnabled;
private final Context mContext;
private final ContentResolver mContentResolver;
private final SharedPreferences mSharedPrefs;
@@ -165,7 +168,9 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
if (originalSmallestWidth < 600) {
mFlags |= FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_DENSITY;
}
if (isFixedRotationTransformEnabled(context)) {
sFixedRotationEnabled = Settings.Global.getInt(
context.getContentResolver(), FIXED_ROTATION_TRANSFORM_SETTING_NAME, 1) == 1;
if (sFixedRotationEnabled) {
mFlags |= FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_FLAG;
}
initFlags();
@@ -519,9 +524,8 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
* Returns true if system can keep Launcher fixed to portrait layout even if the
* foreground app is rotated
*/
public static boolean isFixedRotationTransformEnabled(Context context) {
return Settings.Global.getInt(
context.getContentResolver(), FIXED_ROTATION_TRANSFORM_SETTING_NAME, 1) == 1;
public static boolean isFixedRotationTransformEnabled() {
return sFixedRotationEnabled;
}
@NonNull