Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix an issue on hardcoded alarm settings intent"

Browse Source
This commit is contained in:
Satoshi Kataoka
2013-07-19 03:26:52 +00:00
committed by Android (Google) Code Review
parent 4231185a2e c44f7a251a
commit c0743ec466
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/AndroidManifest.xml
View File

@@ -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"

8
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
View File

@@ -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() {