am d623aee9: Merge "Make the manual button into a normal button" into ub-mail-algol

* commit 'd623aee90ea53cc0092396cb91dc2e0420dbc201':
  Make the manual button into a normal button
This commit is contained in:
Martin Hibdon 2014-04-21 20:00:26 +00:00 committed by Android Git Automerger
commit 01e7c6829b
2 changed files with 1 additions and 2 deletions

View File

@ -223,7 +223,7 @@
<!-- Label for the add authentication icon [CHAR LIMIT=40] -->
<string name="clear_authentication_label">Clear authentication</string>
<!-- Button name on "Set up email" screen, with action underlined using html [CHAR LIMIT=20] -->
<string name="account_setup_basics_manual_setup_action"><u>Manual setup</u></string>
<string name="account_setup_basics_manual_setup_action">Manual setup</string>
<!-- Do not translate. Button name on "Set up email" screen [CHAR LIMIT=20] TODO: This is a temporary workaround
to allow initiating the OAuth setup flow before we have the real design working. This string
should be removed. -->

View File

@ -70,7 +70,6 @@
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/account_setup_manual_button_color</item>
<item name="android:alpha">0.4</item>
<item name="android:background">?android:attr/selectableItemBackground</item>
</style>
<!-- Account setup row label text -->