f88d8082a8
- New VolumeDialog (presentation) + VolumeDialogController (state) to implement a volume dialog that keeps track of multiple audio streams, including all remote streams. - The dialog starts out with a single stream, with more detail available behind an expand chevron. - Existing zen options reorganized under a master switch bar named "Block interruptions", with "None" renamed to "No interruptions" and "Priority" renamed to "Priority only". - Combined "Block interruptions" icon replaces the now-obsolete star/no-smoking icons in the status bar. - New icons for all sliders. - All sliders present a continuous facade, mapped to discrete integer units under the hood. - All interesting volume events and state changes piped through one central helper for future routing. - VolumePanel is obsolete, still accessible via a sysprop if needed. Complete removal / garbage collection deferred until all needed functionality is ported over. Bug: 19260237 Change-Id: I6689de3e4d14ae666d3e8da302cc9da2d4d77b9b
62 lines
2.3 KiB
XML
62 lines
2.3 KiB
XML
<!--
|
|
Copyright (C) 2015 The Android Open Source Project
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
android:id="@+id/volume_dialog"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginBottom="4dp"
|
|
android:layout_marginLeft="@dimen/notification_side_padding"
|
|
android:layout_marginRight="@dimen/notification_side_padding"
|
|
android:layout_marginTop="4dp"
|
|
android:background="@drawable/volume_dialog_background"
|
|
android:translationZ="4dp" >
|
|
|
|
<com.android.keyguard.AlphaOptimizedImageButton
|
|
android:id="@+id/volume_expand_button"
|
|
style="@style/VolumeButtons"
|
|
android:layout_alignParentLeft="true"
|
|
android:layout_width="@dimen/volume_button_size"
|
|
android:layout_height="@dimen/volume_button_size"
|
|
android:clickable="true"
|
|
android:soundEffectsEnabled="false"
|
|
android:src="@drawable/ic_volume_collapse_animation" />
|
|
|
|
<LinearLayout
|
|
android:id="@+id/volume_dialog_content"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:paddingBottom="4dp"
|
|
android:paddingEnd="4dp"
|
|
android:paddingStart="4dp"
|
|
android:paddingTop="6dp" >
|
|
|
|
<!-- volume rows added and removed here! :-) -->
|
|
|
|
<FrameLayout
|
|
android:id="@+id/volume_footer"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
tools:ignore="UselessParent" >
|
|
|
|
<include layout="@layout/volume_text_footer" />
|
|
|
|
<include layout="@layout/volume_zen_footer" />
|
|
</FrameLayout>
|
|
</LinearLayout>
|
|
|
|
</RelativeLayout> |