Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adding lock icon to FaceLockAreaView on lockscreen fixes 5394522"

Browse Source
This commit is contained in:
Steven Ross
2012-03-20 17:39:06 -07:00
committed by Android (Google) Code Review
parent 127d4deab1 ec5501acd8
commit 848763daea
15 changed files with 177 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/res/res/drawable-hdpi/ic_facial_backup.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 583 B

BIN
core/res/res/drawable-hdpi/intro_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 198 KiB

BIN
core/res/res/drawable-mdpi/ic_facial_backup.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 520 B

BIN
core/res/res/drawable-mdpi/intro_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 88 KiB

BIN
core/res/res/drawable-xhdpi/ic_facial_backup.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 841 B

BIN
core/res/res/drawable-xhdpi/intro_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 335 KiB

25
core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml
View File

@@ -153,13 +153,32 @@
</LinearLayout>
<!-- Area to overlay FaceLock -->
<View android:id="@+id/faceLockAreaView"
<RelativeLayout
android:id="@+id/faceLockAreaView"
android:visibility="invisible"
android:layout_width="512dip"
android:layout_height="512dip"
android:layout_centerInParent="true"
android:background="@color/facelock_color_background"
/>
android:background="@drawable/intro_bg">
<View
android:id="@+id/spotlightMask"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/facelock_spotlight_mask"
/>
<ImageView
android:id="@+id/cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dip"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:src="@drawable/ic_facial_backup"
/>
</RelativeLayout>
</RelativeLayout>

25
core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml
View File

@@ -156,13 +156,32 @@
</LinearLayout>
<!-- Area to overlay FaceLock -->
<View android:id="@+id/faceLockAreaView"
<RelativeLayout
android:id="@+id/faceLockAreaView"
android:visibility="invisible"
android:layout_width="512dip"
android:layout_height="512dip"
android:layout_centerInParent="true"
android:background="@color/facelock_color_background"
/>
android:background="@drawable/intro_bg">
<View
android:id="@+id/spotlightMask"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/facelock_spotlight_mask"
/>
<ImageView
android:id="@+id/cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dip"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:src="@drawable/ic_facial_backup"
/>
</RelativeLayout>
</RelativeLayout>

25
core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml
View File

@@ -124,13 +124,32 @@
</RelativeLayout>
<!-- Area to overlay FaceLock -->
<View android:id="@+id/faceLockAreaView"
<RelativeLayout
android:id="@+id/faceLockAreaView"
android:visibility="invisible"
android:layout_width="512dip"
android:layout_height="512dip"
android:layout_centerInParent="true"
android:background="@color/facelock_color_background"
/>
android:background="@drawable/intro_bg">
<View
android:id="@+id/spotlightMask"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/facelock_spotlight_mask"
/>
<ImageView
android:id="@+id/cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dip"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:src="@drawable/ic_facial_backup"
/>
</RelativeLayout>
</RelativeLayout>

25
core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml
View File

@@ -119,13 +119,32 @@
</RelativeLayout>
<!-- Area to overlay FaceLock -->
<View android:id="@+id/faceLockAreaView"
<RelativeLayout
android:id="@+id/faceLockAreaView"
android:visibility="invisible"
android:layout_width="512dip"
android:layout_height="512dip"
android:layout_centerInParent="true"
android:background="@color/facelock_color_background"
/>
android:background="@drawable/intro_bg">
<View
android:id="@+id/spotlightMask"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/facelock_spotlight_mask"
/>
<ImageView
android:id="@+id/cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dip"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:src="@drawable/ic_facial_backup"
/>
</RelativeLayout>
</RelativeLayout>

25
core/res/res/layout/keyguard_screen_password_landscape.xml
View File

@@ -208,7 +208,8 @@
/>
<!-- Area to overlay FaceLock -->
<TextView android:id="@+id/faceLockAreaView"
<RelativeLayout
android:id="@+id/faceLockAreaView"
android:visibility="invisible"
android:layout_row="0"
android:layout_column="2"
@@ -217,7 +218,25 @@
android:layout_gravity="fill"
android:layout_width="0dip"
android:layout_height="0dip"
android:background="@color/facelock_color_background"
/>
android:background="@drawable/intro_bg">
<View
android:id="@+id/spotlightMask"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/facelock_spotlight_mask"
/>
<ImageView
android:id="@+id/cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dip"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:src="@drawable/ic_facial_backup"
/>
</RelativeLayout>
</GridLayout>

25
core/res/res/layout/keyguard_screen_password_portrait.xml
View File

@@ -199,7 +199,8 @@
/>
<!-- Area to overlay FaceLock -->
<TextView android:id="@+id/faceLockAreaView"
<RelativeLayout
android:id="@+id/faceLockAreaView"
android:visibility="invisible"
android:layout_row="3"
android:layout_column="0"
@@ -208,7 +209,25 @@
android:layout_gravity="fill"
android:layout_width="0dip"
android:layout_height="0dip"
android:background="@color/facelock_color_background"
/>
android:background="@drawable/intro_bg">
<View
android:id="@+id/spotlightMask"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/facelock_spotlight_mask"
/>
<ImageView
android:id="@+id/cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dip"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:src="@drawable/ic_facial_backup"
/>
</RelativeLayout>
</GridLayout>

25
core/res/res/layout/keyguard_screen_unlock_landscape.xml
View File

@@ -161,7 +161,8 @@
/>
<!-- Area to overlay FaceLock -->
<TextView android:id="@+id/faceLockAreaView"
<RelativeLayout
android:id="@+id/faceLockAreaView"
android:visibility="invisible"
android:layout_row="0"
android:layout_column="1"
@@ -171,7 +172,25 @@
android:layout_marginLeft="8dip"
android:layout_width="0dip"
android:layout_height="0dip"
android:background="@color/facelock_color_background"
/>
android:background="@drawable/intro_bg">
<View
android:id="@+id/spotlightMask"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/facelock_spotlight_mask"
/>
<ImageView
android:id="@+id/cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dip"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:src="@drawable/ic_facial_backup"
/>
</RelativeLayout>
</GridLayout>

25
core/res/res/layout/keyguard_screen_unlock_portrait.xml
View File

@@ -170,7 +170,8 @@
/>
<!-- Area to overlay FaceLock -->
<TextView android:id="@+id/faceLockAreaView"
<RelativeLayout
android:id="@+id/faceLockAreaView"
android:visibility="invisible"
android:layout_row="4"
android:layout_column="0"
@@ -181,7 +182,25 @@
android:layout_marginBottom="8dip"
android:layout_width="0dip"
android:layout_height="0dip"
android:background="@color/facelock_color_background"
/>
android:background="@drawable/intro_bg">
<View
android:id="@+id/spotlightMask"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/facelock_spotlight_mask"
/>
<ImageView
android:id="@+id/cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dip"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:src="@drawable/ic_facial_backup"
/>
</RelativeLayout>
</GridLayout>

2
core/res/res/values/colors.xml
View File

@@ -113,7 +113,7 @@
<color name="lockscreen_owner_info">#ff9a9a9a</color>
<!-- FaceLock -->
<color name="facelock_color_background">#000000</color>
<color name="facelock_spotlight_mask">#CC000000</color>
<!-- For holo theme -->
<drawable name="screen_background_holo_light">#fff3f3f3</drawable>