Skip to content

Commit b3f87c2

Browse files
cwrenAndroid (Google) Code Review
cwren
authored and
Android (Google) Code Review
committed
Merge "bouncer: hide more text and frame less." into jb-mr1-lockscreen-dev
2 parents 7c6863b + c0ae9e6 commit b3f87c2

20 files changed

+860
-655
lines changed

‎core/res/res/layout-port/keyguard_host_view.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
android:layout_width="wrap_content"
6565
android:layout_height="@dimen/keyguard_security_height"
6666
androidprv:layout_childType="challenge"
67-
android:background="@drawable/kg_bouncer_bg_white"
6867
android:padding="0dp"
6968
android:gravity="bottom|center_horizontal">
7069
<com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper

‎core/res/res/layout/keyguard_face_unlock_view.xml‎

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,39 @@
3131
android:layout_height="wrap_content"
3232
/>
3333

34-
<com.android.internal.widget.FaceUnlockView
35-
android:id="@+id/face_unlock_area_view"
36-
android:layout_width="match_parent"
37-
android:layout_height="0dp"
38-
android:background="@*android:drawable/intro_bg"
39-
android:gravity="center"
40-
android:layout_weight="1">
34+
<FrameLayout
35+
android:id="@+id/keyguard_bouncer_frame"
36+
android:background="@*android:drawable/kg_bouncer_bg_white"
37+
android:layout_width="match_parent"
38+
android:layout_height="0dp"
39+
android:layout_weight="1"
40+
>
41+
<com.android.internal.widget.FaceUnlockView
42+
android:id="@+id/face_unlock_area_view"
43+
android:layout_width="match_parent"
44+
android:layout_height="match_parent"
45+
android:background="@*android:drawable/intro_bg"
46+
android:gravity="center">
4147

42-
<View
43-
android:id="@+id/spotlightMask"
44-
android:layout_width="match_parent"
45-
android:layout_height="match_parent"
46-
android:background="@*android:color/facelock_spotlight_mask"
47-
/>
48+
<View
49+
android:id="@+id/spotlightMask"
50+
android:layout_width="match_parent"
51+
android:layout_height="match_parent"
52+
android:background="@*android:color/facelock_spotlight_mask"
53+
/>
4854

49-
<ImageButton
50-
android:id="@+id/face_unlock_cancel_button"
51-
android:layout_width="wrap_content"
52-
android:layout_height="wrap_content"
53-
android:padding="5dip"
54-
android:layout_alignParentTop="true"
55-
android:layout_alignParentEnd="true"
56-
android:background="#00000000"
57-
android:src="@*android:drawable/ic_facial_backup"
58-
/>
59-
</com.android.internal.widget.FaceUnlockView>
55+
<ImageButton
56+
android:id="@+id/face_unlock_cancel_button"
57+
android:layout_width="wrap_content"
58+
android:layout_height="wrap_content"
59+
android:padding="5dip"
60+
android:layout_alignParentTop="true"
61+
android:layout_alignParentEnd="true"
62+
android:background="#00000000"
63+
android:src="@*android:drawable/ic_facial_backup"
64+
/>
65+
</com.android.internal.widget.FaceUnlockView>
66+
</FrameLayout>
6067

6168
<include layout="@layout/keyguard_emergency_carrier_area"
6269
android:id="@+id/keyguard_selector_fade_container"

‎core/res/res/layout/keyguard_password_view.xml‎

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -39,45 +39,51 @@
3939
<!-- Password entry field -->
4040
<!-- Note: the entire container is styled to look like the edit field,
4141
since the backspace/IME switcher looks better inside -->
42-
<LinearLayout
42+
<FrameLayout
43+
android:id="@+id/keyguard_bouncer_frame"
44+
android:background="@*android:drawable/kg_bouncer_bg_white"
4345
android:layout_height="wrap_content"
4446
android:layout_width="match_parent"
45-
android:orientation="horizontal"
46-
android:background="#70000000"
47-
android:layout_marginTop="8dp"
48-
android:layout_marginBottom="8dp"
4947
>
50-
51-
<EditText android:id="@+id/passwordEntry"
52-
android:layout_width="0dip"
48+
<LinearLayout
5349
android:layout_height="wrap_content"
54-
android:layout_weight="1"
55-
android:gravity="center_horizontal"
56-
android:layout_gravity="center_vertical"
57-
android:layout_marginStart="@*android:dimen/keyguard_lockscreen_pin_margin_left"
58-
android:singleLine="true"
59-
android:textStyle="normal"
60-
android:inputType="textPassword"
61-
android:textSize="36sp"
62-
android:background="@null"
63-
android:textAppearance="?android:attr/textAppearanceMedium"
64-
android:textColor="#ffffffff"
65-
android:imeOptions="flagForceAscii|actionDone"
66-
/>
50+
android:layout_width="match_parent"
51+
android:orientation="horizontal"
52+
android:background="#70000000"
53+
android:layout_marginTop="8dp"
54+
android:layout_marginBottom="8dp"
55+
>
6756

68-
<ImageView android:id="@+id/switch_ime_button"
69-
android:layout_width="wrap_content"
70-
android:layout_height="wrap_content"
71-
android:src="@*android:drawable/ic_lockscreen_ime"
72-
android:clickable="true"
73-
android:padding="8dip"
74-
android:layout_gravity="center"
75-
android:background="?android:attr/selectableItemBackground"
76-
android:visibility="gone"
77-
/>
57+
<EditText android:id="@+id/passwordEntry"
58+
android:layout_width="0dip"
59+
android:layout_height="wrap_content"
60+
android:layout_weight="1"
61+
android:gravity="center_horizontal"
62+
android:layout_gravity="center_vertical"
63+
android:layout_marginStart="@*android:dimen/keyguard_lockscreen_pin_margin_left"
64+
android:singleLine="true"
65+
android:textStyle="normal"
66+
android:inputType="textPassword"
67+
android:textSize="36sp"
68+
android:background="@null"
69+
android:textAppearance="?android:attr/textAppearanceMedium"
70+
android:textColor="#ffffffff"
71+
android:imeOptions="flagForceAscii|actionDone"
72+
/>
7873

79-
</LinearLayout>
74+
<ImageView android:id="@+id/switch_ime_button"
75+
android:layout_width="wrap_content"
76+
android:layout_height="wrap_content"
77+
android:src="@*android:drawable/ic_lockscreen_ime"
78+
android:clickable="true"
79+
android:padding="8dip"
80+
android:layout_gravity="center"
81+
android:background="?android:attr/selectableItemBackground"
82+
android:visibility="gone"
83+
/>
8084

85+
</LinearLayout>
86+
</FrameLayout>
8187
<include layout="@layout/keyguard_emergency_carrier_area"
8288
android:id="@+id/keyguard_selector_fade_container"
8389
android:layout_width="match_parent"

‎core/res/res/layout/keyguard_pattern_view.xml‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,30 +43,32 @@
4343
android:orientation="vertical"
4444
android:layout_gravity="center">
4545

46-
<!-- We need MATCH_PARENT here only to force the size of the parent to be passed to
47-
the pattern view for it to compute its size. This is an unusual case, caused by
48-
LockPatternView's requirement to maintain a square aspect ratio based on the width
49-
of the screen. -->
46+
<FrameLayout
47+
android:id="@+id/keyguard_bouncer_frame"
48+
android:background="@*android:drawable/kg_bouncer_bg_white"
49+
android:layout_width="match_parent"
50+
android:layout_height="0dp"
51+
android:layout_weight="1"
52+
>
5053
<com.android.internal.widget.LockPatternView
5154
android:id="@+id/lockPatternView"
52-
android:layout_width="wrap_content"
53-
android:layout_height="0dp"
55+
android:layout_width="match_parent"
56+
android:layout_height="match_parent"
5457
android:layout_weight="1"
5558
android:layout_marginEnd="8dip"
5659
android:layout_marginBottom="4dip"
5760
android:layout_marginStart="8dip"
5861
android:layout_gravity="center_horizontal"
5962
android:gravity="center"
6063
android:contentDescription="@string/keyguard_accessibility_pattern_area" />
61-
62-
<include layout="@layout/keyguard_emergency_carrier_area"
63-
android:id="@+id/keyguard_selector_fade_container"
64-
android:layout_width="match_parent"
65-
android:layout_height="wrap_content"
66-
android:orientation="vertical"
67-
android:layout_gravity="bottom|center_horizontal"
68-
android:gravity="center_horizontal" />
69-
64+
</FrameLayout>
65+
<include layout="@layout/keyguard_emergency_carrier_area"
66+
android:id="@+id/keyguard_selector_fade_container"
67+
android:layout_width="match_parent"
68+
android:layout_height="wrap_content"
69+
android:orientation="vertical"
70+
android:layout_gravity="bottom|center_horizontal"
71+
android:gravity="center_horizontal" />
7072
</LinearLayout>
7173
</FrameLayout>
7274

0 commit comments

Comments
 (0)