diff options
| author | Artem Shvadskiy <ashvadskiy@cyngn.com> | 2016-07-25 14:38:33 -0700 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2018-01-21 21:57:19 +0200 |
| commit | f7188a446f1fe03c681b637fc60838cf72e23861 (patch) | |
| tree | a5e2c18186642e7748526c4e15b10eeb4853d157 /src/com/android/messaging/datamodel/data/PeopleOptionsItemData.java | |
| parent | e910faa9818607b1fb19d29c2176e09e9df19abe (diff) | |
| download | android_packages_apps_Messaging-f7188a446f1fe03c681b637fc60838cf72e23861.tar.gz android_packages_apps_Messaging-f7188a446f1fe03c681b637fc60838cf72e23861.tar.bz2 android_packages_apps_Messaging-f7188a446f1fe03c681b637fc60838cf72e23861.zip | |
Use app settings for conversation settings if no custom set
Change-Id: I07adfd75c465ae40e477470d66587df21d560c4d
issue-id: FEIJ-1291
Diffstat (limited to 'src/com/android/messaging/datamodel/data/PeopleOptionsItemData.java')
| -rw-r--r-- | src/com/android/messaging/datamodel/data/PeopleOptionsItemData.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/messaging/datamodel/data/PeopleOptionsItemData.java b/src/com/android/messaging/datamodel/data/PeopleOptionsItemData.java index 5af6a30..b24ca55 100644 --- a/src/com/android/messaging/datamodel/data/PeopleOptionsItemData.java +++ b/src/com/android/messaging/datamodel/data/PeopleOptionsItemData.java @@ -24,6 +24,7 @@ import android.net.Uri; import com.android.messaging.R; import com.android.messaging.datamodel.data.ConversationListItemData.ConversationListViewColumns; import com.android.messaging.util.Assert; +import com.android.messaging.util.NotificationUtil; import com.android.messaging.util.RingtoneUtil; public class PeopleOptionsItemData { @@ -78,7 +79,8 @@ public class PeopleOptionsItemData { mItemId = settingType; mOtherParticipant = otherParticipant; - final boolean notificationEnabled = cursor.getInt(INDEX_NOTIFICATION_ENABLED) == 1; + final boolean notificationEnabled = NotificationUtil + .getConversationNotificationEnabled(cursor.getInt(INDEX_NOTIFICATION_ENABLED)); switch (settingType) { case SETTING_NOTIFICATION_ENABLED: mTitle = mContext.getString(R.string.notifications_enabled_conversation_pref_title); @@ -104,7 +106,8 @@ public class PeopleOptionsItemData { case SETTING_NOTIFICATION_VIBRATION: mTitle = mContext.getString(R.string.notification_vibrate_pref_title); - mChecked = cursor.getInt(INDEX_NOTIFICATION_VIBRATION) == 1; + mChecked = NotificationUtil.getConversationNotificationVibrateEnabled( + cursor.getInt(INDEX_NOTIFICATION_VIBRATION)); mEnabled = notificationEnabled; break; |