93970 Commits

Author SHA1 Message Date
Baligh Uddin
aecee78916 Merge "Import translations. DO NOT MERGE" 2012-10-29 14:58:08 -07:00
Justin Koh
b5b183d574 am e8d85f6d: am 56d9696b: Merge "Expose PreferenceManager constructor / Preference#performClick" into jb-mr1-aah-dev
* commit 'e8d85f6d1f1ee957302b113f06a0b2f1aa9024fe':
  Expose PreferenceManager constructor / Preference#performClick
2012-10-29 13:43:19 -07:00
Jeff Brown
266ca72300 am 46a0ec73: am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
* commit '46a0ec73b6d4a81dd037d7beef7321f25349bf9c':
  Add MediaRouter API to get presentation display.
2012-10-29 13:43:14 -07:00
Daniel Sandler
c3089930d8 am 1b38ea48: am 6b2d4196: am 50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev
* commit '1b38ea484b3b474a6fcdfd817ec7234fb0596b98':
  Final icon for (Day)dreams.
2012-10-29 13:43:10 -07:00
Chris Wren
fb614e4002 am 3f47cd2b: am 592f6343: am f0fd172a: lock out clicks while switching.
* commit '3f47cd2bf541435468f0e8af53767d7c14fbb2f6':
  lock out clicks while switching.
2012-10-29 13:43:06 -07:00
John Spurlock
fd7b509ab9 am aa9aa440: am ee12f5aa: am 47cde77b: Fix camera bugs found overnight.
* commit 'aa9aa440cbe1526ffeafc1326b7a4d00e3b5f3d7':
  Fix camera bugs found overnight.
2012-10-29 13:42:58 -07:00
Adam Powell
215368103a am e7c8c76d: am 300772e6: am 6f35209e: Integrate assets from UX; drag/bouncer animation behavior in slider
* commit 'e7c8c76d4ae870c020d54925066323953ac88127':
  Integrate assets from UX; drag/bouncer animation behavior in slider
2012-10-29 13:42:54 -07:00
Jim Miller
06d76dcfdf am 2d1c6770: am 3dd3a41a: am 9b1db682: Fix issue where security view sometimes doesn\'t show.
* commit '2d1c6770e542891098f7678477558adcb06f1198':
  Fix issue where security view sometimes doesn't show.
2012-10-29 13:42:48 -07:00
Jim Miller
4ad329ce34 am ebda6cb0: am c8896dab: am a71984f3: Cleanup keyguard signals
* commit 'ebda6cb064a179893446889272ca5fd9d9c98097':
  Cleanup keyguard signals
2012-10-29 13:42:44 -07:00
Michael Jurka
ff9c65a2f1 am 6dd6d43a: am b1c5ec17: am 1254f2f4: Persist reordering/deleting widgets on keyguard
* commit '6dd6d43a8bf25ce5abe58f86c0ddae430ab96c4f':
  Persist reordering/deleting widgets on keyguard
2012-10-29 13:42:40 -07:00
Robert Ly
865517a798 am 6fbac907: am 1de0549f: am 6a8d6da9: am 148d4131: am 5b45e337: am d6bbf71d: am ea502b27: Merge "docs: animations au class" into jb-dev-docs
* commit '6fbac90720540756ddab72822b620891992afb50':
2012-10-29 13:42:37 -07:00
Jim Miller
f04139d1f3 am 42321210: am 33e62a80: am f90716c9: Merge "Route signals from SlidingChalleng to SecurityView" into jb-mr1-lockscreen-dev
* commit '42321210d0867db4e227a9b749e4a1f604d358f7':
  Route signals from SlidingChalleng to SecurityView
2012-10-29 13:42:33 -07:00
John Spurlock
faa9d31fe3 am 4d306987: am 33760695: am 7de482ba: am 5c87f533: Merge "Revert part of fix for b/7377776 to fix b/7411356." into jb-mr1-dev
* commit '4d3069878054cbdba3930a91119d3dbbf871255d':
2012-10-29 13:42:29 -07:00
Adam Powell
ab9c9264ea am 79cec380: am 0d980a3b: am 0b1b5522: Keyguard bouncer notifications; focus moving and the bouncer; slops
* commit '79cec380a30412e957cb7ba9cc9f04fcacf5d9f0':
  Keyguard bouncer notifications; focus moving and the bouncer; slops
2012-10-29 13:42:25 -07:00
Chet Haase
076a2a3345 am c3ea37ef: am c2b46a02: am b3975088: am 9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
* commit 'c3ea37ef7282c15eafeec18caab5a4164e41e490':
2012-10-29 13:42:21 -07:00
Daniel Sandler
3f29efe224 am 07791574: am 3e41588b: am d85a960b: Merge "Fix Google Now on lockscreen." into jb-mr1-lockscreen-dev
* commit '0779157434a7b4ac8842f594a37dbda2079311f3':
  Fix Google Now on lockscreen.
2012-10-29 13:42:17 -07:00
Fabrice Di Meglio
aa65b75b32 am a4764e9f: am 6278f804: am 654761a0: am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
* commit 'a4764e9f3aa4f9c7c48ad027b4f1184938572f52':
2012-10-29 13:42:13 -07:00
John Spurlock
1409076261 am cdf6c25d: am eb4c0cb5: am 2e8a98e2: Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev
* commit 'cdf6c25d6254b0375d78f22c40fc16b85c84de19':
  Manual frameworks/base merge from lockhotness (camera).
2012-10-29 13:42:09 -07:00
Svetoslav Ganov
a14a35a12b am a2f3f407: am f78367e2: am e3b51ef0: am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
* commit 'a2f3f4073153e50fb90ad781994a741fb0f47a9e':
2012-10-29 13:42:05 -07:00
Daniel Sandler
0e80e7560b am 9c578ae9: am 25c0e692: am c57f0d3e: Merge "Haptics for PIN enter key" into jb-mr1-lockscreen-dev
* commit '9c578ae93f1867447bcb3f0bffe2deab330c094d':
  Haptics for PIN enter key
2012-10-29 13:42:01 -07:00
Daniel Sandler
4f2b5f10cf am 7a77f1f3: am b6890d34: am 40d98edb: Merge "Haptics for PIN keys." into jb-mr1-lockscreen-dev
* commit '7a77f1f3a5c83a29d50391ea39a3cd2e47449662':
  Haptics for PIN keys.
2012-10-29 13:41:57 -07:00
Bryan Mawhinney
d49121f584 am c341ec1d: am 033afa8c: am 661c2e74: am 33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev
* commit 'c341ec1de532e793f99697dbcdcba9916a20f140':
2012-10-29 13:41:32 -07:00
Daniel Sandler
43de88e40f am 0608c843: am 165303f6: am d5692742: PIN pad cosmetics.
* commit '0608c84310fef390370a691e35cf6034e666d852':
  PIN pad cosmetics.
2012-10-29 13:41:05 -07:00
Daniel Sandler
aec058e6a0 am 67df65a4: am 51b0919d: am 2c1ce056: Cleaning up password input.
* commit '67df65a4978edf9e01917d9cf20cb38ed1b785d8':
  Cleaning up password input.
2012-10-29 13:40:47 -07:00
Daniel Sandler
00510c3f08 am 119ddb84: am 9e126b92: am 51d39f2d: Add ECA to PIN view
* commit '119ddb84c53000446449f0fbcab47523df8812fd':
  Add ECA to PIN view
2012-10-29 13:40:43 -07:00
Jim Miller
20df39fee5 am 42b07572: am cc5abfd4: am df99b1d5: Merge "Fix new password view in keyguard" into jb-mr1-lockscreen-dev
* commit '42b07572411bb7dd656744b4ead7cfb65bc87e32':
  Fix new password view in keyguard
2012-10-29 13:40:39 -07:00
Michael Jurka
00e1baf743 am 24ddf1f1: am fc00e67c: am 8b3dd400: Fix build
* commit '24ddf1f12d5656e5ca2d44fed5012dfe1922d260':
  Fix build
2012-10-29 13:40:35 -07:00
Michael Jurka
e3e8928ff9 am 56dfba03: am e88eebbb: am 147dfc86: Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev
* commit '56dfba037cbfec51df16e324dd4b0daa8b540746':
  Adding ability to add multiple widgets to keyguard
2012-10-29 13:40:31 -07:00
Dianne Hackborn
e7e97b54ca am 4ba6ae27: am 62778aaa: am db3efba6: am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev
* commit '4ba6ae271d2326c918f4a2160519fb6773b1a7df':
2012-10-29 13:40:23 -07:00
Daniel Sandler
fafa4ab901 am 0b98cf3b: am 4dc794a7: am 5fbc82ef: am 38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev
* commit '0b98cf3b2d3e5ce6f49785145494fcb30916da26':
2012-10-29 13:40:19 -07:00
Adam Powell
fe6823e257 am aacd795b: am 662bf7b2: am eee20931: Beginnings of bouncer support; add scrims and state tracking
* commit 'aacd795b18f5f9886747c29020c6f59ea7ef3c89':
  Beginnings of bouncer support; add scrims and state tracking
2012-10-29 13:40:10 -07:00
Irfan Sheriff
fbbe7a5140 am 471289fa: am 446e66ed: am 9253f561: am 4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev
* commit '471289fab9b968ea6d0ce626fd95d761db338f8b':
2012-10-29 13:40:05 -07:00
Jeff Brown
5e444b3fd7 am 0ba69cc3: am 0234e9db: am 2ca85c20: am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
* commit '0ba69cc3b0518aa7852fab8f5654add9f15c657b':
2012-10-29 13:40:02 -07:00
Adam Powell
aa2800b286 am 76fe94c0: am 82da5b17: am c0657fb3: Integrate changes from lockscreen proto app
* commit '76fe94c067b68347ada44f14aec713411e4b2753':
  Integrate changes from lockscreen proto app
2012-10-29 13:39:58 -07:00
Romain Guy
7d5187593c am 4cf9f91b: am b18e19f5: am ee0f615f: am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev
* commit '4cf9f91b1f732ec0ee10018c9651726a95ab823e':
2012-10-29 13:39:54 -07:00
Baligh Uddin
9dbdd6168f am 7abfe55a: (-s ours) am 38f7ae14: am f785af4d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '7abfe55a7e53b93319c5ab4424e7347bf0781b5e':
  Import translations. DO NOT MERGE
2012-10-29 13:39:50 -07:00
Justin Koh
e8d85f6d1f am 56d9696b: Merge "Expose PreferenceManager constructor / Preference#performClick" into jb-mr1-aah-dev
* commit '56d9696bb717ab0c7deebf4c84b0ff2094bd6cff':
  Expose PreferenceManager constructor / Preference#performClick
2012-10-29 13:37:17 -07:00
Jeff Brown
46a0ec73b6 am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
* commit '14012e1d1b3c96048955e22d2bb73b9c63189a54':
  Add MediaRouter API to get presentation display.
2012-10-29 13:37:10 -07:00
Daniel Sandler
1b38ea484b am 6b2d4196: am 50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev
* commit '6b2d41966ad7970d0dd4a891fbf41641514df418':
  Final icon for (Day)dreams.
2012-10-29 13:37:07 -07:00
Chris Wren
3f47cd2bf5 am 592f6343: am f0fd172a: lock out clicks while switching.
* commit '592f6343726b61ad199236ccf6077941ad23aa74':
  lock out clicks while switching.
2012-10-29 13:36:59 -07:00
John Spurlock
aa9aa440cb am ee12f5aa: am 47cde77b: Fix camera bugs found overnight.
* commit 'ee12f5aa5701a0ace1bb61ea599cb024494b22cc':
  Fix camera bugs found overnight.
2012-10-29 13:36:56 -07:00
Adam Powell
e7c8c76d4a am 300772e6: am 6f35209e: Integrate assets from UX; drag/bouncer animation behavior in slider
* commit '300772e6f8c8d313457ea7eb0e7be4b670403f77':
  Integrate assets from UX; drag/bouncer animation behavior in slider
2012-10-29 13:36:50 -07:00
Jim Miller
2d1c6770e5 am 3dd3a41a: am 9b1db682: Fix issue where security view sometimes doesn\'t show.
* commit '3dd3a41aabfae3d5d27809b067da99568a516e22':
  Fix issue where security view sometimes doesn't show.
2012-10-29 13:36:44 -07:00
Jim Miller
ebda6cb064 am c8896dab: am a71984f3: Cleanup keyguard signals
* commit 'c8896dab510a3a758f651d92bfff8df0a4512670':
  Cleanup keyguard signals
2012-10-29 13:36:40 -07:00
Michael Jurka
6dd6d43a8b am b1c5ec17: am 1254f2f4: Persist reordering/deleting widgets on keyguard
* commit 'b1c5ec176d899b560f51e496b7719241d6ff8693':
  Persist reordering/deleting widgets on keyguard
2012-10-29 13:36:36 -07:00
Robert Ly
6fbac90720 am 1de0549f: am 6a8d6da9: am 148d4131: am 5b45e337: am d6bbf71d: am ea502b27: Merge "docs: animations au class" into jb-dev-docs
* commit '1de0549fd6361c399f2e6e4d0e2c8c83856b9909':
2012-10-29 13:36:32 -07:00
Jim Miller
42321210d0 am 33e62a80: am f90716c9: Merge "Route signals from SlidingChalleng to SecurityView" into jb-mr1-lockscreen-dev
* commit '33e62a8061803ebf6cc2cfa697a3b8677ba8287f':
  Route signals from SlidingChalleng to SecurityView
2012-10-29 13:36:28 -07:00
John Spurlock
4d30698780 am 33760695: am 7de482ba: am 5c87f533: Merge "Revert part of fix for b/7377776 to fix b/7411356." into jb-mr1-dev
* commit '3376069578f44aa81d7d30ceee72743a5d9b2158':
2012-10-29 13:36:23 -07:00
Adam Powell
79cec380a3 am 0d980a3b: am 0b1b5522: Keyguard bouncer notifications; focus moving and the bouncer; slops
* commit '0d980a3b298a233ed4bbb39955c47a95e51d53c8':
  Keyguard bouncer notifications; focus moving and the bouncer; slops
2012-10-29 13:36:19 -07:00
Chet Haase
c3ea37ef72 am c2b46a02: am b3975088: am 9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
* commit 'c2b46a02ee5e852c90450ad3154845782598d059':
2012-10-29 13:36:15 -07:00