summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2013-09-0349-145/+201
| | | | | Change-Id: I83b41da7e78c17a16343186b0cd5762e31d119b4 Auto-generated-cl: translation import
* Correcting right/end margin for cities fast scrollJames Kung2013-08-301-2/+0
| | | | Change-Id: I7c4bf37731d7af2d7c03e05d3fd26e4704ab1aef
* Merge "base align AM/PM in AlarmAlertFullScreen" into ics-ub-clock-amazonRobyn Coultas2013-08-302-2/+2
|\
| * base align AM/PM in AlarmAlertFullScreenRobyn Coultas2013-08-302-2/+2
| | | | | | | | Change-Id: Ie020037909c5720ed013e0782163e0e7fa0ff5d2
* | Merge "Change text of auto-silenced alarm notification." into ↵Sam Blitzstein2013-08-301-1/+2
|\ \ | | | | | | | | | ics-ub-clock-amazon
| * | Change text of auto-silenced alarm notification.Sam Blitzstein2013-08-291-1/+2
| | | | | | | | | | | | | | | | | | | | | Show "Missed Alarm" as the title. Bug: 10516179 Change-Id: I860cbab622df0be7c4c8e0763c3e6be231f8a09f
* | | Disable +1m button when cannot add a minuteIsaac Katzenelson2013-08-291-0/+2
| |/ |/| | | | | | | | | | | | | Bug: 10152084 Added a disabled asset. Disable +1m button is the timer is less than 60 seconds below the max Change-Id: Ib6dc57ffddf267b5bd8bac7d45e3b1b2af2695ea
* | Merge "Remove ZeroTopPaddingTextView" into ics-ub-clock-amazonRobyn Coultas2013-08-292-6/+6
|\ \
| * | Remove ZeroTopPaddingTextViewRobyn Coultas2013-08-292-6/+6
| |/ | | | | | | Change-Id: Idf8ee52846e90c9fb7f88a7b12a84c8808912ff8
* | Add disabled state to lap buttonIsaac Katzenelson2013-08-291-0/+2
| | | | | | | | | | Bug: 10151089 Change-Id: I8c7a921447427ecc0608ace2f19dc38ae4aa3064
* | Merge "Adding more resources." into ics-ub-clock-amazonIsaac Katzenelson2013-08-2920-0/+0
|\ \ | |/ |/|
| * Adding more resources.Sam Blitzstein2013-08-2820-0/+0
| | | | | | | | | | | | | | New disabled lap and plusone button states. New timer tab icon. Change-Id: Ide2897f919a8a868cccdb26dcafa0997e1892d96
* | Merge "Update widget styling." into ics-ub-clock-amazonPaul Sliwowski2013-08-298-138/+145
|\ \
| * | Update widget styling.Paul Sliwowski2013-08-288-138/+145
| |/ | | | | | | | | Bug: 10220536 Change-Id: I9a7188aad76c29ddc7ad244273bb7cdc76248e97
* | Merge "Basic animation for stopwatch -" into ics-ub-clock-amazonRobyn Coultas2013-08-295-5/+24
|\ \
| * | Basic animation for stopwatch -Robyn Coultas2013-08-285-5/+24
| |/ | | | | | | | | Stopwatch moves from center to start for landscape or top for portrait Change-Id: If6e059bdfba2f747349c53230daaa7a9e26dcc5c
* | Merge "Import translations. DO NOT MERGE" into ics-ub-clock-amazonBaligh Uddin2013-08-2949-4/+102
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-08-2849-4/+102
| |/ | | | | | | | | Change-Id: Ie2e2fa958d393932a58c7bbdc92a0de1703ba0e8 Auto-generated-cl: translation import
* | Merge "Fix delete after use implementation for timers" into ics-ub-clock-amazonIsaac Katzenelson2013-08-281-0/+3
|\ \
| * | Fix delete after use implementation for timersIsaac Katzenelson2013-08-281-0/+3
| |/ | | | | | | | | Bug: 10517026 Change-Id: I35f450dcfa379df92dbdfd997a351056e9233f41
* / Replace timer/stopwatch diamond with dotRobyn Coultas2013-08-281-1/+1
|/ | | | Change-Id: I8e845a4ffa9a25969fbfa1ef0fd1d22718130050
* Merge "Upgrading icons." into ics-ub-clock-amazonSam Blitzstein2013-08-2819-46/+58
|\
| * Upgrading icons.Sam Blitzstein2013-08-2719-46/+58
| | | | | | | | | | | | Upgraded stopwatch lap, add cities, timer tab, and no_alarms icons. Change-Id: I19f2c600893b94592701a8ca6b33ee5f280c549e
* | Merge "Pre-redline changes for adding a timer" into ics-ub-clock-amazonRobyn Coultas2013-08-287-342/+132
|\ \ | |/ |/|
| * Pre-redline changes for adding a timerRobyn Coultas2013-08-277-342/+132
| | | | | | | | | | | | Removed unused time picker code for alarms. Change-Id: Id61ab416a51db044de7ac29a3263f0db51d73083
* | Merge "Alarm timeline view" into ics-ub-clock-amazonJames Kung2013-08-286-10/+172
|\ \
| * | Alarm timeline viewJames Kung2013-08-276-10/+172
| | | | | | | | | | | | Change-Id: Id0c31d5dbe1a1cd02c0af6f02050efc36986dfee
* | | Merge "Import translations. DO NOT MERGE" into ics-ub-clock-amazonBaligh Uddin2013-08-2849-187/+902
|\ \ \ | |_|/ |/| |
| * | Import translations. DO NOT MERGEBaligh Uddin2013-08-2649-187/+902
| | | | | | | | | | | | | | | Change-Id: Ib5871c13d77eeba7fb3ff741033e8a783c80fca4 Auto-generated-cl: translation import
* | | Change alarm/timer setup font from bold to lightRobyn Coultas2013-08-274-149/+124
| |/ |/| | | | | | | | | | | | | Moved units to bottom Moved common setup layout into timer_h_mm_ss_view.xml Removed references to ZeroTopPaddingTextView from alarm/timer setup. Change-Id: Iefa9fa06be6098c9e7bd55ad943b84ac8cd760a7
* | Merge "Fix up layout changes as per redlines." into ics-ub-clock-amazonSam Blitzstein2013-08-2714-105/+147
|\ \
| * | Fix up layout changes as per redlines.Sam Blitzstein2013-08-2614-105/+147
| |/ | | | | | | Change-Id: I3f48a9e919312a99b455cd8634b749dc6cbffcc5
* / Adding additional assets.Sam Blitzstein2013-08-2620-0/+0
|/ | | | Change-Id: Ic80ea4cdc8c10bf2be0972ea129cb23292255c0d
* Preparation for animations if Timer and StopwatchRobyn Coultas2013-08-234-168/+45
| | | | | | | | | | | | | Converted CircleButtonsLinearLayout to FrameLayout and renamed CircleTimerView: always draw circle in view center CountingTimerView: remeasure text size if view's size changed StopwatchFragment: some lint cleanup in the layouts: remove unneeded layout id and attributes remove unneeded layout layer in timer_list_item remove unneeded landscape timer_list_item Change-Id: Id67e1120c86679c03b55f5b6d714cac233d37842
* Red checkbox asset fixJames Kung2013-08-233-2/+2
| | | | | Bug: 10446786 Change-Id: Ida2b978c017205958f2dc7d0e176fc5c383ff307
* Move alarm to its own tab.Sam Blitzstein2013-08-2225-317/+453
| | | | | | Also animate alarm expansion. Change-Id: Icdebc6a18f34cfe55af70491d07dde4b1dc675c5
* Merge "Import translations. DO NOT MERGE" into ics-ub-clock-amazonBaligh Uddin2013-08-2249-10/+206
|\
| * Import translations. DO NOT MERGEBaligh Uddin2013-08-2149-10/+206
| | | | | | | | | | Change-Id: I2fe1731a316c37758a3adfb277fc37e4a9603a33 Auto-generated-cl: translation import
* | Adding new png files.Sam Blitzstein2013-08-21188-0/+0
| | | | | | | | Change-Id: Ie5f89d279fac1b5cfbd380ad794c49afa44781a0
* | Red fast scroll thumb drawableJames Kung2013-08-214-0/+28
| | | | | | | | Change-Id: Ieb883071d246ee30171ffbcd92895715ff398354
* | Merge "Appending selected cities to top of list" into ics-ub-clock-amazonJames Kung2013-08-211-0/+3
|\ \
| * | Appending selected cities to top of listJames Kung2013-08-211-0/+3
| | | | | | | | | | | | Change-Id: Idacf1acbe72fb9e9ce14f2dd102369641c3013b1
* | | More visible red checkboxesJames Kung2013-08-215-2/+2
|/ / | | | | | | Change-Id: I7bcf9825f05151985cd912d06d73da65a3978e1e
* / Red checkboxesJames Kung2013-08-214-0/+25
|/ | | | Change-Id: I57d958ab10aa4e8cd0807d7fdeaffad01a628eac
* Merge "Cities sort options" into ics-ub-clock-amazonJames Kung2013-08-203-1/+8
|\
| * Cities sort optionsJames Kung2013-08-203-1/+8
| | | | | | | | Change-Id: I3bb7337f8ca0315882a8a5747c012da25f0c451f
* | Remove dead activity.Paul Sliwowski2013-08-151-39/+0
|/ | | | Change-Id: If94d399470d69f51fad4e968e4473f305343faa9
* City Search functionalityJames Kung2013-08-143-28/+28
| | | | Change-Id: I8ec790fe7adf59f81caf74af8be50d2fcfbd6b99
* Fix RTL layouts in alarm timeRobyn Coultas2013-08-131-1/+2
| | | | | | | The English ringtone name was rendered on the left instead of next to icon. The Repeat On/Off was rendered on left instead of start. Change-Id: Ia02db61f3c4c8b5d90ee6c6f7d5cfae14579cde7
* Use locale for :00/:60 buttons in AlarmRobyn Coultas2013-08-076-3/+8
| | | | | | | Bug:8556721 Also abstracted the dialog background color that contained the buttons. Change-Id: Ib5fc698ab0354668005065934fda60bb6d73f02f