am 717143ca: Fix 3339260: Remove emergency button from AccountUnlock screen

* commit '717143ca79ccccc8565117dfebcf9c6558d34e5b':
  Fix 3339260: Remove emergency button from AccountUnlock screen
This commit is contained in:
Jim Miller
2011-01-16 15:23:16 -08:00
committed by Android Git Automerger

View File

@@ -27,12 +27,11 @@
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="1" android:layout_weight="1"
android:layout_above="@+id/emergencyCall"> android:layout_above="@+id/emergencyCall">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
>
<TextView
<TextView
android:id="@+id/topHeader" android:id="@+id/topHeader"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dip" android:layout_height="64dip"
@@ -43,7 +42,7 @@
android:drawableLeft="@drawable/ic_lock_idle_lock" android:drawableLeft="@drawable/ic_lock_idle_lock"
android:drawablePadding="5dip" android:drawablePadding="5dip"
/> />
<!-- spacer below header --> <!-- spacer below header -->
<View <View
android:id="@+id/spacerTop" android:id="@+id/spacerTop"
@@ -51,7 +50,7 @@
android:layout_height="1dip" android:layout_height="1dip"
android:layout_below="@id/topHeader" android:layout_below="@id/topHeader"
android:background="@drawable/divider_horizontal_dark"/> android:background="@drawable/divider_horizontal_dark"/>
<TextView <TextView
android:id="@+id/instructions" android:id="@+id/instructions"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -62,7 +61,7 @@
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@android:string/lockscreen_glogin_instructions" android:text="@android:string/lockscreen_glogin_instructions"
/> />
<EditText <EditText
android:id="@+id/login" android:id="@+id/login"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -74,7 +73,7 @@
android:hint="@android:string/lockscreen_glogin_username_hint" android:hint="@android:string/lockscreen_glogin_username_hint"
android:inputType="textEmailAddress" android:inputType="textEmailAddress"
/> />
<EditText <EditText
android:id="@+id/password" android:id="@+id/password"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -88,11 +87,11 @@
android:nextFocusRight="@+id/ok" android:nextFocusRight="@+id/ok"
android:nextFocusDown="@+id/ok" android:nextFocusDown="@+id/ok"
/> />
<!-- ok below password, aligned to right of screen --> <!-- ok below password, aligned to right of screen -->
<Button <Button
android:id="@+id/ok" android:id="@+id/ok"
android:layout_width="85dip" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/password" android:layout_below="@id/password"
android:layout_marginTop="7dip" android:layout_marginTop="7dip"
@@ -100,10 +99,10 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:text="@android:string/lockscreen_glogin_submit_button" android:text="@android:string/lockscreen_glogin_submit_button"
/> />
</RelativeLayout> </RelativeLayout>
</ScrollView> </ScrollView>
<!-- spacer above emergency call --> <!-- spacer above emergency call -->
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -121,6 +120,7 @@
android:drawableLeft="@drawable/ic_emergency" android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip" android:drawablePadding="8dip"
android:text="@android:string/lockscreen_emergency_call" android:text="@android:string/lockscreen_emergency_call"
android:visibility="gone"
/> />
</LinearLayout> </LinearLayout>