diff options
| author | Brian Colonna <bcolonna@google.com> | 2011-09-16 06:08:22 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-16 06:08:22 -0700 |
| commit | 68a8cf4a8e2829bc61c5f77cbb062a5ed143cd0a (patch) | |
| tree | b9f03d273be57af2ca00c2cc340fa5c71ee3529c /core | |
| parent | 1d8cac89aa19fd34c22fff5f0678959f6b10aea7 (diff) | |
| parent | 4d7cee1e4b9ed17da8fc041be80369eb525901f1 (diff) | |
| download | frameworks_base-68a8cf4a8e2829bc61c5f77cbb062a5ed143cd0a.zip frameworks_base-68a8cf4a8e2829bc61c5f77cbb062a5ed143cd0a.tar.gz frameworks_base-68a8cf4a8e2829bc61c5f77cbb062a5ed143cd0a.tar.bz2 | |
Merge "Properly laying out FaceLock on lockscreen"
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/layout/keyguard_screen_password_portrait.xml | 13 | ||||
| -rw-r--r-- | core/res/res/layout/keyguard_screen_unlock_portrait.xml | 15 | ||||
| -rw-r--r-- | core/res/res/values/colors.xml | 3 |
3 files changed, 31 insertions, 0 deletions
diff --git a/core/res/res/layout/keyguard_screen_password_portrait.xml b/core/res/res/layout/keyguard_screen_password_portrait.xml index cf3bd42..27a51da 100644 --- a/core/res/res/layout/keyguard_screen_password_portrait.xml +++ b/core/res/res/layout/keyguard_screen_password_portrait.xml @@ -178,4 +178,17 @@ android:layout_height="0dip" /> + <!-- Area to overlay FaceLock --> + <TextView android:id="@+id/faceLockAreaView" + android:visibility="gone" + android:layout_row="3" + android:layout_column="0" + android:layout_rowSpan="2" + 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_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml index 64c479f..75ed101 100644 --- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml +++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml @@ -171,4 +171,19 @@ android:layout_height="0dip" /> + <!-- Area to overlay FaceLock --> + <TextView android:id="@+id/faceLockAreaView" + android:visibility="gone" + android:layout_row="4" + android:layout_column="0" + android:layout_rowSpan="1" + android:layout_columnSpan="1" + android:layout_gravity="fill" + android:layout_marginTop="8dip" + android:layout_marginBottom="8dip" + android:layout_width="0dip" + android:layout_height="0dip" + android:background="@color/facelock_color_background" + /> + </GridLayout> diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index ddb9942..f0c6d09 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -112,6 +112,9 @@ <color name="lockscreen_clock_am_pm">#ff9a9a9a</color> <color name="lockscreen_owner_info">#ff9a9a9a</color> + <!-- FaceLock --> + <color name="facelock_color_background">#000000</color> + <!-- For holo theme --> <drawable name="screen_background_holo_light">#fff3f3f3</drawable> <drawable name="screen_background_holo_dark">#ff000000</drawable> |