diff options
author | Jorim Jaggi <jjaggi@google.com> | 2014-07-26 14:36:57 +0200 |
---|---|---|
committer | Jorim Jaggi <jjaggi@google.com> | 2014-07-28 15:34:59 +0200 |
commit | c7dea6ee9b06369b0c0c3773dc2e40409ce86a8e (patch) | |
tree | f59473b865292b108ead8f18e6621b0a0be65236 /packages/Keyguard/res | |
parent | 0d266899da8f612194a8393ec69c4fd870f2f45c (diff) | |
download | frameworks_base-c7dea6ee9b06369b0c0c3773dc2e40409ce86a8e.zip frameworks_base-c7dea6ee9b06369b0c0c3773dc2e40409ce86a8e.tar.gz frameworks_base-c7dea6ee9b06369b0c0c3773dc2e40409ce86a8e.tar.bz2 |
Implement next alarm info in expanded QS.
Also make the representation of alarm on lockscreen consistent with
QS. In addition, fix a bug where pending app transition was overriden
to make the alarm click interaction look nice.
Bug: 15392951
Bug: 15856205
Change-Id: Iacdf6a38c5c1a7484b4b328c9a3fa4d25e071c64
Diffstat (limited to 'packages/Keyguard/res')
-rw-r--r-- | packages/Keyguard/res/drawable-hdpi/ic_alarm_small.png | bin | 1159 -> 0 bytes | |||
-rw-r--r-- | packages/Keyguard/res/drawable-mdpi/ic_alarm_small.png | bin | 758 -> 0 bytes | |||
-rw-r--r-- | packages/Keyguard/res/drawable-sw600dp-hdpi/ic_alarm_small.png | bin | 1320 -> 0 bytes | |||
-rw-r--r-- | packages/Keyguard/res/drawable-sw600dp-mdpi/ic_alarm_small.png | bin | 847 -> 0 bytes | |||
-rw-r--r-- | packages/Keyguard/res/drawable-sw600dp-xhdpi/ic_alarm_small.png | bin | 1836 -> 0 bytes | |||
-rw-r--r-- | packages/Keyguard/res/drawable-sw600dp-xxhdpi/ic_alarm_small.png | bin | 2696 -> 0 bytes | |||
-rw-r--r-- | packages/Keyguard/res/drawable-xhdpi/ic_alarm_small.png | bin | 1590 -> 0 bytes | |||
-rw-r--r-- | packages/Keyguard/res/drawable-xxhdpi/ic_alarm_small.png | bin | 2513 -> 0 bytes | |||
-rw-r--r-- | packages/Keyguard/res/drawable/ic_access_alarms_big.xml | 25 | ||||
-rw-r--r-- | packages/Keyguard/res/layout/keyguard_status_area.xml | 8 | ||||
-rw-r--r-- | packages/Keyguard/res/values/donottranslate.xml | 3 |
11 files changed, 31 insertions, 5 deletions
diff --git a/packages/Keyguard/res/drawable-hdpi/ic_alarm_small.png b/packages/Keyguard/res/drawable-hdpi/ic_alarm_small.png Binary files differdeleted file mode 100644 index 3819029..0000000 --- a/packages/Keyguard/res/drawable-hdpi/ic_alarm_small.png +++ /dev/null diff --git a/packages/Keyguard/res/drawable-mdpi/ic_alarm_small.png b/packages/Keyguard/res/drawable-mdpi/ic_alarm_small.png Binary files differdeleted file mode 100644 index 2aeedaf..0000000 --- a/packages/Keyguard/res/drawable-mdpi/ic_alarm_small.png +++ /dev/null diff --git a/packages/Keyguard/res/drawable-sw600dp-hdpi/ic_alarm_small.png b/packages/Keyguard/res/drawable-sw600dp-hdpi/ic_alarm_small.png Binary files differdeleted file mode 100644 index e28b3f6..0000000 --- a/packages/Keyguard/res/drawable-sw600dp-hdpi/ic_alarm_small.png +++ /dev/null diff --git a/packages/Keyguard/res/drawable-sw600dp-mdpi/ic_alarm_small.png b/packages/Keyguard/res/drawable-sw600dp-mdpi/ic_alarm_small.png Binary files differdeleted file mode 100644 index f727d01..0000000 --- a/packages/Keyguard/res/drawable-sw600dp-mdpi/ic_alarm_small.png +++ /dev/null diff --git a/packages/Keyguard/res/drawable-sw600dp-xhdpi/ic_alarm_small.png b/packages/Keyguard/res/drawable-sw600dp-xhdpi/ic_alarm_small.png Binary files differdeleted file mode 100644 index d9c0623..0000000 --- a/packages/Keyguard/res/drawable-sw600dp-xhdpi/ic_alarm_small.png +++ /dev/null diff --git a/packages/Keyguard/res/drawable-sw600dp-xxhdpi/ic_alarm_small.png b/packages/Keyguard/res/drawable-sw600dp-xxhdpi/ic_alarm_small.png Binary files differdeleted file mode 100644 index a36bf1f..0000000 --- a/packages/Keyguard/res/drawable-sw600dp-xxhdpi/ic_alarm_small.png +++ /dev/null diff --git a/packages/Keyguard/res/drawable-xhdpi/ic_alarm_small.png b/packages/Keyguard/res/drawable-xhdpi/ic_alarm_small.png Binary files differdeleted file mode 100644 index 0290bdc..0000000 --- a/packages/Keyguard/res/drawable-xhdpi/ic_alarm_small.png +++ /dev/null diff --git a/packages/Keyguard/res/drawable-xxhdpi/ic_alarm_small.png b/packages/Keyguard/res/drawable-xxhdpi/ic_alarm_small.png Binary files differdeleted file mode 100644 index 66968e8..0000000 --- a/packages/Keyguard/res/drawable-xxhdpi/ic_alarm_small.png +++ /dev/null diff --git a/packages/Keyguard/res/drawable/ic_access_alarms_big.xml b/packages/Keyguard/res/drawable/ic_access_alarms_big.xml new file mode 100644 index 0000000..84ccb7c --- /dev/null +++ b/packages/Keyguard/res/drawable/ic_access_alarms_big.xml @@ -0,0 +1,25 @@ +<!-- +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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="18dp" + android:height="18dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + + <path + android:fillColor="@color/clock_gray" + android:pathData="M22.0,5.7l-4.6,-3.9l-1.3,1.5l4.6,3.9L22.0,5.7zM7.9,3.4L6.6,1.9L2.0,5.7l1.3,1.5L7.9,3.4zM12.5,8.0L11.0,8.0l0.0,6.0l4.7,2.9l0.8,-1.2l-4.0,-2.4L12.5,8.0zM12.0,4.0c-5.0,0.0 -9.0,4.0 -9.0,9.0c0.0,5.0 4.0,9.0 9.0,9.0s9.0,-4.0 9.0,-9.0C21.0,8.0 17.0,4.0 12.0,4.0zM12.0,20.0c-3.9,0.0 -7.0,-3.1 -7.0,-7.0c0.0,-3.9 3.1,-7.0 7.0,-7.0c3.9,0.0 7.0,3.1 7.0,7.0C19.0,16.9 15.9,20.0 12.0,20.0z"/> +</vector> diff --git a/packages/Keyguard/res/layout/keyguard_status_area.xml b/packages/Keyguard/res/layout/keyguard_status_area.xml index 2730517..7d8977c 100644 --- a/packages/Keyguard/res/layout/keyguard_status_area.xml +++ b/packages/Keyguard/res/layout/keyguard_status_area.xml @@ -35,13 +35,11 @@ <TextView android:id="@+id/alarm_status" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:drawablePadding="2dip" - android:drawableLeft="@drawable/ic_alarm_small" - android:drawableStart="@drawable/ic_alarm_small" + android:drawablePadding="6dp" + android:drawableStart="@drawable/ic_access_alarms_big" android:textColor="@color/clock_gray" style="@style/widget_label" - android:layout_marginLeft="8dip" - android:layout_marginStart="8dip" + android:layout_marginStart="6dp" android:gravity="center" android:visibility="gone" /> diff --git a/packages/Keyguard/res/values/donottranslate.xml b/packages/Keyguard/res/values/donottranslate.xml index 78636db..2f54406 100644 --- a/packages/Keyguard/res/values/donottranslate.xml +++ b/packages/Keyguard/res/values/donottranslate.xml @@ -18,6 +18,9 @@ <!-- Skeleton string format for displaying the date. --> <string name="abbrev_wday_month_day_no_year">EEEEMMMMd</string> + <!-- Skeleton string format for displaying the date when an alarm is set. --> + <string name="abbrev_wday_month_day_no_year_alarm">EEEMMMMd</string> + <!-- Skeleton string format for displaying the time in 12-hour format. --> <string name="clock_12hr_format">hm</string> |