diff options
author | Alan Viverette <alanv@google.com> | 2014-04-10 16:14:40 -0700 |
---|---|---|
committer | Alan Viverette <alanv@google.com> | 2014-04-10 16:14:40 -0700 |
commit | 515a48a01844a7a82c53c7c272f2a4c48a28f086 (patch) | |
tree | 00b8a805233fb4342942ccd18c2b849cf139da87 /packages | |
parent | 6d954bbdf5a5c0246ea8bfb5ed1cfb56060bbe56 (diff) | |
download | frameworks_base-515a48a01844a7a82c53c7c272f2a4c48a28f086.zip frameworks_base-515a48a01844a7a82c53c7c272f2a4c48a28f086.tar.gz frameworks_base-515a48a01844a7a82c53c7c272f2a4c48a28f086.tar.bz2 |
Update brightness icons to use color attribute
BUG: 13961573
Change-Id: I6c7f85c8cda739cb1e5e14c39c7e4a9fe20a8650
Diffstat (limited to 'packages')
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_off_alpha.png (renamed from packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_off.png) | bin | 2215 -> 2215 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_on_alpha.png (renamed from packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_on.png) | bin | 2082 -> 2082 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-ldpi/ic_qs_color_space_alpha.png | bin | 543 -> 0 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-ldpi/ic_qs_contrast_alpha.png | bin | 509 -> 0 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-ldpi/ic_qs_inversion_alpha.png | bin | 532 -> 0 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_off_alpha.png (renamed from packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_off.png) | bin | 1374 -> 1374 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_on_alpha.png (renamed from packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_on.png) | bin | 1334 -> 1334 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_off_alpha.png (renamed from packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_off.png) | bin | 3134 -> 3134 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_on_alpha.png (renamed from packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_on.png) | bin | 2928 -> 2928 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-xxhdpi/ic_qs_brightness_auto_off_alpha.png (renamed from packages/SystemUI/res/drawable-xxhdpi/ic_qs_brightness_auto_off.png) | bin | 3494 -> 3494 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-xxhdpi/ic_qs_brightness_auto_on_alpha.png (renamed from packages/SystemUI/res/drawable-xxhdpi/ic_qs_brightness_auto_on.png) | bin | 3182 -> 3182 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable/ic_qs_brightness_auto_off.xml | 20 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable/ic_qs_brightness_auto_on.xml | 20 | ||||
-rw-r--r-- | packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml | 19 |
14 files changed, 49 insertions, 10 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_off.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_off_alpha.png Binary files differindex 0a29157..0a29157 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_off.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_off_alpha.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_on.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_on_alpha.png Binary files differindex 9c1d8ef..9c1d8ef 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_on.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_on_alpha.png diff --git a/packages/SystemUI/res/drawable-ldpi/ic_qs_color_space_alpha.png b/packages/SystemUI/res/drawable-ldpi/ic_qs_color_space_alpha.png Binary files differdeleted file mode 100644 index 46d2a16..0000000 --- a/packages/SystemUI/res/drawable-ldpi/ic_qs_color_space_alpha.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-ldpi/ic_qs_contrast_alpha.png b/packages/SystemUI/res/drawable-ldpi/ic_qs_contrast_alpha.png Binary files differdeleted file mode 100644 index 704b4ec..0000000 --- a/packages/SystemUI/res/drawable-ldpi/ic_qs_contrast_alpha.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-ldpi/ic_qs_inversion_alpha.png b/packages/SystemUI/res/drawable-ldpi/ic_qs_inversion_alpha.png Binary files differdeleted file mode 100644 index d56efb5..0000000 --- a/packages/SystemUI/res/drawable-ldpi/ic_qs_inversion_alpha.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_off.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_off_alpha.png Binary files differindex 74df151..74df151 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_off.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_off_alpha.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_on.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_on_alpha.png Binary files differindex 56add92..56add92 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_on.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_on_alpha.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_off.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_off_alpha.png Binary files differindex 37d7ac7..37d7ac7 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_off.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_off_alpha.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_on.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_on_alpha.png Binary files differindex 626e283..626e283 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_on.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_on_alpha.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_brightness_auto_off.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_brightness_auto_off_alpha.png Binary files differindex 2697b5a..2697b5a 100644 --- a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_brightness_auto_off.png +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_brightness_auto_off_alpha.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_brightness_auto_on.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_brightness_auto_on_alpha.png Binary files differindex b6443fa..b6443fa 100644 --- a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_brightness_auto_on.png +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_brightness_auto_on_alpha.png diff --git a/packages/SystemUI/res/drawable/ic_qs_brightness_auto_off.xml b/packages/SystemUI/res/drawable/ic_qs_brightness_auto_off.xml new file mode 100644 index 0000000..b7fe5ab --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_brightness_auto_off.xml @@ -0,0 +1,20 @@ +<?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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_qs_brightness_auto_off_alpha" + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/SystemUI/res/drawable/ic_qs_brightness_auto_on.xml b/packages/SystemUI/res/drawable/ic_qs_brightness_auto_on.xml new file mode 100644 index 0000000..e17b533 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_brightness_auto_on.xml @@ -0,0 +1,20 @@ +<?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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_qs_brightness_auto_on_alpha" + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml b/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml index a6f4e9b..46fbaff 100644 --- a/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml +++ b/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml @@ -13,27 +13,26 @@ See the License for the specific language governing permissions and limitations under the License. --> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" style="@style/BrightnessDialogContainer"> <ImageView android:id="@+id/brightness_icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:paddingEnd="10dp" android:src="@drawable/ic_qs_brightness_auto_off" - /> + android:contentDescription="@null" /> + <com.android.systemui.settings.ToggleSlider android:id="@+id/brightness_slider" android:layout_width="0dp" android:layout_height="40dp" - android:layout_weight="1" - android:layout_marginEnd="2dp" android:layout_gravity="center_vertical" - systemui:text="@string/status_bar_settings_auto_brightness_label" - /> + android:layout_marginEnd="2dp" + android:layout_weight="1" + systemui:text="@string/status_bar_settings_auto_brightness_label" /> + </LinearLayout> |