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

Merge "Update X, -, + icons in dnd panel" into oc-dr1-dev

Browse Source 
am: 6b0c1604a6

Change-Id: Ie99a43618cac3b760df1bcc34704af23c121a6a8
This commit is contained in:
Evan Laird
2017-08-09 14:24:05 +00:00
committed by android-build-merger
parent d7172c2ae3 6b0c1604a6
commit c21e619ee2
5 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/SystemUI/res/drawable/ic_close_white_rounded.xml Normal file
View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2017 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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M18.3,5.71a0.996,0.996 0,0 0,-1.41 0L12,10.59 7.11,5.7A0.996,0.996 0,1 0,5.7 7.11L10.59,12 5.7,16.89a0.996,0.996 0,1 0,1.41 1.41L12,13.41l4.89,4.89a0.996,0.996 0,1 0,1.41 -1.41L13.41,12l4.89,-4.89c0.38,-0.38 0.38,-1.02 0,-1.4z"/>
</vector>

10
packages/SystemUI/res/drawable/ic_qs_minus.xml
View File

@@ -1,5 +1,5 @@
<!-- <!--
Copyright (C) 2015 The Android Open Source Project Copyright (C) 2017 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@@ -15,12 +15,10 @@
--> -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24.0dp" android:height="24.0dp"
android:viewportHeight="48.0" android:viewportHeight="24.0"
android:viewportWidth="48.0" android:viewportWidth="24.0"
android:width="24.0dp" > android:width="24.0dp" >
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:pathData="M38.0,26.0L10.0,26.0l0.0,-4.0l28.0,0.0l0.0,4.0z" /> android:pathData="M18,13H6c-0.55,0 -1,-0.45 -1,-1v0c0,-0.55 0.45,-1 1,-1h12c0.55,0 1,0.45 1,1v0C19,12.55 18.55,13 18,13z"/>
</vector> </vector>

10
packages/SystemUI/res/drawable/ic_qs_plus.xml
View File

@@ -1,5 +1,5 @@
<!-- <!--
Copyright (C) 2015 The Android Open Source Project Copyright (C) 2017 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@@ -15,12 +15,10 @@
--> -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24.0dp" android:height="24.0dp"
android:viewportHeight="48.0" android:viewportHeight="24.0"
android:viewportWidth="48.0" android:viewportWidth="24.0"
android:width="24.0dp" > android:width="24.0dp" >
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:pathData="M38.0,26.0L26.0,26.0l0.0,12.0l-4.0,0.0L22.0,26.0L10.0,26.0l0.0,-4.0l12.0,0.0L22.0,10.0l4.0,0.0l0.0,12.0l12.0,0.0l0.0,4.0z" /> android:pathData="M18,13h-5v5c0,0.55 -0.45,1 -1,1h0c-0.55,0 -1,-0.45 -1,-1v-5H6c-0.55,0 -1,-0.45 -1,-1v0c0,-0.55 0.45,-1 1,-1h5V6c0,-0.55 0.45,-1 1,-1h0c0.55,0 1,0.45 1,1v5h5c0.55,0 1,0.45 1,1v0C19,12.55 18.55,13 18,13z"/>
</vector> </vector>

2
packages/SystemUI/res/layout/volume_zen_footer.xml
View File

@@ -51,7 +51,7 @@
android:clickable="true" android:clickable="true"
android:contentDescription="@string/accessibility_desc_close" android:contentDescription="@string/accessibility_desc_close"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_close_white" /> android:src="@drawable/ic_close_white_rounded" />
<TextView <TextView
android:id="@+id/zen_introduction_message" android:id="@+id/zen_introduction_message"

2
packages/SystemUI/res/layout/zen_mode_panel.xml
View File

@@ -59,7 +59,7 @@
android:clickable="true" android:clickable="true"
android:contentDescription="@string/accessibility_desc_close" android:contentDescription="@string/accessibility_desc_close"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_close_white" /> android:src="@drawable/ic_close_white_rounded" />
<TextView <TextView
android:id="@+id/zen_introduction_message" android:id="@+id/zen_introduction_message"