Eric Laurent
67baf8781b
am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev
...
* commit 'c99a1107c0d4fdf47595e5072192d647a01e13b3':
add settings for dock audio enabled
2012-10-29 14:02:31 -07:00
Fabrice Di Meglio
9d662c7765
am 68b14054: Merge "Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"" into jb-mr1-dev
...
* commit '68b14054b96571d4009c6c5a9b4c3413d908a523':
Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"
2012-10-29 14:01:51 -07:00
Victoria Lease
cee171409b
am 319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev
...
* commit '319c7e85019350e3a5f26c64803900b945130c3b':
make FLP play nicely with multiuser
2012-10-29 14:01:47 -07:00
Adam Powell
daa7218a9e
am 0a27c486: Fix measurement bug in keyguard/MultiPaneChallengeLayout
...
* commit '0a27c4865e5f3afe891680f687ac75c6a659fb84':
Fix measurement bug in keyguard/MultiPaneChallengeLayout
2012-10-29 14:01:44 -07:00
Adam Powell
91885b5528
am b0ed8bdb: Merge "Keyguard - prevent slider intercept when we don\'t want it" into jb-mr1-lockscreen-dev
...
* commit 'b0ed8bdb41cff76f31ce47f1ae7ee51ea68bba47':
Keyguard - prevent slider intercept when we don't want it
2012-10-29 14:01:36 -07:00
Winson Chung
69d0686fdc
am 113ca64a: Merge "Making the PagedView full screen on tablets." into jb-mr1-lockscreen-dev
...
* commit '113ca64a2275ad05c1429edcf56c688d823e308a':
Making the PagedView full screen on tablets.
2012-10-29 14:01:32 -07:00
Dianne Hackborn
ffeb45a8e5
am 8905923c: am 8a6f6a8c: Merge "Fix issue #7419050 : Time is not getting updated after launching Clock" into jb-mr1-dev
...
* commit '8905923c63b73deecb82567f16404b2cf90de8cc':
2012-10-29 14:01:26 -07:00
Adam Cohen
40011d6fef
am 8daee807: Merge "3D carousel initial stab -- paging outlines / alpha effects pending design" into jb-mr1-lockscreen-dev
...
* commit '8daee807532861239740a31689255fddf11574c1':
3D carousel initial stab -- paging outlines / alpha effects pending design
2012-10-29 14:01:20 -07:00
Michael Jurka
18b5b1f462
am a15eeacf: Merge "Fix bug where it wasn\'t possible to add widgets" into jb-mr1-lockscreen-dev
...
* commit 'a15eeacff99650cb9151106438fb61b73d4e749a':
Fix bug where it wasn't possible to add widgets
2012-10-29 14:01:10 -07:00
Amith Yamasani
de264c6d18
am 369f1c92: am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev
...
* commit '369f1c92e7cc1fba13b04698fb310fded1a85eda':
2012-10-29 14:01:07 -07:00
Fabrice Di Meglio
bb0e76453b
am b8a220cb: am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
...
* commit 'b8a220cbef4bc6a3af327fce51d59aacd91a9935':
2012-10-29 14:01:03 -07:00
Jeff Brown
b6fcfdb890
am d3d523da: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
...
* commit 'd3d523da9a9906beb78c1fd9fa90dac7ea10e5ad':
2012-10-29 14:01:00 -07:00
Daniel Sandler
7587e2a845
am a41ca127: am 50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev
...
* commit 'a41ca127a6bb81ce4f660bda25d62105fba6de3a':
2012-10-29 14:00:56 -07:00
Adam Powell
a5b74cc4c9
am 942a60d8: Merge "Fix lockscreen slider bugs" into jb-mr1-lockscreen-dev
...
* commit '942a60d8a40a55b94ce443a71e7dc632911f0e84':
Fix lockscreen slider bugs
2012-10-29 14:00:53 -07:00
John Spurlock
e25974c347
am 011717d0: Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev
...
* commit '011717d0648878eedec9e6de90b8fba12f550df7':
Implement "sticky" widget logic.
2012-10-29 14:00:48 -07:00
Daniel Sandler
3d6438c894
am 1f887cb2: Merge "Make the add widget button hitrectangle smaller." into jb-mr1-lockscreen-dev
...
* commit '1f887cb2928695c81df9cfbbb730225ee81051dd':
Make the add widget button hitrectangle smaller.
2012-10-29 14:00:43 -07:00
Daniel Sandler
cc3e894a99
am 61426f3d: Merge "Remove the handle headroom if the challenge is open." into jb-mr1-lockscreen-dev
...
* commit '61426f3d83f329ae76a226ea614541db9eb16bcb':
Remove the handle headroom if the challenge is open.
2012-10-29 14:00:39 -07:00
Daniel Sandler
a84d353c77
am c9a7d989: Merge "Expand top of touchable area of challenge drag handle." into jb-mr1-lockscreen-dev
...
* commit 'c9a7d9899908a3f5960cfe6123d51cfbfcf2b0ae':
Expand top of touchable area of challenge drag handle.
2012-10-29 14:00:36 -07:00
John Spurlock
f04a6ee705
am af5b49c1: Merge "Update swipe edge size to match ux prototype." into jb-mr1-lockscreen-dev
...
* commit 'af5b49c12dc2ff83b3d43663f4fda09401fb7d3f':
Update swipe edge size to match ux prototype.
2012-10-29 14:00:32 -07:00
Dianne Hackborn
e1ea4d35d3
am 8a6f6a8c: Merge "Fix issue #7419050 : Time is not getting updated after launching Clock" into jb-mr1-dev
...
* commit '8a6f6a8ca9824891cc841d8c6ebd72a74c7d2580':
Fix issue #7419050 : Time is not getting updated after launching Clock
2012-10-29 13:56:01 -07:00
Amith Yamasani
16f18a4ce8
am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev
...
* commit '084824548f9706db8356ed4480c282288ffc0bd0':
Fix the user name for the owner.
2012-10-29 13:55:57 -07:00
Fabrice Di Meglio
dd80335edd
am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
...
* commit '07ce0ca265274c5ba95e6ec3e0950e38b8ce97ea':
Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
2012-10-29 13:55:46 -07:00
Victoria Lease
d50d0c31d4
don't complain about CDMA support on non-CDMA devices
...
GpsLocationProvider emits a message on CDMA phones, warning about
lack of CDMA support. It also emits this message on every other
non-GSM device. I've pulled the conditions in a bit for this so that
it only happens on actual CDMA devices.
Change-Id: I1a122e2599c83c730be014c61385e60ef819b5a1
2012-10-29 13:46:43 -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