diff options
author | John Reck <jreck@google.com> | 2011-04-27 15:32:10 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2011-04-27 15:37:38 -0700 |
commit | 12472f6e50bae508cdbc63fed0e11ad21daeabcf (patch) | |
tree | 04767fdd2669b7e954a8b9fed93752f455ef446c /res | |
parent | 119bfb0eb2ffbc063bdae3ce4c21e8fc29bae6bf (diff) | |
download | packages_apps_Browser-12472f6e50bae508cdbc63fed0e11ad21daeabcf.zip packages_apps_Browser-12472f6e50bae508cdbc63fed0e11ad21daeabcf.tar.gz packages_apps_Browser-12472f6e50bae508cdbc63fed0e11ad21daeabcf.tar.bz2 |
Autologin layout for phones
Change-Id: I34453e4709c094c4a6647d7ed254949bf33a3018
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/title_bar.xml | 83 | ||||
-rw-r--r-- | res/values/strings.xml | 4 |
2 files changed, 49 insertions, 38 deletions
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml index 4087640..35d3611 100644 --- a/res/layout/title_bar.xml +++ b/res/layout/title_bar.xml @@ -88,33 +88,53 @@ android:visibility="gone" android:layout_below="@+id/taburlbar" android:layout_width="match_parent" - android:layout_height="wrap_content"> - <TextView - android:text="@string/autologin_bar_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@android:color/primary_text_light" - android:paddingLeft="15dip" - android:paddingRight="15dip" - android:textAppearance="?android:attr/textAppearanceMedium" /> - <Spinner - android:id="@+id/autologin_account" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - style="@android:style/Widget.Holo.Light.Spinner" /> - <Button - android:id="@+id/autologin_login" - android:text="@string/autologin_bar_login_text" - style="@android:style/Widget.Holo.Light.Button" - android:layout_marginRight="15dip" + android:layout_height="wrap_content" + android:orientation="vertical"> + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_width="wrap_content" /> - <ProgressBar - android:id="@+id/autologin_progress" - android:indeterminateOnly="true" + android:paddingLeft="8dip" + android:paddingRight="8dip"> + <TextView + android:text="@string/autologin_bar_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@android:color/primary_text_light" + android:textAppearance="?android:attr/textAppearanceMedium" /> + <Spinner + android:id="@+id/autologin_account" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingLeft="8dp" + android:paddingRight="24dp" + style="@android:style/Widget.Holo.Light.Spinner" /> + </LinearLayout> + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:visibility="gone" /> + android:paddingLeft="8dip" + android:paddingRight="8dip"> + <Button + android:id="@+id/autologin_close" + android:layout_width="0dip" + android:layout_weight="1" + android:layout_height="wrap_content" + android:text="@string/autologin_bar_hide_text" + style="@android:style/Widget.Holo.Light.Button" /> + <ProgressBar + android:id="@+id/autologin_progress" + android:indeterminateOnly="true" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:visibility="invisible" /> + <Button + android:id="@+id/autologin_login" + android:text="@string/autologin_bar_login_text" + style="@android:style/Widget.Holo.Light.Button" + android:layout_height="wrap_content" + android:layout_width="0dip" + android:layout_weight="1" /> + </LinearLayout> <TextView android:id="@+id/autologin_error" android:layout_height="wrap_content" @@ -123,17 +143,6 @@ android:text="@string/autologin_bar_error" android:textAppearance="?android:attr/textAppearanceMedium" android:visibility="gone" /> - <View - android:layout_width="2dip" - android:layout_height="match_parent" - android:layout_weight="1" /> - <ImageButton - android:id="@+id/autologin_close" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingRight="15dip" - android:background="@null" - android:src="@*android:drawable/btn_close" /> </LinearLayout> <com.android.browser.PageProgressView android:id="@+id/progress" @@ -144,4 +153,4 @@ android:src="@drawable/progress" android:layout_marginTop="-8dip" android:visibility="gone" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index ad960b1..0c93377 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -384,9 +384,11 @@ <!-- Message shown during auto login [CHAR-LIMIT=none] --> <string name="pref_autologin_progress">Signing into Google sites using <xliff:g>%s</xliff:g></string> <!-- Auto-login bar description [CHAR-LIMIT=40] --> - <string name="autologin_bar_text">Automatic sign-in is available.</string> + <string name="autologin_bar_text">Sign in as</string> <!-- Login button [CHAR-LIMIT=10] --> <string name="autologin_bar_login_text">Login</string> + <!-- Hide button [CHAR-LIMIT=10] --> + <string name="autologin_bar_hide_text">Hide</string> <!-- Login failure text [CHAR-LIMIT=25] --> <string name="autologin_bar_error">Login failed.</string> |