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

am b9f2b4ec: Merge "Volume: Ripple tweaking on zen mode condition rows." into mnc-dev

Browse Source 
* commit 'b9f2b4ec11c690cd9c6c649def92577e547b2a53':
  Volume: Ripple tweaking on zen mode condition rows.
This commit is contained in:
John Spurlock
2015-06-03 17:41:13 +00:00
committed by Android Git Automerger
parent f2d7ba5bcd b9f2b4ec11
commit c33ebac789
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/res/drawable/ripple_drawable_20dp.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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.
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:radius="20dp"
android:color="?android:attr/colorControlHighlight" />

3
packages/SystemUI/res/layout/zen_mode_condition.xml
View File

@@ -17,6 +17,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/qs_detail_item_height" android:layout_height="@dimen/qs_detail_item_height"
android:clipChildren="false"
android:layout_marginBottom="@dimen/zen_mode_condition_detail_item_spacing" android:layout_marginBottom="@dimen/zen_mode_condition_detail_item_spacing"
android:layout_marginStart="1dp" android:layout_marginStart="1dp"
android:layout_marginEnd="0dp" > android:layout_marginEnd="0dp" >
@@ -63,6 +64,7 @@
<ImageView <ImageView
android:id="@android:id/button1" android:id="@android:id/button1"
style="@style/QSBorderlessButton" style="@style/QSBorderlessButton"
android:background="@drawable/ripple_drawable_20dp"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
@@ -74,6 +76,7 @@
<ImageView <ImageView
android:id="@android:id/button2" android:id="@android:id/button2"
style="@style/QSBorderlessButton" style="@style/QSBorderlessButton"
android:background="@drawable/ripple_drawable_20dp"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"