summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2014-05-07 23:41:58 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-07 23:41:58 +0000
commit4d2f8a553d3ae99f9c5f5e91f47afb05cac7b2ea (patch)
tree8b02ddb378e43db2ff0225d49df73e31a8427016 /packages/SystemUI/res
parent0c744579c548d719a6341527cd69aa48799ba63f (diff)
parent603d270a531e6855418bffebdcdfbda013a2dbbe (diff)
downloadframeworks_base-4d2f8a553d3ae99f9c5f5e91f47afb05cac7b2ea.zip
frameworks_base-4d2f8a553d3ae99f9c5f5e91f47afb05cac7b2ea.tar.gz
frameworks_base-4d2f8a553d3ae99f9c5f5e91f47afb05cac7b2ea.tar.bz2
am 08d852aa: Merge "Add intermediate lock icon so users know how to unlock."
* commit '08d852aa220d3272b80b23ab3c221dbf5670fd8f': Add intermediate lock icon so users know how to unlock.
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r--packages/SystemUI/res/drawable-hdpi/ic_lock_24dp.pngbin0 -> 385 bytes
-rw-r--r--packages/SystemUI/res/drawable-mdpi/ic_lock_24dp.pngbin0 -> 297 bytes
-rw-r--r--packages/SystemUI/res/drawable-xhdpi/ic_lock_24dp.pngbin0 -> 471 bytes
-rw-r--r--packages/SystemUI/res/drawable-xxhdpi/ic_lock_24dp.pngbin0 -> 629 bytes
-rw-r--r--packages/SystemUI/res/drawable-xxxhdpi/ic_lock_24dp.pngbin0 -> 825 bytes
-rw-r--r--packages/SystemUI/res/layout/keyguard_bottom_area.xml10
6 files changed, 10 insertions, 0 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_lock_24dp.png b/packages/SystemUI/res/drawable-hdpi/ic_lock_24dp.png
new file mode 100644
index 0000000..c779437
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/ic_lock_24dp.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_lock_24dp.png b/packages/SystemUI/res/drawable-mdpi/ic_lock_24dp.png
new file mode 100644
index 0000000..98ba690
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/ic_lock_24dp.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_lock_24dp.png b/packages/SystemUI/res/drawable-xhdpi/ic_lock_24dp.png
new file mode 100644
index 0000000..61947ea
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_lock_24dp.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_lock_24dp.png b/packages/SystemUI/res/drawable-xxhdpi/ic_lock_24dp.png
new file mode 100644
index 0000000..0b563b1
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xxhdpi/ic_lock_24dp.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxxhdpi/ic_lock_24dp.png b/packages/SystemUI/res/drawable-xxxhdpi/ic_lock_24dp.png
new file mode 100644
index 0000000..3600ee6
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xxxhdpi/ic_lock_24dp.png
Binary files differ
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
index ec5acba..194829d 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -55,4 +55,14 @@
android:textStyle="italic"
android:textAppearance="?android:attr/textAppearanceMedium"/>
+ <ImageView
+ android:layout_width="64dp"
+ android:layout_height="64dp"
+ android:layout_gravity="bottom|center_horizontal"
+ android:src="@drawable/ic_lock_24dp"
+ android:scaleType="center"
+ android:alpha="0.7"
+ android:layerType="hardware"
+ android:tint="#ffffffff"/>
+
</com.android.systemui.statusbar.phone.KeyguardBottomAreaView> \ No newline at end of file