Merge "Use correct string for alarm and notification"
diff --git a/res/layout-watch/add_ringtone_item.xml b/res/layout-watch/add_new_sound_item.xml
similarity index 96%
rename from res/layout-watch/add_ringtone_item.xml
rename to res/layout-watch/add_new_sound_item.xml
index aef30e3..6f91d77 100644
--- a/res/layout-watch/add_ringtone_item.xml
+++ b/res/layout-watch/add_new_sound_item.xml
@@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:text="@string/add_ringtone_text"
+ android:text="@null"
android:textColor="?android:attr/colorAccent"
android:gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
diff --git a/res/layout/add_ringtone_item.xml b/res/layout/add_new_sound_item.xml
similarity index 94%
rename from res/layout/add_ringtone_item.xml
rename to res/layout/add_new_sound_item.xml
index aea1a2b..14421c9 100644
--- a/res/layout/add_ringtone_item.xml
+++ b/res/layout/add_new_sound_item.xml
@@ -32,11 +32,11 @@
android:src="@drawable/ic_add" />
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/add_ringtone_text"
+ android:id="@+id/add_new_sound_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
- android:text="@string/add_ringtone_text"
+ android:text="@null"
android:textColor="?android:attr/colorAccent"
android:textAppearance="?android:attr/textAppearanceMedium"
android:maxLines="3"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3672f52..336b654 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -73,6 +73,10 @@
<!-- Text for the RingtonePicker item that allows adding a new ringtone. -->
<string name="add_ringtone_text">Add ringtone</string>
+ <!-- Text for the RingtonePicker item that allows adding a new alarm. -->
+ <string name="add_alarm_text">Add alarm</string>
+ <!-- Text for the RingtonePicker item that allows adding a new notification. -->
+ <string name="add_notification_text">Add notification</string>
<!-- Text for the RingtonePicker item ContextMenu that allows deleting a custom ringtone. -->
<string name="delete_ringtone_text">Delete</string>
<!-- Text for the Toast displayed when adding a custom ringtone fails. -->
diff --git a/src/com/android/providers/media/RingtonePickerActivity.java b/src/com/android/providers/media/RingtonePickerActivity.java
index fffd830..95cac14 100644
--- a/src/com/android/providers/media/RingtonePickerActivity.java
+++ b/src/com/android/providers/media/RingtonePickerActivity.java
@@ -376,7 +376,7 @@
}
// If external storage is available, add a button to install sounds from storage.
if(Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
- addNewRingtoneItem(listView);
+ addNewSoundItem(listView);
}
// Enable context menu in ringtone items
@@ -440,9 +440,19 @@
return addStaticItem(listView, com.android.internal.R.string.ringtone_silent);
}
- private void addNewRingtoneItem(ListView listView) {
- listView.addFooterView(getLayoutInflater().inflate(R.layout.add_ringtone_item, listView,
- false /* attachToRoot */));
+ private void addNewSoundItem(ListView listView) {
+ View view = getLayoutInflater().inflate(R.layout.add_new_sound_item, listView,
+ false /* attachToRoot */);
+ TextView text = (TextView)view.findViewById(R.id.add_new_sound_text);
+
+ if (mType == RingtoneManager.TYPE_ALARM) {
+ text.setText(R.string.add_alarm_text);
+ } else if (mType == RingtoneManager.TYPE_NOTIFICATION) {
+ text.setText(R.string.add_notification_text);
+ } else {
+ text.setText(R.string.add_ringtone_text);
+ }
+ listView.addFooterView(view);
}
private void initRingtoneManager() {
