PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0aa79c73: am 60977265: Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev

Browse Source 
* commit '0aa79c73948af7600f289928b18b3231d9679f81':
  Use AlarmManager calls to set date/time, instead of SystemClock.setTime
This commit is contained in:
Amith Yamasani
2012-11-16 10:48:59 -08:00
committed by Android Git Automerger
parent 8761a0536b 0aa79c7394
commit 21b5aacf34
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

@@ -61,6 +61,7 @@
<uses-permission android:name="android.permission.MANAGE_USERS" />
<uses-permission android:name="android.permission.READ_PROFILE" />
<uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />
<uses-permission android:name="android.permission.SET_TIME" />
<application android:label="@string/settings_label"
android:icon="@mipmap/ic_launcher_settings"

13
src/com/android/settings/DateTimeSettings.java
View File

@@ -17,6 +17,7 @@
package com.android.settings;
import android.app.Activity;
import android.app.AlarmManager;
import android.app.DatePickerDialog;
import android.app.Dialog;
import android.app.TimePickerDialog;
@@ -188,18 +189,18 @@ public class DateTimeSettings extends SettingsPreferenceFragment
@Override
public void onDateSet(DatePicker view, int year, int month, int day) {
setDate(year, month, day);
final Activity activity = getActivity();
if (activity != null) {
setDate(activity, year, month, day);
updateTimeAndDateDisplay(activity);
}
}
@Override
public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
setTime(hourOfDay, minute);
final Activity activity = getActivity();
if (activity != null) {
setTime(activity, hourOfDay, minute);
updateTimeAndDateDisplay(activity);
}
@@ -341,7 +342,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment
}
}
/* package */ static void setDate(int year, int month, int day) {
/* package */ static void setDate(Context context, int year, int month, int day) {
Calendar c = Calendar.getInstance();
c.set(Calendar.YEAR, year);
@@ -350,11 +351,11 @@ public class DateTimeSettings extends SettingsPreferenceFragment
long when = c.getTimeInMillis();
if (when / 1000 < Integer.MAX_VALUE) {
SystemClock.setCurrentTimeMillis(when);
((AlarmManager) context.getSystemService(Context.ALARM_SERVICE)).setTime(when);
}
}
/* package */ static void setTime(int hourOfDay, int minute) {
/* package */ static void setTime(Context context, int hourOfDay, int minute) {
Calendar c = Calendar.getInstance();
c.set(Calendar.HOUR_OF_DAY, hourOfDay);
@@ -364,7 +365,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment
long when = c.getTimeInMillis();
if (when / 1000 < Integer.MAX_VALUE) {
SystemClock.setCurrentTimeMillis(when);
((AlarmManager) context.getSystemService(Context.ALARM_SERVICE)).setTime(when);
}
}

4
src/com/android/settings/DateTimeSettingsSetupWizard.java
View File

@@ -188,9 +188,9 @@ public class DateTimeSettingsSetupWizard extends Activity
Settings.Global.putInt(getContentResolver(), Settings.Global.AUTO_TIME,
mAutoDateTimeButton.isChecked() ? 1 : 0);
if (!mAutoDateTimeButton.isChecked()) {
DateTimeSettings.setDate(mDatePicker.getYear(), mDatePicker.getMonth(),
DateTimeSettings.setDate(this, mDatePicker.getYear(), mDatePicker.getMonth(),
mDatePicker.getDayOfMonth());
DateTimeSettings.setTime(
DateTimeSettings.setTime(this,
mTimePicker.getCurrentHour(), mTimePicker.getCurrentMinute());
}
}