diff options
| author | Selim Cinek <cinek@google.com> | 2014-05-26 19:22:17 +0200 |
|---|---|---|
| committer | Selim Cinek <cinek@google.com> | 2014-05-28 15:56:22 +0200 |
| commit | 4c6969a512cd70831249ec1d07691f16fe5465f5 (patch) | |
| tree | 2c76a7099cfba8025a57f88d6e801ecc46ba97bf /packages/SystemUI/res/layout | |
| parent | dab839e0478559781fe703c83f4e8a43d34960d2 (diff) | |
| download | frameworks_base-4c6969a512cd70831249ec1d07691f16fe5465f5.zip frameworks_base-4c6969a512cd70831249ec1d07691f16fe5465f5.tar.gz frameworks_base-4c6969a512cd70831249ec1d07691f16fe5465f5.tar.bz2 | |
Implemented basic camera and phone affordance.
The phone and the camera can now be accessed when swiping anywhere
on the background of the keyguard in the corresponding direction.
Bug: 15126905
Change-Id: If5551078676275764d5b7ddbca6e71cf008a1904
Diffstat (limited to 'packages/SystemUI/res/layout')
| -rw-r--r-- | packages/SystemUI/res/layout/keyguard_bottom_area.xml | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index 936f73b..9bf42b2 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -22,7 +22,7 @@ android:layout_height="match_parent" android:layout_width="match_parent" > - <com.android.systemui.statusbar.phone.SwipeAffordanceView + <com.android.systemui.statusbar.AlphaImageView android:id="@+id/camera_button" android:layout_height="64dp" android:layout_width="64dp" @@ -30,10 +30,9 @@ android:tint="#ffffffff" android:src="@drawable/ic_camera_alt_24dp" android:scaleType="center" - android:contentDescription="@string/accessibility_camera_button" - systemui:swipeDirection="start"/> + android:contentDescription="@string/accessibility_camera_button" /> - <com.android.systemui.statusbar.phone.SwipeAffordanceView + <com.android.systemui.statusbar.AlphaImageView android:id="@+id/phone_button" android:layout_height="64dp" android:layout_width="64dp" @@ -41,8 +40,7 @@ android:tint="#ffffffff" android:src="@drawable/ic_phone_24dp" android:scaleType="center" - android:contentDescription="@string/accessibility_phone_button" - systemui:swipeDirection="end"/> + android:contentDescription="@string/accessibility_phone_button" /> <com.android.systemui.statusbar.phone.KeyguardIndicationTextView android:id="@+id/keyguard_indication_text" @@ -54,15 +52,13 @@ android:textColor="#ffffff" android:textAppearance="?android:attr/textAppearanceSmall"/> - <ImageView + <com.android.systemui.statusbar.AlphaImageView android:id="@+id/lock_icon" 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"/> + android:tint="#ffffffff" /> </com.android.systemui.statusbar.phone.KeyguardBottomAreaView> |