Skip to content

Commit 732d88e

Browse files
Mike CleronAndroid (Google) Code Review
Mike Cleron
authored and
Android (Google) Code Review
committed
Merge "Change keyguard to use single-stage unlock." into jb-mr1-dev
2 parents 5650d86 + 0ff7f01 commit 732d88e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1015
-430
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@
4545
android:paddingBottom="@dimen/keyguard_security_view_margin"
4646
android:gravity="center">
4747

48-
<!-- SelectorView is always used, so add it here. The rest are loaded dynamically -->
49-
<include layout="@layout/keyguard_selector_view"/>
50-
5148
</com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper>
5249

5350
</com.android.internal.policy.impl.keyguard.KeyguardHostView>

‎core/res/res/layout-land/keyguard_status_area.xml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
**
4+
** Copyright 2009, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License")
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
20+
<!-- This is a view that shows general status information in Keyguard. -->
21+
<LinearLayout
22+
xmlns:android="http://schemas.android.com/apk/res/android"
23+
android:id="@+id/keyguard_status_area"
24+
android:layout_width="wrap_content"
25+
android:layout_height="wrap_content"
26+
android:layout_gravity="end"
27+
android:layout_marginTop="-16dp"
28+
android:orientation="vertical">
29+
30+
<TextView
31+
android:id="@+id/date"
32+
android:layout_width="wrap_content"
33+
android:layout_height="wrap_content"
34+
android:layout_gravity="end"
35+
android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
36+
android:singleLine="true"
37+
android:ellipsize="marquee"
38+
android:textAppearance="?android:attr/textAppearanceMedium"
39+
android:textSize="@dimen/kg_status_date_font_size"
40+
/>
41+
42+
<TextView
43+
android:id="@+id/alarm_status"
44+
android:layout_gravity="end"
45+
android:layout_marginTop="28dp"
46+
android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
47+
android:singleLine="true"
48+
android:ellipsize="marquee"
49+
android:textAppearance="?android:attr/textAppearance"
50+
android:textSize="@dimen/kg_status_line_font_size"
51+
android:drawablePadding="4dip"
52+
/>
53+
54+
<TextView
55+
android:id="@+id/owner_info"
56+
android:layout_gravity="end"
57+
android:layout_marginTop="4dp"
58+
android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
59+
android:singleLine="true"
60+
android:ellipsize="marquee"
61+
android:textAppearance="?android:attr/textAppearance"
62+
android:textSize="@dimen/kg_status_line_font_size"
63+
/>
64+
65+
<TextView
66+
android:id="@+id/status1"
67+
android:layout_gravity="end"
68+
android:layout_marginTop="4dp"
69+
android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
70+
android:singleLine="true"
71+
android:ellipsize="marquee"
72+
android:textAppearance="?android:attr/textAppearance"
73+
android:textSize="@dimen/kg_status_line_font_size"
74+
/>
75+
76+
<TextView
77+
android:id="@+id/status_security_message"
78+
android:layout_gravity="center"
79+
android:gravity="right"
80+
android:layout_marginTop="12dp"
81+
android:singleLine="false"
82+
android:maxLines="3"
83+
android:ellipsize="marquee"
84+
android:textAppearance="?android:attr/textAppearance"
85+
android:textSize="16dp"
86+
/>
87+
</LinearLayout>

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,22 @@
2727
android:gravity="center_horizontal"
2828
android:orientation="vertical">
2929

30+
<include layout="@layout/keyguard_widget_region"
31+
android:layout_width="match_parent"
32+
android:layout_height="0dip"
33+
android:layout_weight="27" />
34+
3035
<com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper
3136
android:id="@+id/view_flipper"
32-
android:layout_height="match_parent"
37+
android:layout_height="0dp"
3338
android:clipChildren="false"
3439
android:clipToPadding="false"
40+
android:layout_weight="73"
3541
android:paddingLeft="@dimen/keyguard_security_view_margin"
3642
android:paddingTop="@dimen/keyguard_security_view_margin"
3743
android:paddingRight="@dimen/keyguard_security_view_margin"
3844
android:paddingBottom="@dimen/keyguard_security_view_margin"
3945
android:gravity="center">
40-
41-
<!-- SelectorView is always used, so add it here. The rest are loaded dynamically -->
42-
<include layout="@layout/keyguard_selector_view"/>
43-
4446
</com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper>
45-
4647
</com.android.internal.policy.impl.keyguard.KeyguardHostView>
4748

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

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
**
4+
** Copyright 2009, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License")
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
20+
<!-- This is a view that shows general status information in Keyguard. -->
21+
<LinearLayout
22+
xmlns:android="http://schemas.android.com/apk/res/android"
23+
android:id="@+id/keyguard_status_area"
24+
android:layout_width="wrap_content"
25+
android:layout_height="wrap_content"
26+
android:layout_gravity="right"
27+
android:orientation="vertical">
28+
29+
<LinearLayout
30+
android:orientation="horizontal"
31+
android:layout_width="wrap_content"
32+
android:layout_height="wrap_content"
33+
android:layout_marginTop="0dp"
34+
android:layout_gravity="right">
35+
<TextView
36+
android:id="@+id/date"
37+
android:layout_width="wrap_content"
38+
android:layout_height="wrap_content"
39+
android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
40+
android:singleLine="true"
41+
android:ellipsize="marquee"
42+
android:textAppearance="?android:attr/textAppearanceMedium"
43+
android:textSize="@dimen/kg_status_date_font_size"
44+
/>
45+
46+
<TextView
47+
android:id="@+id/alarm_status"
48+
android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
49+
android:singleLine="true"
50+
android:ellipsize="marquee"
51+
android:textAppearance="?android:attr/textAppearance"
52+
android:textSize="@dimen/kg_status_line_font_size"
53+
android:drawablePadding="4dip"
54+
/>
55+
</LinearLayout>
56+
57+
<TextView
58+
android:id="@+id/owner_info"
59+
android:layout_gravity="right"
60+
android:layout_marginTop="4dp"
61+
android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
62+
android:singleLine="true"
63+
android:ellipsize="marquee"
64+
android:textAppearance="?android:attr/textAppearance"
65+
android:textSize="@dimen/kg_status_line_font_size"
66+
/>
67+
68+
<TextView
69+
android:id="@+id/status1"
70+
android:layout_gravity="right"
71+
android:layout_marginTop="4dp"
72+
android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
73+
android:singleLine="true"
74+
android:ellipsize="marquee"
75+
android:textAppearance="?android:attr/textAppearance"
76+
android:textSize="@dimen/kg_status_line_font_size"
77+
/>
78+
79+
<TextView
80+
android:id="@+id/status_security_message"
81+
android:layout_gravity="right"
82+
android:layout_marginTop="4dp"
83+
android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
84+
android:singleLine="true"
85+
android:ellipsize="marquee"
86+
android:textAppearance="?android:attr/textAppearance"
87+
android:textSize="@dimen/kg_status_line_font_size"
88+
/>
89+
90+
</LinearLayout>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@
4545
android:paddingBottom="@dimen/keyguard_security_view_margin"
4646
android:layout_gravity="center">
4747

48-
<!-- SelectorView is always used, so add it here. The rest are loaded dynamically -->
49-
<include layout="@layout/keyguard_selector_view"/>
48+
5049

5150
</com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper>
5251

‎core/res/res/layout-sw600dp-port/keyguard_status_area.xml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
**
4+
** Copyright 2009, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License")
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
20+
<!-- This is a view that shows general status information in Keyguard. -->
21+
<LinearLayout
22+
xmlns:android="http://schemas.android.com/apk/res/android"
23+
android:id="@+id/keyguard_status_area"
24+
android:layout_width="wrap_content"
25+
android:layout_height="wrap_content"
26+
android:layout_gravity="end"
27+
android:layout_marginTop="-16dp"
28+
android:orientation="vertical">
29+
30+
<TextView
31+
android:id="@+id/date"
32+
android:layout_width="wrap_content"
33+
android:layout_height="wrap_content"
34+
android:layout_gravity="end"
35+
android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
36+
android:singleLine="true"
37+
android:ellipsize="marquee"
38+
android:textAppearance="?android:attr/textAppearanceMedium"
39+
android:textSize="@dimen/kg_status_date_font_size"
40+
/>
41+
42+
<TextView
43+
android:id="@+id/alarm_status"
44+
android:layout_gravity="end"
45+
android:layout_marginTop="28dp"
46+
android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
47+
android:singleLine="true"
48+
android:ellipsize="marquee"
49+
android:textAppearance="?android:attr/textAppearance"
50+
android:textSize="@dimen/kg_status_line_font_size"
51+
android:drawablePadding="4dip"
52+
/>
53+
54+
<TextView
55+
android:id="@+id/owner_info"
56+
android:layout_gravity="end"
57+
android:layout_marginTop="4dp"
58+
android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
59+
android:singleLine="true"
60+
android:ellipsize="marquee"
61+
android:textAppearance="?android:attr/textAppearance"
62+
android:textSize="@dimen/kg_status_line_font_size"
63+
/>
64+
65+
<TextView
66+
android:id="@+id/status1"
67+
android:layout_gravity="end"
68+
android:layout_marginTop="4dp"
69+
android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
70+
android:singleLine="true"
71+
android:ellipsize="marquee"
72+
android:textAppearance="?android:attr/textAppearance"
73+
android:textSize="@dimen/kg_status_line_font_size"
74+
/>
75+
</LinearLayout>

‎core/res/res/layout-sw600dp/keyguard_navigation.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
**
4+
** Copyright 2012, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License")
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
<merge xmlns:android="http://schemas.android.com/apk/res/android">
20+
<include layout="@layout/default_navigation" />
21+
</merge>

‎core/res/res/layout-sw600dp/keyguard_sim_puk_pin_navigation.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
**
4+
** Copyright 2012, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License")
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
<merge xmlns:android="http://schemas.android.com/apk/res/android">
20+
<include layout="@layout/default_navigation" />
21+
</merge>

‎core/res/res/layout/default_navigation.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
**
4+
** Copyright 2012, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License")
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
20+
android:id="@+id/keyguard_click_area"
21+
android:gravity="center">
22+
23+
<!-- message area for security screen -->
24+
<TextView
25+
android:id="@+id/keyguard_message_area"
26+
android:layout_width="wrap_content"
27+
android:layout_height="wrap_content"
28+
android:layout_gravity="start"
29+
android:ellipsize="marquee"
30+
android:layout_marginEnd="4dip"
31+
android:layout_marginStart="4dip"
32+
android:textSize="22dip"
33+
android:textAppearance="?android:attr/textAppearanceMedium"/>
34+
35+
</LinearLayout>

0 commit comments

Comments
 (0)