summaryrefslogtreecommitdiffstats
path: root/res/values-sw600dp-land
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-5.1.0_r1' into merge-5.1Tom Marshall2015-03-121-2/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 5.1.0 release 1 Conflicts: res/layout/stopwatch_notif_collapsed.xml res/layout/stopwatch_notif_expanded.xml res/values-en-rIN/array.xml res/values-zh-rCN/array.xml res/values/array.xml src/com/android/deskclock/AlarmClockFragment.java src/com/android/deskclock/SettingsActivity.java src/com/android/deskclock/worldclock/CitiesActivity.java Change-Id: Ic861c90216b82290378be7072d6be760ef5be372
| * Merge "Align Stopwatch and Timer circles on landscape" into lmp-mr1-devBudi Kusmiantoro2014-11-131-0/+1
| |\
| | * Align Stopwatch and Timer circles on landscapeBudi Kusmiantoro2014-11-101-0/+1
| | | | | | | | | | | | | | | Bug: 18321312 Change-Id: I8248fd3ecb074226f288390fdf0b1fbe76819dbe
| * | Main clock UX polishBudi Kusmiantoro2014-11-101-1/+2
| |/ | | | | | | | | Bug: 18100937 Change-Id: Id37b9a7cadf6d31fe1c986b0d3d10516151ac0ff
| * Stopwatch lap list to continue behind FABBudi Kusmiantoro2014-10-291-1/+1
| | | | | | | | | | | | | | | | Bug: 18119819 Also adjust laps_list position with layout_weight Change-Id: I5ef74b65b0cfe091eed99279c62d1771952142a2
* | DeskClock: Support double-digit hours for timersDaniel Danner2014-11-121-1/+1
|/ | | | Change-Id: I8aa4960c03d710ca7889c8d91701ca5b5376c9ef
* Update timer and stopwatch UXrachelzhang2014-09-111-11/+0
| | | | | | | Bug: 15758027 Bug: 15757778 Change-Id: I19e72adb33afa9815c9b5a57d1d7fb04e0ff0243
* Merge "Fix bug where "Loading..." is shown on digital appwidget" into lmp-devBudi Kusmiantoro2014-09-081-4/+0
|\
| * Fix bug where "Loading..." is shown on digital appwidgetBudi Kusmiantoro2014-09-071-4/+0
| | | | | | | | | | | | | | | | | | | | Bug: 17415325 Also includes: - Remove android:weigthSum from layout file - Clean up unneeded config overrides Change-Id: Ie6c0cf1e03eb25a70a9ab960296acafbba637608
* | UX polish on Alarm and Clock tabsBudi Kusmiantoro2014-09-051-10/+2
|/ | | | | Bug: 17381025 Change-Id: Iaa40ca5e0d029c62596ce1efaffa1019bcd56953
* UX polish on popup menu, font-size, settings pageBudi Kusmiantoro2014-09-031-3/+3
| | | | | | | | | | | | | Bug: 17382257 Bug: 17379149 Bug: 17379478 Bug: 17378160 - "selected cities" and "settings" title to be regular font - adjust digital clock font-sizes for phones and tablets - overflow menu to be fully opaque and have 2dp rounded corners Change-Id: Ib9fd53d73cda0e3b21be88ee3b49356b971956a0
* UX polish on stopwatch tabBudi Kusmiantoro2014-09-011-1/+2
| | | | | | | | | | | | | Bug: 17323596 Bug: 17135596 Includes: - Align the trash can to the keyline - Increase size of the circle in stopwatch screen on phones - UX polish for stopwatch on tablet landscape - Fix Fab bug on RTL Change-Id: Idc81684eab1d48476dd9c68832861a78af47256d
* Adjust font-size for digital clock AM/PMBudi Kusmiantoro2014-08-291-1/+0
| | | | | Bug: 17324475 Change-Id: I0f0dd0e365e48e4e0f907841c7f98689167d55fc
* Polish clock tablet layout, remove timelinerachelzhang2014-08-211-1/+1
| | | | | | Bug: 17134267 Change-Id: Ie22a9696b3f85b3f47544800f84546b77e564c82
* Massive polish of clock UIrachelzhang2014-08-181-1/+1
| | | | | | | | | | | Bug: 15757778 * Change theme color from pink to green * Change world clock single row layout * Update to quantum assets / fonts * Fix few bugs Change-Id: I796decb8469b7d3c1e944f77c41b7c5af5d81a36
* Fab for clock apprachelzhang2014-08-071-0/+2
| | | | | | Bug:16824066 Change-Id: Ifa3d0af09a07ca85fdb3b77dc9a9a4da5173537d
* Hide bottom bar in landscape.Sam Blitzstein2013-09-101-0/+3
| | | | | | | This way we can make sure analog clock has enough space. Bug: 10691481 Change-Id: I2075238965fcff2574ffbf3405299378b8cf3c51
* Use two-pane layout for tablet landscape world clocks.Sam Blitzstein2013-09-072-0/+5
| | | | | Bug: 10654098 Change-Id: I3825ed5a503b6d48d935d439bdb7afd3391ed0da
* timer setup redlinesRobyn Coultas2013-09-061-0/+7
| | | | | | | | Red line deviations: Gutter between dial pad digits removed In landscape time view is centered with dial pad Change-Id: Ic34c77a6bf38c3ff80b9b2a6a9e30213facb9e90
* Use Keep's StaggeredGridView for timers.Sam Blitzstein2013-09-061-0/+24
| | | | | | | Also update header and background layouts. Bug: 10516184 Change-Id: Ibe73ce965acb11796c21e9df4b35e6bb830aabb3
* Basic animation for stopwatch -Robyn Coultas2013-08-281-1/+1
| | | | | Stopwatch moves from center to start for landscape or top for portrait Change-Id: If6e059bdfba2f747349c53230daaa7a9e26dcc5c
* Fix up layout changes as per redlines.Sam Blitzstein2013-08-261-1/+0
| | | | Change-Id: I3f48a9e919312a99b455cd8634b749dc6cbffcc5
* Clock widget scaling and dimensions.Robyn Coultas2013-07-011-4/+0
| | | | | | | | | | BUG: 9519509 BUG: 9533414 Increased complexity of scaling calculation to improve result. Check vertical scaling when height is small (as in landscape.) Change-Id: Ieb9944b338574830ef1fba6bfe802086148f5751 (cherry picked from commit 4de68a069a2cfa950a68ced808a3361c782071e0)
* Tweak layouts for digital clock widget.Isaac Katzenelson2012-12-051-1/+3
| | | | | | | | Bug: 7500729 Change widget to scale according to height on top of scaling of width. Change-Id: Ia90031d3585178f66ee40490c7bf7f7b93503e41
* Aligning columns in stopwatch lap timesRobyn Coultas2012-11-291-1/+4
| | | | | | | | | | | | | | | | | Bug: 7282042 Bug: 7539981 margin between total and lap times string-array format for lap# and lap,total times lap display centered in portrait optimized landscape layout to give more room for list using '#' instead of 'LAP' removed unneeded margins on world clock; new dimen for timer margins char limit on "Lap" and the hour, minute, second abbreviations sw list handles times up to 1k hours circle handles times up to 1k hours Change-Id: If4e884ffd7b87986024c6d5a5990e529b1d6d736
* Expand top margin for digital clockIsaac Katzenelson2012-11-161-1/+1
| | | | | Bug: 7429201 Change-Id: I9621bac26f357f22d61f9340089bb44961b7a540
* Fix widget layoutsIsaac Katzenelson2012-11-061-0/+1
| | | | | | | | | | Bug: 7469622, 7482384 Fixed layouts and set a minimum height for showing the world clock list to avoid a list with only one cut off item. Fixed 12h/24h settings. Change-Id: Ie8a195de93c8bcda61e5a07415852a3e5e91faf3
* Adding unlock-like slider control for alarm dismiss/snooze.Chiao Cheng2012-10-161-0/+3
| | | | | | | | | | | | | This is a re-addition of something that was previously added and then removed: I65be41b889446ae7232488bfc2809bd2add93f6f - Ported GlowPadView and helper classes over to clock app. Framework version relies on a couple hidden api's so there are minor changes to the code. - Added necessary drawables to support slider. - Added special paddings for 7" and 10" tablet. Bug: 7353387 Change-Id: I6101bebdb4be6f0208d171fbfadc4317f9fac675
* Fix broken layoutsIsaac Katzenelson2012-10-081-0/+1
| | | | | Bug: 7265721 Change-Id: I8bca6ec720ca55cfa13ab5d03495c2de09641c35
* fixing global clock layouts on main framePeter Ng2012-10-071-1/+2
| | | | | | | | | | -next alarm now using correct style -set alarm buttons are bigger -analog and digital layouts are centered normally now by removing offset of pm and am Bug: 7302666 Change-Id: Id5818b1b8cf69555fc79e3aec3fe3dbe2f1f0926
* Moving buttons for timer and stopwatch to the circle.Sam Blitzstein2012-10-071-1/+9
| | | | | | | | | | | | Also: Ifa31068794c1bd94dfe2cf0d9234a80082375617 Fixed merge and usability problem in red-line. Bug: 7257616 Bug: 7238147 Bug: 7238185 Bug: 7271163 Change-Id: I0ec99a83ba5bdefbd175361829fd96e48c1d5a32
* Layout fixesIsaac Katzenelson2012-10-051-1/+1
| | | | | Bug: 7265721 Change-Id: I3891bae699c25e65f7217a071d07309056c4dafb
* Making tablet layouts work and spaced out evenlyPeter Ng2012-10-031-1/+7
| | | | Change-Id: Ie17cce096b50161bb51fb9c279bf42235e003646
* changed the spacing within the time display clockRobyn Coultas2012-09-271-2/+2
| | | | | | bug 7178483 Change-Id: I6c851c7b0e332dd55e92464bdf831968612f60a8
* Adding unlock-like slider control for alarm dismiss/snooze.Chiao Cheng2012-09-261-8/+10
| | | | | | | | | | | | | - Ported GlowPadView and helper classes over to clock app. Framework version relies on a couple hidden api's so there are minor changes to the code. - Added necessary drawables to support slider. - Updated proguard flags so that introspected animation methods are not stripped from slider widget. - Changed lock screen view to be consistent with normal activity since existing landscape width is not wide enough to hold new layout. Removed the need for AlarmAlert. Using only AlarmAlertFullScreen now. Change-Id: I65be41b889446ae7232488bfc2809bd2add93f6f
* New deskclockIsaac Katzenelson2012-09-071-0/+1
| | | | Change-Id: I27f066b7fbc29eb3d4988a6aa901a6c9909fbcca
* Improvements to the DeskClock dream.Daniel Sandler2012-08-081-1/+1
| | | | | | | | | | | - simplify layouts (removing a number of obsolete sw600 ones) - add a clickable alarm button way down in the corner, to let you see your alarm info TODO: Add another little button for dim mode. Change-Id: Ibc8e44a33c2a934e485277868c77356eb4250194
* Decrease clock font size by 10% for sw600dp devices.John Spurlock2012-05-161-2/+2
| | | | | | Bug: 6382051 Bug: 6448991 Change-Id: I43dac7a7a87cbfc00b5919a5cacf8347b9a16dc0
* b/5596073 Make the time font size not scale.RoboErik2011-11-101-1/+1
| | | | | | It's already as big as it can go, so don't scale it bigger. Change-Id: I7ce7b8795d1c991b9242cc04a80cb75ea77a9914
* b/5290365 Clock red lines updateErik2011-09-131-2/+2
| | | | Change-Id: Ie4b3f5fbb9cf9b13e6ad8fe4ee6c3591e20ad07e
* b/5169523 Adjust am/pm layout for roboto fontsErik2011-08-311-1/+2
| | | | Change-Id: Ibcfb67e1b49612b932dc7c15cefb0314f6225c05
* b/5076132 Work on matching clock redlinesErik2011-08-251-0/+32
Also rips out a lot of now unused code. Change-Id: Idd3f9dd0d3a1395897ea7c8b0926d09da5cb1794