diff options
| author | Martin Hibdon <mhibdon@google.com> | 2014-04-21 19:59:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-21 19:59:12 +0000 |
| commit | d623aee90ea53cc0092396cb91dc2e0420dbc201 (patch) | |
| tree | ac445ecba26ff46619ef6a1b2c159c985d003ec0 | |
| parent | 89a03e8e8327a93bb85d12e85973f7d3fd72c0d5 (diff) | |
| parent | 590c14b585816e08ec55ea871b43619e0c9c7808 (diff) | |
| download | android_packages_apps_Email-d623aee90ea53cc0092396cb91dc2e0420dbc201.tar.gz android_packages_apps_Email-d623aee90ea53cc0092396cb91dc2e0420dbc201.tar.bz2 android_packages_apps_Email-d623aee90ea53cc0092396cb91dc2e0420dbc201.zip | |
Merge "Make the manual button into a normal button" into ub-mail-algol
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index daae476b4..cae64b342 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -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. --> diff --git a/res/values/styles.xml b/res/values/styles.xml index 1eb46a311..054b4b011 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -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 --> |