diff options
| author | Brian Colonna <bcolonna@google.com> | 2011-09-28 06:13:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-28 06:13:53 -0700 |
| commit | 9a3d51ed1090d459666c3257923b16eca842bb10 (patch) | |
| tree | ea1e790b61fd6c0cb8796d00ad93c3d2d34a2c55 | |
| parent | 0c66f0526751ad3f97636b834ea957659a65048b (diff) | |
| parent | 982813c3df78e4cca112b48e399e9f11de13e0fe (diff) | |
| download | frameworks_base-9a3d51ed1090d459666c3257923b16eca842bb10.zip frameworks_base-9a3d51ed1090d459666c3257923b16eca842bb10.tar.gz frameworks_base-9a3d51ed1090d459666c3257923b16eca842bb10.tar.bz2 | |
Merge "Added landscape views for Face Unlock"
| -rw-r--r-- | core/res/res/layout/keyguard_screen_password_landscape.xml | 13 | ||||
| -rw-r--r-- | core/res/res/layout/keyguard_screen_unlock_landscape.xml | 14 |
2 files changed, 27 insertions, 0 deletions
diff --git a/core/res/res/layout/keyguard_screen_password_landscape.xml b/core/res/res/layout/keyguard_screen_password_landscape.xml index 3343d8b..8bc5f34 100644 --- a/core/res/res/layout/keyguard_screen_password_landscape.xml +++ b/core/res/res/layout/keyguard_screen_password_landscape.xml @@ -191,4 +191,17 @@ android:layout_height="0dip" /> + <!-- Area to overlay FaceLock --> + <TextView android:id="@+id/faceLockAreaView" + android:visibility="gone" + android:layout_row="0" + android:layout_column="2" + android:layout_rowSpan="8" + android:layout_columnSpan="1" + android:layout_gravity="fill" + android:layout_width="0dip" + android:layout_height="0dip" + android:background="@color/facelock_color_background" + /> + </GridLayout> diff --git a/core/res/res/layout/keyguard_screen_unlock_landscape.xml b/core/res/res/layout/keyguard_screen_unlock_landscape.xml index d71dbff..2778f4e 100644 --- a/core/res/res/layout/keyguard_screen_unlock_landscape.xml +++ b/core/res/res/layout/keyguard_screen_unlock_landscape.xml @@ -160,4 +160,18 @@ android:layout_height="0dip" /> + <!-- Area to overlay FaceLock --> + <TextView android:id="@+id/faceLockAreaView" + android:visibility="gone" + android:layout_row="0" + android:layout_column="1" + android:layout_rowSpan="7" + android:layout_columnSpan="1" + android:layout_gravity="fill" + android:layout_marginLeft="8dip" + android:layout_width="0dip" + android:layout_height="0dip" + android:background="@color/facelock_color_background" + /> + </GridLayout> |