Skip to content

Commit bd95bd2

Browse files
Jim MillerAndroid Git Automerger
Jim Miller
authored and
Android Git Automerger
committed
am 63b977d: am 14bb25a: Merge "Fixing issues with pattern recovery / account view (issue 7341237):" into jb-mr1-dev
* commit '63b977de7e7cba17ba8abd78f7750d4bc56c8c45': Fixing issues with pattern recovery / account view (issue 7341237):
2 parents a100087 + 63b977d commit bd95bd2

File tree

12 files changed

+89
-28
lines changed

12 files changed

+89
-28
lines changed

‎core/res/res/layout/keyguard_account_view.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
android:layout_height="match_parent"
2424
android:orientation="vertical">
2525

26-
<include layout="@layout/keyguard_navigation"/>
26+
<include layout="@layout/keyguard_sim_puk_pin_account_navigation"/>
2727

2828
<RelativeLayout
2929
android:layout_width="match_parent"
@@ -69,4 +69,12 @@
6969

7070
</RelativeLayout>
7171

72+
<include layout="@layout/keyguard_emergency_carrier_area"
73+
android:id="@+id/keyguard_selector_fade_container"
74+
android:layout_width="match_parent"
75+
android:layout_height="wrap_content"
76+
android:orientation="vertical"
77+
android:layout_gravity="bottom|center_horizontal"
78+
android:gravity="center_horizontal" />
79+
7280
</com.android.internal.policy.impl.keyguard.KeyguardAccountView>

‎core/res/res/layout/keyguard_emergency_carrier_area_and_recovery.xml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
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+
20+
<!-- This contains emergency call button and carrier as shared by pin/pattern/password screens -->
21+
<LinearLayout
22+
xmlns:android="http://schemas.android.com/apk/res/android"
23+
android:layout_width="match_parent"
24+
android:layout_height="wrap_content"
25+
android:orientation="vertical"
26+
android:gravity="center"
27+
android:layout_gravity="center_horizontal"
28+
android:layout_alignParentBottom="true">
29+
30+
<com.android.internal.policy.impl.keyguard.CarrierText
31+
android:layout_width="wrap_content"
32+
android:layout_height="wrap_content"
33+
android:singleLine="true"
34+
android:ellipsize="marquee"
35+
android:textAppearance="?android:attr/textAppearanceMedium"
36+
android:textSize="@dimen/kg_status_line_font_size"
37+
android:textColor="?android:attr/textColorSecondary"/>
38+
39+
<LinearLayout
40+
android:layout_width="wrap_content"
41+
android:layout_height="wrap_content"
42+
android:orientation="horizontal">
43+
44+
<com.android.internal.policy.impl.keyguard.EmergencyButton
45+
android:id="@+id/emergency_call_button"
46+
android:layout_width="wrap_content"
47+
android:layout_height="wrap_content"
48+
android:drawableLeft="@*android:drawable/lockscreen_emergency_button"
49+
android:text="@string/kg_emergency_call_label"
50+
style="?android:attr/buttonBarButtonStyle"
51+
android:textAppearance="?android:attr/textAppearanceMedium"
52+
android:textSize="@dimen/kg_status_line_font_size"
53+
android:textColor="?android:attr/textColorSecondary"
54+
android:drawablePadding="8dip" />
55+
56+
<Button android:id="@+id/forgot_password_button"
57+
android:layout_width="wrap_content"
58+
android:layout_height="wrap_content"
59+
android:paddingLeft="20dp"
60+
android:paddingRight="20dp"
61+
android:textSize="@dimen/kg_status_line_font_size"
62+
android:visibility="gone"/>
63+
</LinearLayout>
64+
65+
</LinearLayout>

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,7 @@
3838
android:orientation="vertical"
3939
android:layout_gravity="center">
4040

41-
<LinearLayout
42-
android:layout_height="wrap_content"
43-
android:layout_width="match_parent"
44-
android:orientation="vertical"
45-
android:gravity="center">
46-
47-
<include layout="@layout/keyguard_navigation"/>
48-
49-
<Button android:id="@+id/forgot_password_button"
50-
android:layout_width="wrap_content"
51-
android:layout_height="wrap_content"
52-
android:textSize="@dimen/kg_status_line_font_size"
53-
android:visibility="gone"/>
54-
55-
</LinearLayout>
41+
<include layout="@layout/keyguard_navigation"/>
5642

5743
<!-- We need MATCH_PARENT here only to force the size of the parent to be passed to
5844
the pattern view for it to compute its size. This is an unusual case, caused by
@@ -69,7 +55,7 @@
6955
android:layout_gravity="center_horizontal"
7056
android:gravity="center" />
7157

72-
<include layout="@layout/keyguard_emergency_carrier_area"
58+
<include layout="@layout/keyguard_emergency_carrier_area_and_recovery"
7359
android:id="@+id/keyguard_selector_fade_container"
7460
android:layout_width="match_parent"
7561
android:layout_height="wrap_content"

‎core/res/res/layout/keyguard_sim_pin_view.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
android:layout_height="wrap_content"
4444
android:src="@drawable/ic_lockscreen_sim"/>
4545

46-
<include layout="@layout/keyguard_sim_puk_pin_navigation"/>
46+
<include layout="@layout/keyguard_sim_puk_pin_account_navigation"/>
4747
</LinearLayout>
4848

4949
<!-- Password entry field -->

core/res/res/layout/keyguard_sim_puk_pin_navigation.xml renamed to core/res/res/layout/keyguard_sim_puk_pin_account_navigation.xml

File renamed without changes.

‎core/res/res/layout/keyguard_sim_puk_view.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
android:layout_height="wrap_content"
4545
android:src="@drawable/ic_lockscreen_sim"/>
4646

47-
<include layout="@layout/keyguard_sim_puk_pin_navigation"/>
47+
<include layout="@layout/keyguard_sim_puk_pin_account_navigation"/>
4848

4949
</LinearLayout>
5050

‎core/res/res/values-land/bools.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616

1717
<resources>
1818
<bool name="kg_share_status_area">false</bool>
19-
<bool name="kg_sim_puk_full_screen">false</bool>
19+
<bool name="kg_sim_puk_account_full_screen">false</bool>
2020
</resources>

‎core/res/res/values-port/bools.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
<resources>
1818
<bool name="action_bar_embed_tabs">false</bool>
1919
<bool name="kg_share_status_area">true</bool>
20-
<bool name="kg_sim_puk_full_screen">true</bool>
20+
<bool name="kg_sim_puk_account_full_screen">true</bool>
2121
</resources>

‎core/res/res/values-sw600dp/bools.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
<bool name="target_honeycomb_needs_options_menu">false</bool>
1919
<bool name="show_ongoing_ime_switcher">true</bool>
2020
<bool name="kg_share_status_area">false</bool>
21-
<bool name="kg_sim_puk_full_screen">false</bool>
21+
<bool name="kg_sim_puk_account_full_screen">false</bool>
2222
</resources>

‎core/res/res/values/symbols.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1192,7 +1192,7 @@
11921192
<java-symbol type="bool" name="config_reverseDefaultRotation" />
11931193
<java-symbol type="bool" name="config_showNavigationBar" />
11941194
<java-symbol type="bool" name="kg_share_status_area" />
1195-
<java-symbol type="bool" name="kg_sim_puk_full_screen" />
1195+
<java-symbol type="bool" name="kg_sim_puk_account_full_screen" />
11961196
<java-symbol type="bool" name="target_honeycomb_needs_options_menu" />
11971197
<java-symbol type="color" name="kg_multi_user_text_active" />
11981198
<java-symbol type="color" name="kg_multi_user_text_inactive" />

0 commit comments

Comments
 (0)