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

Merge "Update landscape volume design to match the new portrait design." into sc-dev am: 04b48353d7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14441668

Change-Id: Iad0be88ba13faa055cd3514bc17806d55deb5dfb
This commit is contained in:
Josh Tsuji
2021-05-25 17:25:18 +00:00
committed by Automerger Merge Worker
parent 250357c1d5 04b48353d7
commit 032bd4df6f
3 changed files with 66 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
packages/SystemUI/res/layout-land/volume_dialog.xml
View File

@@ -16,6 +16,7 @@
<FrameLayout <FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:sysui="http://schemas.android.com/apk/res-auto" xmlns:sysui="http://schemas.android.com/apk/res-auto"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:id="@+id/volume_dialog_container" android:id="@+id/volume_dialog_container"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -24,64 +25,29 @@
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:theme="@style/volume_dialog_theme"> android:theme="@style/volume_dialog_theme">
<FrameLayout <!-- right-aligned to be physically near volume button -->
<LinearLayout
android:id="@+id/volume_dialog" android:id="@+id/volume_dialog"
android:minWidth="@dimen/volume_dialog_panel_width"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right" android:gravity="right"
android:layout_gravity="right" android:layout_gravity="right"
android:background="@android:color/transparent" android:layout_marginRight="@dimen/volume_dialog_panel_transparent_padding_right"
android:paddingRight="@dimen/volume_dialog_stream_padding" android:orientation="vertical"
android:paddingLeft="@dimen/volume_dialog_panel_transparent_padding" android:clipToPadding="false"
android:clipToPadding="false"> android:clipChildren="false">
<!--
Container for a) the ringer drawer and the caption button next to b) the volume rows.
-->
<LinearLayout <LinearLayout
android:id="@+id/volume_dialog_ringer_and_rows_container"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="vertical"
android:padding="7dp"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false"> android:background="@drawable/volume_background">
<!-- The ringer drawer and the caption button. --> <include layout="@layout/volume_ringer_drawer" />
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingRight="@dimen/volume_dialog_stream_padding"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical">
<include layout="@layout/volume_ringer_drawer"
android:layout_gravity="top|right"/>
<FrameLayout
android:id="@+id/odi_captions"
android:layout_width="@dimen/volume_dialog_caption_size"
android:layout_height="@dimen/volume_dialog_caption_size"
android:gravity="center"
android:layout_gravity="bottom|right"
android:layout_marginBottom="@dimen/volume_dialog_tap_target_size"
android:clipToPadding="false">
<com.android.systemui.volume.CaptionsToggleImageButton
android:id="@+id/odi_captions_icon"
android:src="@drawable/ic_volume_odi_captions_disabled"
style="@style/VolumeButtons"
android:background="@drawable/rounded_ripple"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:tint="@color/caption_tint_color_selector"
android:layout_gravity="center"
android:soundEffectsEnabled="false"
sysui:optedOut="false"/>
</FrameLayout>
</FrameLayout>
<FrameLayout <FrameLayout
android:visibility="gone" android:visibility="gone"
@@ -102,34 +68,33 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:padding="@dimen/volume_dialog_ringer_icon_padding" android:padding="@dimen/volume_dialog_ringer_icon_padding"
android:tint="@color/accent_tint_color_selector" android:tint="?android:attr/textColorPrimary"
android:layout_gravity="center" android:layout_gravity="center"
android:soundEffectsEnabled="false" /> android:soundEffectsEnabled="false" />
<include layout="@layout/volume_dnd_icon" <include layout="@layout/volume_dnd_icon"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/volume_dialog_stream_padding" android:layout_marginRight="@dimen/volume_dialog_stream_padding"
android:layout_marginTop="6dp"/> android:layout_marginTop="6dp"/>
</FrameLayout> </FrameLayout>
<LinearLayout <LinearLayout
android:id="@+id/main" android:id="@+id/main"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:minWidth="@dimen/volume_dialog_panel_width"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right" android:gravity="right"
android:layout_gravity="right" android:layout_gravity="right"
android:orientation="vertical" android:orientation="vertical"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false"> android:clipToPadding="false" >
<LinearLayout <LinearLayout
android:id="@+id/volume_dialog_rows" android:id="@+id/volume_dialog_rows"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minWidth="@dimen/volume_dialog_panel_width"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal"
android:layout_marginTop="@dimen/volume_row_slider_padding_start">
<!-- volume rows added and removed here! :-) --> <!-- volume rows added and removed here! :-) -->
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
@@ -144,23 +109,41 @@
android:layout_gravity="center" android:layout_gravity="center"
android:contentDescription="@string/accessibility_volume_settings" android:contentDescription="@string/accessibility_volume_settings"
android:background="@drawable/ripple_drawable_20dp" android:background="@drawable/ripple_drawable_20dp"
android:tint="?android:attr/colorBackgroundFloating" android:tint="?androidprv:attr/colorAccent"
android:soundEffectsEnabled="false" /> android:soundEffectsEnabled="false" />
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<ViewStub <FrameLayout
android:id="@+id/odi_captions_tooltip_stub" android:id="@+id/odi_captions"
android:inflatedId="@+id/odi_captions_tooltip_view" android:layout_width="@dimen/volume_dialog_caption_size"
android:layout="@layout/volume_tool_tip_view" android:layout_height="@dimen/volume_dialog_caption_size"
android:layout_width="wrap_content" android:layout_marginTop="@dimen/volume_dialog_row_margin_bottom"
android:layout_height="wrap_content" android:gravity="right"
android:layout_marginRight="@dimen/volume_tool_tip_right_margin" android:layout_gravity="right"
android:layout_marginTop="@dimen/volume_tool_tip_top_margin" android:clipToPadding="false"
android:layout_gravity="right"/> android:background="@drawable/volume_background">
<com.android.systemui.volume.CaptionsToggleImageButton
android:id="@+id/odi_captions_icon"
android:src="@drawable/ic_volume_odi_captions_disabled"
style="@style/VolumeButtons"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:tint="?android:attr/colorAccent"
android:layout_gravity="center"
android:soundEffectsEnabled="false"
sysui:optedOut="false"/>
</FrameLayout>
</LinearLayout>
</FrameLayout> <ViewStub
android:id="@+id/odi_captions_tooltip_stub"
android:inflatedId="@+id/odi_captions_tooltip_view"
android:layout="@layout/volume_tool_tip_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom | right"/>
</FrameLayout> </FrameLayout>

1
packages/SystemUI/res/values-land/dimens.xml
View File

@@ -45,6 +45,7 @@
<dimen name="volume_tool_tip_right_margin">136dp</dimen> <dimen name="volume_tool_tip_right_margin">136dp</dimen>
<dimen name="volume_tool_tip_top_margin">12dp</dimen> <dimen name="volume_tool_tip_top_margin">12dp</dimen>
<dimen name="volume_row_slider_height">128dp</dimen>
<dimen name="controls_activity_view_top_offset">25dp</dimen> <dimen name="controls_activity_view_top_offset">25dp</dimen>

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

@@ -1752,7 +1752,21 @@ public class VolumeDialogImpl implements VolumeDialog,
} }
final Rect bounds = mRingerAndRowsContainerBackground.copyBounds(); final Rect bounds = mRingerAndRowsContainerBackground.copyBounds();
bounds.top = (int) (drawerClosedAmount * getRingerDrawerOpenExtraSize());
if (!isLandscape()) {
// In portrait, the background should fill the full width, but only go up to the ringer
// icon's top. We'll extend it all the way to the top of the container when the ringer
// drawer opens.
bounds.left = 0;
bounds.top = (int) (drawerClosedAmount * getRingerDrawerOpenExtraSize());
} else {
// In landscape, the background should be inset by the size of the open drawer, since it
// opens sideways. It should extend to the top of the container since we haven't left
// space for the drawer to open upward.
bounds.left = getRingerDrawerOpenExtraSize();
bounds.top = 0;
}
mRingerAndRowsContainerBackground.setBounds(bounds); mRingerAndRowsContainerBackground.setBounds(bounds);
} }