8600534df6
- Implement a new volume panel widget, combining volume and zen mode + conditions. - Show zen mode + conditions when modifying ringer or notification streams. - Host the volume panel widget in a dialog when being controlled by the audio service / volume keys. - Remove support for multiple sliders in the volume panel. - Remove support for separate ringer + notification volumes in the volume panel. - Move volume panel resources up to SystemUI. - Create a new combined Notifications quick settings tile. - Host the volume panel widget in the quick settings panel under Notifications. - When the quick settings detail panel is visible, route the volume keys to the embedded widget instead of showing a redundant dialog. - Create common styles for quick settings text to be closer to spec. - Update the framework resources for the ringer stream. - Show the ringer icons in global actions. - Add "until you turn this off" back as a separate zen condition. - Disable time condition buttons when they are N/A. - Don't allow volume changes to set ringer mode silent. Bug:15186070 Change-Id: Id5e321dd1d5e7c4cf3917027ffbdf7e80d38b00d
68 lines
2.5 KiB
XML
68 lines
2.5 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
Copyright (C) 2007 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"
|
|
android:id="@+id/visible_panel"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal" >
|
|
|
|
<FrameLayout
|
|
android:id="@+id/slider_panel"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_toLeftOf="@+id/expand_button_divider" />
|
|
|
|
<ImageView
|
|
android:id="@+id/expand_button_divider"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="32dip"
|
|
android:layout_gravity="top"
|
|
android:layout_marginBottom="16dip"
|
|
android:layout_marginTop="16dip"
|
|
android:layout_toLeftOf="@+id/expand_button"
|
|
android:scaleType="fitXY"
|
|
android:src="?android:attr/dividerVertical" />
|
|
|
|
<ImageView
|
|
android:id="@+id/expand_button"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignParentRight="true"
|
|
android:layout_gravity="top"
|
|
style="@style/BorderlessButton.Tiny"
|
|
android:padding="16dip" />
|
|
|
|
<ImageView
|
|
android:id="@+id/zen_panel_divider"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_below="@+id/slider_panel"
|
|
android:layout_marginLeft="16dip"
|
|
android:layout_marginRight="16dip"
|
|
android:scaleType="fitXY"
|
|
android:src="?android:attr/dividerHorizontal" />
|
|
|
|
<ViewStub
|
|
android:id="@+id/zen_panel_stub"
|
|
android:layout_below="@+id/zen_panel_divider"
|
|
android:inflatedId="@+id/zen_panel"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout="@layout/zen_mode_panel" />
|
|
|
|
</RelativeLayout>
|