Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SystemUI: Partially revert 718d6d6 #21

Open
wants to merge 1 commit into
base: fourteen
Choose a base branch
from
Open

SystemUI: Partially revert 718d6d6 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions packages/SystemUI/res/layout/super_notification_shade.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
android:layout_height="match_parent"
android:visibility="gone"
sysui:ignoreRightInset="true"
sysui:ignoreLeftInset="true"
>
<ImageView android:id="@+id/backdrop_back"
android:layout_width="match_parent"
Expand All @@ -51,7 +50,6 @@
android:layout_height="match_parent"
android:importantForAccessibility="no"
sysui:ignoreRightInset="true"
sysui:ignoreLeftInset="true"
/>

<com.android.systemui.scrim.ScrimView
Expand Down
4 changes: 2 additions & 2 deletions packages/SystemUI/res/values-land/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@

<dimen name="large_dialog_width">348dp</dimen>

<dimen name="qs_panel_padding_top">12dp</dimen>
<dimen name="qs_header_system_icons_area_height">12dp</dimen>
<dimen name="qs_panel_padding_top">0dp</dimen>
<dimen name="qs_header_system_icons_area_height">0dp</dimen>

<dimen name="controls_header_horizontal_padding">12dp</dimen>
<dimen name="controls_content_margin_horizontal">16dp</dimen>
Expand Down
2 changes: 1 addition & 1 deletion packages/SystemUI/res/values-sw600dp-land/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,5 @@
when media is not showing. -->
<dimen name="lockscreen_shade_keyguard_transition_vertical_offset">83dp</dimen>

<dimen name="notification_panel_margin_horizontal">0dp</dimen>
<dimen name="notification_panel_margin_horizontal">24dp</dimen>
</resources>
1 change: 0 additions & 1 deletion packages/SystemUI/res/values/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@

<declare-styleable name="StatusBarWindowView_Layout">
<attr name="ignoreRightInset" format="boolean" />
<attr name="ignoreLeftInset" format="boolean" />
</declare-styleable>

<declare-styleable name="AnimatedImageView">
Expand Down
18 changes: 4 additions & 14 deletions packages/SystemUI/src/com/android/systemui/scene/ui/view/WindowRootView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,11 @@ open class WindowRootView(
if (child.layoutParams is LayoutParams) {
val layoutParams = child.layoutParams as LayoutParams
if (
(layoutParams.rightMargin != rightInset ||
layoutParams.leftMargin != leftInset)
!layoutParams.ignoreRightInset &&
(layoutParams.rightMargin != rightInset ||
layoutParams.leftMargin != leftInset)
) {
val leftMargin = if (layoutParams.ignoreLeftInset) 0 else leftInset
val rightMargin = if (
!layoutParams.ignoreRightInset ||
(layoutParams.ignoreLeftInset && layoutParams.rightMargin == 0)
) rightInset else 0
layoutParams.updateMargins(left = leftMargin, right = rightMargin)
layoutParams.updateMargins(left = leftInset, right = rightInset)
child.requestLayout()
}
}
Expand Down Expand Up @@ -138,7 +134,6 @@ open class WindowRootView(

private class LayoutParams : FrameLayout.LayoutParams {
var ignoreRightInset = false
var ignoreLeftInset = false

constructor(
width: Int,
Expand All @@ -163,11 +158,6 @@ open class WindowRootView(
R.styleable.StatusBarWindowView_Layout_ignoreRightInset,
false
)
ignoreLeftInset =
obtainedAttributes.getBoolean(
R.styleable.StatusBarWindowView_Layout_ignoreLeftInset,
false
)
obtainedAttributes.recycle()
}
}
Expand Down