TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-30 13:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #668 from m0jo/master

Browse Source 
Fix missing localozation strings for custom LED blink pattern.
This commit is contained in:
Moxie Marlinspike 2014-02-25 08:37:38 -08:00
commit dda8a214a4
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/led_pattern_dialog.xml
View File

@ -29,7 +29,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/SeekBarOnLabel" android:id="@+id/SeekBarOnLabel"
android:text="On For:" android:text="@string/preferences__pref_led_blink_custom_pattern_on_for"
android:paddingTop="5sp" /> android:paddingTop="5sp" />
<TextView <TextView
android:id="@+id/SeekBarOnMsLabel" android:id="@+id/SeekBarOnMsLabel"
@ -65,7 +65,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/SeekBarOffLabel" android:id="@+id/SeekBarOffLabel"
android:text="Off For:" android:text="@string/preferences__pref_led_blink_custom_pattern_off_for"
android:paddingTop="5sp" /> android:paddingTop="5sp" />
<TextView <TextView
android:id="@+id/SeekBarOffMsLabel" android:id="@+id/SeekBarOffMsLabel"

4
res/values/strings.xml
View File

@ -644,6 +644,10 @@
<string name="preferences__display_message_notifications_in_status_bar">Display message notifications in status bar</string> <string name="preferences__display_message_notifications_in_status_bar">Display message notifications in status bar</string>
<string name="preferences__led_color">LED color</string> <string name="preferences__led_color">LED color</string>
<string name="preferences__pref_led_blink_title">LED blink pattern</string> <string name="preferences__pref_led_blink_title">LED blink pattern</string>
<string name="preferences__pref_led_blink_custom_pattern_title">Set custom LED Blink Pattern</string>
<string name="preferences__pref_led_blink_custom_pattern_on_for">On For:</string>
<string name="preferences__pref_led_blink_custom_pattern_off_for">Off For:</string>
<string name="preferences__pref_led_blink_custom_pattern_set">Custom LED blink pattern set!</string>
<string name="preferences__sound">Sound</string> <string name="preferences__sound">Sound</string>
<string name="preferences__change_notification_sound">Change notification sound</string> <string name="preferences__change_notification_sound">Change notification sound</string>
<string name="preferences__inthread_notifications">In-thread notifications</string> <string name="preferences__inthread_notifications">In-thread notifications</string>

4
src/org/thoughtcrime/securesms/preferences/LedBlinkPatternListPreference.java
View File

@ -82,7 +82,7 @@ public class LedBlinkPatternListPreference extends ListPreference implements OnS
private void initializeDialog(View view) { private void initializeDialog(View view) {
AlertDialog.Builder builder = new AlertDialog.Builder(context); AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setIcon(android.R.drawable.ic_dialog_info); builder.setIcon(android.R.drawable.ic_dialog_info);
builder.setTitle("Set Custom LED Blink Pattern"); builder.setTitle(R.string.preferences__pref_led_blink_custom_pattern_title);
builder.setView(view); builder.setView(view);
builder.setOnCancelListener(new CustomDialogCancelListener()); builder.setOnCancelListener(new CustomDialogCancelListener());
builder.setNegativeButton(android.R.string.cancel, new CustomDialogCancelListener()); builder.setNegativeButton(android.R.string.cancel, new CustomDialogCancelListener());
@ -154,7 +154,7 @@ public class LedBlinkPatternListPreference extends ListPreference implements OnS
dialogInProgress = false; dialogInProgress = false;
TextSecurePreferences.setNotificationLedPatternCustom(context, pattern); TextSecurePreferences.setNotificationLedPatternCustom(context, pattern);
Toast.makeText(context, "Custom LED blink pattern set!", Toast.LENGTH_LONG).show(); Toast.makeText(context, R.string.preferences__pref_led_blink_custom_pattern_set, Toast.LENGTH_LONG).show();
} }
} }