Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0743ec4 authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android (Google) Code Review
Browse files

Merge "Fix an issue on hardcoded alarm settings intent"

parents 4231185a c44f7a25

packages/SystemUI/AndroidManifest.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -64,6 +64,9 @@ 
    <uses-permission android:name="android.permission.READ_DREAM_STATE" />

    <uses-permission android:name="android.permission.READ_DREAM_STATE" />

    <uses-permission android:name="android.permission.WRITE_DREAM_STATE" />

    <uses-permission android:name="android.permission.WRITE_DREAM_STATE" />





    <!-- Alarm clocks -->

    <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />



    <application

    <application

        android:persistent="true"

        android:persistent="true"

        android:allowClearUserData="false"

        android:allowClearUserData="false"

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

+2 −6
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ import android.os.Handler; 
import android.os.RemoteException;

import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.UserManager;

import android.provider.AlarmClock;

import android.provider.ContactsContract;

import android.provider.ContactsContract;

import android.provider.ContactsContract.CommonDataKinds.Phone;

import android.provider.ContactsContract.CommonDataKinds.Phone;

import android.provider.ContactsContract.Profile;

import android.provider.ContactsContract.Profile;
@@ -605,12 +606,7 @@ class QuickSettings { 
        alarmTile.setOnClickListener(new View.OnClickListener() {

        alarmTile.setOnClickListener(new View.OnClickListener() {

            @Override

            @Override

            public void onClick(View v) {

            public void onClick(View v) {

                // TODO: Jump into the alarm application

                startSettingsActivity(AlarmClock.ACTION_SET_ALARM);

                Intent intent = new Intent();

                intent.setComponent(new ComponentName(

                        "com.google.android.deskclock",

                        "com.android.deskclock.AlarmClock"));

                startSettingsActivity(intent);

            }

            }

        });

        });

        mModel.addAlarmTile(alarmTile, new QuickSettingsModel.RefreshCallback() {

        mModel.addAlarmTile(alarmTile, new QuickSettingsModel.RefreshCallback() {