Merge "Updating the shortcut icons for Settings app" into nyc-mr1-dev (fe9bf6d9) · Commits · e / os / android_packages_apps_Settings

res/drawable/ic_shortcut_battery.xml

+14 −18

Original line number	Diff line number	Diff line
		@@ -14,21 +14,17 @@
		~ See the License for the specific language governing permissions and
		~ limitations under the License
		-->
		<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
		<item>
		<bitmap android:src="@drawable/shortcut_base" />
		</item>
		<item>
		<inset android:inset="19.2dp">
		<vector android:width="24.0dp"
		android:height="24.0dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		<vector
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="80dp"
		android:height="80dp"
		android:viewportWidth="52.0"
		android:viewportHeight="52.0" >
		<path
		android:fillColor="@color/icon_accent"
		android:pathData="M15.67,4.0L14.0,4.0L14.0,2.0l-4.0,0.0l0.0,2.0L8.33,4.0C7.6,4.0 7.0,4.6 7.0,5.33l0.0,15.33C7.0,21.4 7.6,22.0 8.33,22.0l7.33,0.0c0.74,0.0 1.34,-0.6 1.34,-1.33L17.0,5.33C17.0,4.6 16.4,4.0 15.67,4.0z
		M16,5l0,5.5l-8,0l0,-5.5l3,0l0,-2l2,0l0,2l3,0z"/>
		android:fillColor="#FFF5F5F5"
		android:pathData="M2,26a24,24 0 1,0 48,0a24,24 0 1,0 -48,0"/>
		<path
		android:fillColor="@*android:color/accent_device_default_light"
		android:pathData="M29.67,18H28v-2h-4v2h-1.67C21.6,18,21,18.6,21,19.33v15.33C21,35.4,21.6,36,22.33,36h7.33
		C30.4,36,31,35.4,31,34.67V19.33C31,18.6,30.4,18,29.67,18z"/>
		</vector>
		No newline at end of file
		</inset>
		</item>
		</layer-list>
		No newline at end of file

res/drawable/ic_shortcut_data_usage.xml

+15 −30

Original line number	Diff line number	Diff line
		@@ -14,33 +14,18 @@
		~ See the License for the specific language governing permissions and
		~ limitations under the License
		-->
		<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
		<item>
		<bitmap android:src="@drawable/shortcut_base" />
		</item>
		<item>
		<inset android:inset="19.2dp">
		<vector android:width="24.0dp"
		android:height="24.0dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		<vector
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="80dp"
		android:height="80dp"
		android:viewportWidth="52.0"
		android:viewportHeight="52.0" >
		<path
		android:fillColor="@color/icon_accent"
		android:pathData="M26.0,4.1
		l0.0,6.06
		c6.7,0.97 12.0,6.79 12.0,13.84
		0.0,1.79 -0.35,3.5 -0.96,5.07
		l5.2,3.07
		C43.35,29.65 44.0,26.91 44.0,24.0
		c0.0,-10.37 -7.89,-18.89 -18.0,-19.9z
		M24.0,38.0
		c-7.73,0.0 -14.0,-6.27 -14.0,-14.0 0.0,-7.05 5.22,-12.87 12.0,-13.84
		l0.0,-6
		C11.88,5.1 4.0,13.63 4.0,24.0
		c0.0,11.05 8.94,20.0 19.99,20.0 6.62,0.0 12.47,-3.23 16.11,-8.18
		l-5.19,-3.06
		C32.35,35.95 28.42,38.0 24.0,38.0z"/>
		android:fillColor="#FFF5F5F5"
		android:pathData="M2,26a24,24 0 1,0 48,0a24,24 0 1,0 -48,0"/>
		<path
		android:fillColor="@*android:color/accent_device_default_light"
		android:pathData="M27,16.05v3.03c3.39,0.49,6,3.39,6,6.92c0,0.9-0.18,1.75-0.48,2.54l2.6,1.53C35.68,28.83,36,27.45,36,26
		C36,20.82,32.05,16.55,27,16.05z M26,33c-3.87,0-7-3.13-7-7c0-3.53,2.61-6.43,6-6.92v-3.03c-5.06,0.5-9,4.76-9,9.95
		c0,5.52,4.47,10,9.99,10c3.31,0,6.24-1.61,8.06-4.09l-2.6-1.53C30.17,31.98,28.21,33,26,33z"/>
		</vector>
		No newline at end of file
		</inset>
		</item>
		</layer-list>
		No newline at end of file

res/drawable/ic_shortcut_display.xml

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2016 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
		-->
		<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
		<item>
		<bitmap android:src="@drawable/shortcut_base" />
		</item>
		<item>
		<inset android:inset="19.2dp">
		<vector android:width="24.0dp"
		android:height="24.0dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		<path
		android:fillColor="@color/icon_accent"
		android:pathData="M20.0,15.31L23.31,12.0 20.0,8.69L20.0,4.0l-4.69,0.0L12.0,0.69 8.69,4.0L4.0,4.0l0.0,4.69L0.69,12.0 4.0,15.31L4.0,20.0l4.69,0.0L12.0,23.31 15.31,20.0L20.0,20.0l0.0,-4.69zM12.0,18.0L12.0,6.0c3.31,0.0 6.0,2.69 6.0,6.0s-2.69,6.0 -6.0,6.0z"/>
		</vector>
		</inset>
		</item>
		</layer-list>
		No newline at end of file

res/drawable/ic_shortcut_storage.xml

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2016 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
		-->
		<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
		<item>
		<bitmap android:src="@drawable/shortcut_base" />
		</item>
		<item>
		<inset android:inset="19.2dp">
		<vector android:width="24.0dp"
		android:height="24.0dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		<path
		android:fillColor="@color/icon_accent"
		android:pathData="M2.0,20.0l20.0,0.0l0.0,-4.0L2.0,16.0l0.0,4.0zm2.0,-3.0l2.0,0.0l0.0,2.0L4.0,19.0l0.0,-2.0zM2.0,4.0l0.0,4.0l20.0,0.0L22.0,4.0L2.0,4.0zm4.0,3.0L4.0,7.0L4.0,5.0l2.0,0.0l0.0,2.0zm-4.0,7.0l20.0,0.0l0.0,-4.0L2.0,10.0l0.0,4.0zm2.0,-3.0l2.0,0.0l0.0,2.0L4.0,13.0l0.0,-2.0z"/>
		</vector>
		</inset>
		</item>
		</layer-list>
		No newline at end of file

res/drawable/ic_shortcut_wireless.xml

+13 −17

Original line number	Diff line number	Diff line
		@@ -14,20 +14,16 @@
		~ See the License for the specific language governing permissions and
		~ limitations under the License
		-->
		<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
		<item>
		<bitmap android:src="@drawable/shortcut_base" />
		</item>
		<item>
		<inset android:inset="19.2dp">
		<vector android:width="24.0dp"
		android:height="24.0dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		<vector
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="80dp"
		android:height="80dp"
		android:viewportWidth="52.0"
		android:viewportHeight="52.0" >
		<path
		android:fillColor="@color/icon_accent"
		android:pathData="M9.01,15.99l8.8,-10.96C17.47,4.77 14.08,2.0 9.0,2.0S0.53,4.7 0.19,5.03l8.8,10.96l0.02,0.0z"/>
		android:fillColor="#FFF5F5F5"
		android:pathData="M2,26a24,24 0 1,0 48,0a24,24 0 1,0 -48,0"/>
		<path
		android:fillColor="@*android:color/accent_device_default_light"
		android:pathData="M26.01,35.49L37.64,21c-0.45-0.34-4.93-4-11.64-4c-6.72,0-11.19,3.66-11.64,4l11.63,14.49L26,35.5L26.01,35.49z"/>
		</vector>
		No newline at end of file
		</inset>
		</item>
		</layer-list>
		No newline at end of file