Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Slide in volume rocker in natural rotation only." into sc-v2-dev

Browse Source
This commit is contained in:
Jamie Garside
2021-06-21 12:22:09 +00:00
committed by Android (Google) Code Review
parent 89cf7e02fb 7949265bf4
commit 44dc1633d6
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
View File

@@ -104,6 +104,7 @@ import android.widget.Toast;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.android.internal.graphics.drawable.BackgroundBlurDrawable; import com.android.internal.graphics.drawable.BackgroundBlurDrawable;
import com.android.internal.view.RotationPolicy;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.systemui.Dependency; import com.android.systemui.Dependency;
import com.android.systemui.Prefs; import com.android.systemui.Prefs;
@@ -400,7 +401,9 @@ public class VolumeDialogImpl implements VolumeDialog,
mDialog.setCanceledOnTouchOutside(true); mDialog.setCanceledOnTouchOutside(true);
mDialog.setOnShowListener(dialog -> { mDialog.setOnShowListener(dialog -> {
mDialogView.getViewTreeObserver().addOnComputeInternalInsetsListener(this); mDialogView.getViewTreeObserver().addOnComputeInternalInsetsListener(this);
if (!isLandscape()) mDialogView.setTranslationX(mDialogView.getWidth() / 2.0f); if (!shouldSlideInVolumeTray()) {
mDialogView.setTranslationX(mDialogView.getWidth() / 2.0f);
}
mDialogView.setAlpha(0); mDialogView.setAlpha(0);
mDialogView.animate() mDialogView.animate()
.alpha(1) .alpha(1)
@@ -587,6 +590,10 @@ public class VolumeDialogImpl implements VolumeDialog,
return (int) (alpha * 255); return (int) (alpha * 255);
} }
private boolean shouldSlideInVolumeTray() {
return mContext.getDisplay().getRotation() != RotationPolicy.NATURAL_ROTATION;
}
private boolean isLandscape() { private boolean isLandscape() {
return mContext.getResources().getConfiguration().orientation == return mContext.getResources().getConfiguration().orientation ==
Configuration.ORIENTATION_LANDSCAPE; Configuration.ORIENTATION_LANDSCAPE;
@@ -1315,7 +1322,7 @@ public class VolumeDialogImpl implements VolumeDialog,
hideRingerDrawer(); hideRingerDrawer();
}, 50)); }, 50));
if (!isLandscape()) animator.translationX(mDialogView.getWidth() / 2.0f); if (!shouldSlideInVolumeTray()) animator.translationX(mDialogView.getWidth() / 2.0f);
animator.start(); animator.start();
checkODICaptionsTooltip(true); checkODICaptionsTooltip(true);
mController.notifyVisible(false); mController.notifyVisible(false);