diff options
18 files changed, 3 insertions, 28 deletions
diff --git a/res/drawable-hdpi/ic_label_normal.png b/res/drawable-hdpi/ic_label_normal.png Binary files differdeleted file mode 100644 index 22d50be1e..000000000 --- a/res/drawable-hdpi/ic_label_normal.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_label_pressed.png b/res/drawable-hdpi/ic_label_pressed.png Binary files differdeleted file mode 100644 index 2e1312cb2..000000000 --- a/res/drawable-hdpi/ic_label_pressed.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_label_normal.png b/res/drawable-mdpi/ic_label_normal.png Binary files differdeleted file mode 100644 index 623ae1955..000000000 --- a/res/drawable-mdpi/ic_label_normal.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_label_pressed.png b/res/drawable-mdpi/ic_label_pressed.png Binary files differdeleted file mode 100644 index 00f9f824a..000000000 --- a/res/drawable-mdpi/ic_label_pressed.png +++ /dev/null diff --git a/res/drawable-sw600dp-hdpi/ic_label_pressed.png b/res/drawable-sw600dp-hdpi/ic_label_pressed.png Binary files differdeleted file mode 100644 index 23c623cdc..000000000 --- a/res/drawable-sw600dp-hdpi/ic_label_pressed.png +++ /dev/null diff --git a/res/drawable-sw600dp-mdpi/ic_label_pressed.png b/res/drawable-sw600dp-mdpi/ic_label_pressed.png Binary files differdeleted file mode 100644 index 3a7a94bd9..000000000 --- a/res/drawable-sw600dp-mdpi/ic_label_pressed.png +++ /dev/null diff --git a/res/drawable-sw600dp-xhdpi/ic_label_pressed.png b/res/drawable-sw600dp-xhdpi/ic_label_pressed.png Binary files differdeleted file mode 100644 index 18cdc3612..000000000 --- a/res/drawable-sw600dp-xhdpi/ic_label_pressed.png +++ /dev/null diff --git a/res/drawable-sw600dp-xxhdpi/ic_label_pressed.png b/res/drawable-sw600dp-xxhdpi/ic_label_pressed.png Binary files differdeleted file mode 100644 index 573032db2..000000000 --- a/res/drawable-sw600dp-xxhdpi/ic_label_pressed.png +++ /dev/null diff --git a/res/drawable-sw600dp-xxxhdpi/ic_label_pressed.png b/res/drawable-sw600dp-xxxhdpi/ic_label_pressed.png Binary files differdeleted file mode 100644 index e01a96abd..000000000 --- a/res/drawable-sw600dp-xxxhdpi/ic_label_pressed.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_label_normal.png b/res/drawable-xhdpi/ic_label_normal.png Binary files differdeleted file mode 100644 index b3dd6a633..000000000 --- a/res/drawable-xhdpi/ic_label_normal.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_label_pressed.png b/res/drawable-xhdpi/ic_label_pressed.png Binary files differdeleted file mode 100644 index c7796d35d..000000000 --- a/res/drawable-xhdpi/ic_label_pressed.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_label_normal.png b/res/drawable-xxhdpi/ic_label_normal.png Binary files differdeleted file mode 100644 index a7a62764a..000000000 --- a/res/drawable-xxhdpi/ic_label_normal.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_label_pressed.png b/res/drawable-xxhdpi/ic_label_pressed.png Binary files differdeleted file mode 100644 index ad32d9cd3..000000000 --- a/res/drawable-xxhdpi/ic_label_pressed.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_label_normal.png b/res/drawable-xxxhdpi/ic_label_normal.png Binary files differdeleted file mode 100644 index 99d2c83e5..000000000 --- a/res/drawable-xxxhdpi/ic_label_normal.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_label_pressed.png b/res/drawable-xxxhdpi/ic_label_pressed.png Binary files differdeleted file mode 100644 index a9442223b..000000000 --- a/res/drawable-xxxhdpi/ic_label_pressed.png +++ /dev/null diff --git a/res/drawable/ic_label.xml b/res/drawable/ic_label.xml deleted file mode 100644 index beeaa8371..000000000 --- a/res/drawable/ic_label.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_focused="true" android:state_window_focused="true" - android:drawable="@drawable/ic_label_pressed" /> - <item android:state_pressed="true" android:state_window_focused="true" - android:drawable="@drawable/ic_label_pressed" /> - <item android:state_focused="false" - android:drawable="@drawable/ic_label_normal" /> -</selector> diff --git a/res/layout-w320dp-h320dp/timer_item.xml b/res/layout-w320dp-h320dp/timer_item.xml index 05f60cd48..3be4cfe99 100644 --- a/res/layout-w320dp-h320dp/timer_item.xml +++ b/res/layout-w320dp-h320dp/timer_item.xml @@ -60,7 +60,6 @@ android:gravity="center" android:hint="@string/label" android:maxLines="1" - android:src="@drawable/ic_label" android:textAppearance="@style/SecondaryLabelTextAppearance" /> <ImageButton @@ -72,7 +71,7 @@ android:gravity="center" android:padding="@dimen/fab_button_padding" android:scaleType="centerInside" - android:src="@drawable/ic_plusone" /> + app:srcCompat="@drawable/ic_plusone" /> </com.android.deskclock.CircleButtonsLayout> diff --git a/res/layout/timer_item.xml b/res/layout/timer_item.xml index 2592871d4..e00332951 100644 --- a/res/layout/timer_item.xml +++ b/res/layout/timer_item.xml @@ -17,6 +17,7 @@ <!-- This TimerItem discards the circle because space is limited. --> <com.android.deskclock.timer.TimerItem xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> @@ -42,7 +43,6 @@ android:gravity="center" android:hint="@string/label" android:maxLines="1" - android:src="@drawable/ic_label" android:textAppearance="@style/SecondaryLabelTextAppearance" /> <!-- Center the reset/add button on the third of the container above the delete button. --> @@ -65,7 +65,7 @@ android:gravity="center" android:padding="@dimen/fab_button_padding" android:scaleType="centerInside" - android:src="@drawable/ic_plusone" /> + app:srcCompat="@drawable/ic_plusone" /> </FrameLayout> |
