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

Merge "Update the wifi on but disconnected qs icon" into nyc-dev am: becc301

Browse Source 
am: cdb9a75

* commit 'cdb9a75c103ea865bcd3f8f7ded860cc8a8411db':
  Update the wifi on but disconnected qs icon

Change-Id: Ie84c76b598074ede8e292c6bc205c8a6196d0d09
This commit is contained in:
Jason Monk
2016-03-31 17:55:16 +00:00
committed by android-build-merger
parent 6ca127ab0f cdb9a75c10
commit 376f7d69bc
2 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
packages/SystemUI/res/drawable/ic_qs_wifi_disconnected.xml Normal file
View File

@@ -0,0 +1,45 @@
<!--
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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="26.0dp"
android:height="24.0dp"
android:viewportWidth="26.0"
android:viewportHeight="24.0">
<path
android:pathData="M0 0h26v24H0z"
android:fillColor="#00000000"/>
<path
android:fillColor="#FFFFFFFF"
android:pathData="M21.0,8.5
c0.85,0.0 1.6,0.23 2.3,0.62l2.24,-2.79
C25.1,5.96 20.26,2.0 13.0,2.0
S0.9,5.9 0.42,6.32
l12.57,15.6 4.21,-5.17
c-0.76,-0.87 -1.22,-2.0 -1.22,-3.25
c0.0,-2.76 2.24,-5.0 5.0,-5.0z"
android:fillAlpha=".3"/>
<path
android:fillColor="#FFFFFFFF"
android:pathData="M21.0,10.0
c-1.93,0.0 -3.5,1.57 -3.5,3.5l1.75,0.0
c0.0,-0.9 0.78,-1.75 1.75,-1.75s1.7,0.78 1.75,1.75
c0.0,0.48 -0.2,0.92 -0.51,1.24l-1.09,1.1
c-0.6,0.63 -1.02,1.51 -1.02,2.47l0.0,0.44l1.75,0.0
c0.0,-1.3 0.39,-1.84 1.03,-2.47l0.78,-0.8
c0.5,-0.5 0.82,-1.2 0.82,-1.97
C24.5,11.57 22.93,10.0 21.0,10.0z
m-0.95,11.95l1.9,0.0l0.0,-1.9l-1.9,0.0l0.0,1.9z"/>
</vector>

2
packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
View File

@@ -154,7 +154,7 @@ public class WifiTile extends QSTile<QSTile.SignalState> {
state.label = removeDoubleQuotes(cb.enabledDesc);
signalContentDescription = cb.wifiSignalContentDescription;
} else if (wifiNotConnected) {
state.icon = ResourceIcon.get(R.drawable.ic_qs_wifi_full_0);
state.icon = ResourceIcon.get(R.drawable.ic_qs_wifi_disconnected);
state.label = r.getString(R.string.quick_settings_wifi_label);
signalContentDescription = r.getString(R.string.accessibility_no_wifi);
} else {