summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res/layout
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-05-31 19:11:40 -0400
committerJohn Spurlock <jspurlock@google.com>2014-05-31 19:11:40 -0400
commit7f1df5e98578f8532a5e009009e7c1f82ed5885c (patch)
tree4497cc995c2b6d6c6e591c94f993b8370fd75380 /packages/SystemUI/res/layout
parent4732af884b593349e779a226b3636b1c8541e71c (diff)
downloadframeworks_base-7f1df5e98578f8532a5e009009e7c1f82ed5885c.zip
frameworks_base-7f1df5e98578f8532a5e009009e7c1f82ed5885c.tar.gz
frameworks_base-7f1df5e98578f8532a5e009009e7c1f82ed5885c.tar.bz2
VolumeZen: Slider icon as ringer-mode toggle.
- When manipulating the ringer/notification stream, the volume slider icon on the left now serves as a toggle. Single-press for vibrate, long-press for silent. - Disable slider when silent. - Add touch feedback to slider icon when clickable. - Vibrate when toggling to vibrate. - Play sound when toggling to audible. - Adjust the slider icon padding so it appears to be square, and the same size as the icon on the right. Bug:15330217 Change-Id: Id7262d9315e6e761e1d5750714c356c3ac735951
Diffstat (limited to 'packages/SystemUI/res/layout')
-rw-r--r--packages/SystemUI/res/layout/volume_dialog.xml26
-rw-r--r--packages/SystemUI/res/layout/volume_panel_item.xml10
2 files changed, 32 insertions, 4 deletions
diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml
new file mode 100644
index 0000000..5afa967
--- /dev/null
+++ b/packages/SystemUI/res/layout/volume_dialog.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 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.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/qs_panel_background"
+ android:translationZ="@dimen/volume_panel_z"
+ android:layout_margin="@dimen/volume_panel_z">
+
+ <include layout="@layout/volume_panel" />
+
+</FrameLayout> \ No newline at end of file
diff --git a/packages/SystemUI/res/layout/volume_panel_item.xml b/packages/SystemUI/res/layout/volume_panel_item.xml
index 98cb8f4..759679b 100644
--- a/packages/SystemUI/res/layout/volume_panel_item.xml
+++ b/packages/SystemUI/res/layout/volume_panel_item.xml
@@ -24,19 +24,21 @@
<ImageView
android:id="@+id/stream_icon"
+ style="@style/BorderlessButton.Tiny"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingLeft="16dip"
- android:background="?android:attr/selectableItemBackground"
+ android:padding="16dip"
android:contentDescription="@null" />
-
<SeekBar
style="?android:attr/seekBarStyle"
android:id="@+id/seekbar"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:padding="16dip"
+ android:paddingTop="16dip"
+ android:paddingBottom="16dip"
+ android:paddingStart="11dip"
+ android:paddingEnd="11dip"
android:layout_marginEnd="16dip" />
</LinearLayout>