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

Commit 0e4633a7 authored by Jorge Ruesga's avatar Jorge Ruesga Committed by Danny Baumann
Browse files

DeskClock: Add an option to switch profile 

This change creates a new setting for the alarm, that allows to associate
a profile with an alarm, and change to this profile when the alarm triggers.

Patchset 2: Added Danny's suggestions
Patchset 3: Cleanup

Requires http://review.cyanogenmod.org/#/c/38224

Change-Id: Ie2be32fc1ce4c7087eea87a3e289a38e85d3de7e
JIRA: CYAN-210
Issue: https://jira.cyanogenmod.org/browse/CYAN-210


Signed-off-by: default avatarJorge Ruesga <jorge@ruesga.com>
parent 00a7d92e

Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ LOCAL_PACKAGE_NAME := DeskClock 


LOCAL_OVERRIDES_PACKAGES := AlarmClock



LOCAL_SDK_VERSION := 17



LOCAL_PROGUARD_FLAG_FILES := proguard.flags



include $(BUILD_PACKAGE)

res/drawable-hdpi/ic_profile.png

0 → 100644
+1.08 KiB
Loading image diff...

res/drawable-mdpi/ic_profile.png

0 → 100644
+721 B
Loading image diff...

res/drawable-xhdpi/ic_profile.png

0 → 100644
+1.72 KiB
Loading image diff...

res/layout/alarm_time.xml

+19 −2
Original line number Diff line number Diff line
@@ -190,6 +190,23 @@ 
                android:drawableLeft="@drawable/ic_ringtone"

                android:drawablePadding="2dp"

                />

            <TextView

                android:id="@+id/choose_profile"

                android:layout_height="match_parent"

                android:layout_width="match_parent"

                android:layout_marginBottom="10dp"

                style="@style/body"

                android:background="@drawable/item_background"

                android:clickable="true"

                android:textColor="@color/clock_white"

                android:ellipsize="marquee"

                android:scrollHorizontally="true"

                android:singleLine="true"

                android:marqueeRepeatLimit="marquee_forever"

                android:drawableLeft="@drawable/ic_profile"

                android:drawablePadding="2dp"

                android:layout_below="@id/choose_ringtone"

                />

            <CheckBox

                android:id="@+id/vibrate_onoff"

                android:text="@string/alarm_vibrate"
@@ -197,7 +214,7 @@ 
                android:textColor="@color/clock_gray"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_below="@id/choose_ringtone"

                android:layout_below="@id/choose_profile"

                android:layout_alignParentLeft="true"

                android:layout_marginRight="10dp"

                style="@style/body"/>
@@ -208,7 +225,7 @@ 
                android:textColor="@color/clock_gray"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_below="@id/choose_ringtone"

                android:layout_below="@id/choose_profile"

                android:layout_toRightOf="@id/vibrate_onoff"

                android:maxLines="1"

                android:ellipsize="end"