Remove DataModel.getSharedPreferences()

Bug: 33251787

All access to SharedPreferences now occurs privately within
DataModel and UiDataModel. This ensures SharedPreferences
are created precisely once and cached in member variables
(in the delegate models behind DataModel). Tests can now be
isolated from each other by rebuilding those delegate models.

Change-Id: Ie7bf69bed13be1604e73dca6058877bc05e8afea

1 files changed, 37 insertions, 0 deletions

diff --git a/src/com/android/deskclock/data/SettingsModel.java b/src/com/android/deskclock/data/SettingsModel.java
index 21e928f0f..c02befa1f 100644
--- a/src/com/android/deskclock/data/SettingsModel.java
+++ b/src/com/android/deskclock/data/SettingsModel.java
@@ -22,6 +22,7 @@ import android.net.Uri;
 
 import com.android.deskclock.R;
 import com.android.deskclock.Utils;
+import com.android.deskclock.data.DataModel.AlarmVolumeButtonBehavior;
 import com.android.deskclock.data.DataModel.CitySort;
 import com.android.deskclock.data.DataModel.ClockStyle;
 
@@ -49,6 +50,14 @@ final class SettingsModel {
         SettingsDAO.setDefaultDisplayClockSeconds(mContext, prefs);
     }
 
+    int getGlobalIntentId() {
+        return SettingsDAO.getGlobalIntentId(mPrefs);
+    }
+
+    void updateGlobalIntentId() {
+        SettingsDAO.updateGlobalIntentId(mPrefs);
+    }
+
     CitySort getCitySort() {
         return SettingsDAO.getCitySort(mPrefs);
     }
@@ -109,6 +118,18 @@ final class SettingsModel {
         return SettingsDAO.getTimerRingtoneUri(mPrefs, getDefaultTimerRingtoneUri());
     }
 
+    AlarmVolumeButtonBehavior getAlarmVolumeButtonBehavior() {
+        return SettingsDAO.getAlarmVolumeButtonBehavior(mPrefs);
+    }
+
+    int getAlarmTimeout() {
+        return SettingsDAO.getAlarmTimeout(mPrefs);
+    }
+
+    int getSnoozeLength() {
+        return SettingsDAO.getSnoozeLength(mPrefs);
+    }
+
     Uri getDefaultAlarmRingtoneUri() {
         return SettingsDAO.getDefaultAlarmRingtoneUri(mPrefs);
     }
@@ -117,10 +138,26 @@ final class SettingsModel {
         SettingsDAO.setDefaultAlarmRingtoneUri(mPrefs, uri);
     }
 
+    long getAlarmCrescendoDuration() {
+        return SettingsDAO.getAlarmCrescendoDuration(mPrefs);
+    }
+
+    long getTimerCrescendoDuration() {
+        return SettingsDAO.getTimerCrescendoDuration(mPrefs);
+    }
+
     Weekdays.Order getWeekdayOrder() {
         return SettingsDAO.getWeekdayOrder(mPrefs);
     }
 
+    boolean isRestoreBackupFinished() {
+        return SettingsDAO.isRestoreBackupFinished(mPrefs);
+    }
+
+    void setRestoreBackupFinished(boolean finished) {
+        SettingsDAO.setRestoreBackupFinished(mPrefs, finished);
+    }
+
     boolean getTimerVibrate() {
         return SettingsDAO.getTimerVibrate(mPrefs);
     }