diff options
author | Satoshi Kataoka <satok@google.com> | 2013-05-22 08:54:56 +0900 |
---|---|---|
committer | Satoshi Kataoka <satok@google.com> | 2013-07-08 18:14:40 +0900 |
commit | c44f7a251a1e4480804dee4987ce9b6237f28a7d (patch) | |
tree | 6b3a5a5207a2888c49bf25f2a1dca16a1cb7fd92 /packages | |
parent | 38b2322567e2407753cc9a4bed626b3cc47ccece (diff) | |
download | frameworks_base-c44f7a251a1e4480804dee4987ce9b6237f28a7d.zip frameworks_base-c44f7a251a1e4480804dee4987ce9b6237f28a7d.tar.gz frameworks_base-c44f7a251a1e4480804dee4987ce9b6237f28a7d.tar.bz2 |
Fix an issue on hardcoded alarm settings intent
This change fixes a TODO to fix the behavior that the quick settings directly specifies a class of AOSP desk clock.
Currently the quick settings can't work with other alarm clocks and that's fixed by calling "android.intent.action.SET_ALARM" instead.
Change-Id: I028b8a320e945921c096fdc776b52441e7d07202
Diffstat (limited to 'packages')
-rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 3 | ||||
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index dfc68f4..2629b11 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -64,6 +64,9 @@ <uses-permission android:name="android.permission.READ_DREAM_STATE" /> <uses-permission android:name="android.permission.WRITE_DREAM_STATE" /> + <!-- Alarm clocks --> + <uses-permission android:name="com.android.alarm.permission.SET_ALARM" /> + <application android:persistent="true" android:allowClearUserData="false" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java index 9ee6065..a9c5c79 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java @@ -44,6 +44,7 @@ import android.os.Handler; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; +import android.provider.AlarmClock; import android.provider.ContactsContract; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.Profile; @@ -605,12 +606,7 @@ class QuickSettings { alarmTile.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - // TODO: Jump into the alarm application - Intent intent = new Intent(); - intent.setComponent(new ComponentName( - "com.google.android.deskclock", - "com.android.deskclock.AlarmClock")); - startSettingsActivity(intent); + startSettingsActivity(AlarmClock.ACTION_SET_ALARM); } }); mModel.addAlarmTile(alarmTile, new QuickSettingsModel.RefreshCallback() { |