use material labels for passphrase text

closes #3374
Closes #4570
// FREEBIE
This commit is contained in:
Jake McGinty
2015-11-16 17:39:13 -08:00
committed by Moxie Marlinspike
parent 245c0adeea
commit 25da3525fa
7 changed files with 47 additions and 52 deletions

View File

@@ -84,8 +84,6 @@
<attr name="encrypted_backup" format="reference" />
<attr name="plaintext_backup" format="reference" />
<attr name="registration_text_shadow_color" format="color" />
<attr name="reminder_header_background" format="color"/>
<attr name="menu_new_conversation_icon" format="reference" />

View File

@@ -576,9 +576,9 @@
<string name="attachment_type_selector__camera">Camera</string>
<!-- change_passphrase_activity -->
<string name="change_passphrase_activity__old_passphrase">OLD PASSPHRASE:</string>
<string name="change_passphrase_activity__new_passphrase">NEW PASSPHRASE:</string>
<string name="change_passphrase_activity__repeat_new_passphrase">REPEAT NEW PASSPHRASE:</string>
<string name="change_passphrase_activity__old_passphrase">Old passphrase</string>
<string name="change_passphrase_activity__new_passphrase">New passphrase</string>
<string name="change_passphrase_activity__repeat_new_passphrase">Repeaet new passhprase</string>
<!-- contact_selection_activity -->
<string name="contact_selection_activity__enter_name_or_number">Enter name or number</string>

View File

@@ -122,11 +122,11 @@
<item name="android:textSize">12.0sp</item>
<item name="android:typeface">sans</item>
<item name="android:textStyle">normal</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:textColor">#ff808080</item>
<item name="android:gravity">left</item>
<item name="android:layout_gravity">left</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:shadowColor">?registration_text_shadow_color</item>
<item name="android:shadowColor">#ffffff</item>
<item name="android:shadowDx">1.0</item>
<item name="android:shadowDy">1.0</item>
<item name="android:shadowRadius">0.0</item>

View File

@@ -181,8 +181,6 @@
<item name="conversation_icon_attach_audio">@drawable/ic_audio_light</item>
<item name="conversation_icon_attach_video">@drawable/ic_video_light</item>
<item name="registration_text_shadow_color">@color/gray95</item>
<item name="reminder_header_background">#ff1d85d7</item>
<item name="pref_ic_sms_mms">@drawable/ic_textsms_black_32dp</item>
@@ -296,8 +294,6 @@
<item name="conversation_icon_attach_audio">@drawable/ic_audio_dark</item>
<item name="conversation_icon_attach_video">@drawable/ic_video_dark</item>
<item name="registration_text_shadow_color">@color/gray13</item>
<item name="reminder_header_background">@color/textsecure_primary_dark</item>
<item name="pref_ic_sms_mms">@drawable/ic_textsms_grey_32dp</item>