OSDN Git Service
Fabrice Di Meglio [Tue, 30 Oct 2012 00:13:23 +0000 (17:13 -0700)]
am
024e70c8: am
dd80335e: am
07ce0ca2: Merge "Fix bug #
7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
* commit '
024e70c8156a0fa2d702ff2fba4a38c1f6b68f98':
Fix bug #
7419054 TextView Drawables resolution is broken in RTL mode
Victoria Lease [Mon, 29 Oct 2012 22:44:17 +0000 (15:44 -0700)]
Merge "don't complain about CDMA support on non-CDMA devices"
Scott Main [Mon, 29 Oct 2012 22:33:51 +0000 (15:33 -0700)]
Merge "suggest LocationRequest rather than Criteria"
Baligh Uddin [Mon, 29 Oct 2012 22:13:51 +0000 (15:13 -0700)]
Merge "Import translations. DO NOT MERGE"
Victoria Lease [Mon, 29 Oct 2012 22:07:50 +0000 (15:07 -0700)]
suggest LocationRequest rather than Criteria
LocationProvider's javadoc suggests using Criteria instead of
LocationProvider, which is deprecated. Criteria is deprecated, too,
now, so we suggest LocationRequest instead.
Bug:
7434865
Change-Id: Ieb5ef28ab1e6b4b3c4d2b8ceb3a601083b4f8e2f
Baligh Uddin [Mon, 29 Oct 2012 21:58:08 +0000 (14:58 -0700)]
Merge "Import translations. DO NOT MERGE"
Fabrice Di Meglio [Mon, 29 Oct 2012 21:22:04 +0000 (14:22 -0700)]
am
dd80335e: am
07ce0ca2: Merge "Fix bug #
7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
* commit '
dd80335edde688794db3260bcea7f732430abaf1':
Fix bug #
7419054 TextView Drawables resolution is broken in RTL mode
Fabrice Di Meglio [Mon, 29 Oct 2012 20:55:46 +0000 (13:55 -0700)]
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
Victoria Lease [Mon, 29 Oct 2012 20:16:17 +0000 (13:16 -0700)]
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
Justin Koh [Mon, 29 Oct 2012 20:43:19 +0000 (13:43 -0700)]
am
e8d85f6d: am
56d9696b: Merge "Expose PreferenceManager constructor / Preference#performClick" into jb-mr1-aah-dev
* commit '
e8d85f6d1f1ee957302b113f06a0b2f1aa9024fe':
Expose PreferenceManager constructor / Preference#performClick
Jeff Brown [Mon, 29 Oct 2012 20:43:14 +0000 (13:43 -0700)]
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.
Daniel Sandler [Mon, 29 Oct 2012 20:43:10 +0000 (13:43 -0700)]
am
1b38ea48: am
6b2d4196: am
50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev
* commit '
1b38ea484b3b474a6fcdfd817ec7234fb0596b98':
Final icon for (Day)dreams.
Chris Wren [Mon, 29 Oct 2012 20:43:06 +0000 (13:43 -0700)]
am
3f47cd2b: am
592f6343: am
f0fd172a: lock out clicks while switching.
* commit '
3f47cd2bf541435468f0e8af53767d7c14fbb2f6':
lock out clicks while switching.
John Spurlock [Mon, 29 Oct 2012 20:42:58 +0000 (13:42 -0700)]
am
aa9aa440: am
ee12f5aa: am
47cde77b: Fix camera bugs found overnight.
* commit '
aa9aa440cbe1526ffeafc1326b7a4d00e3b5f3d7':
Fix camera bugs found overnight.
Adam Powell [Mon, 29 Oct 2012 20:42:54 +0000 (13:42 -0700)]
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
Jim Miller [Mon, 29 Oct 2012 20:42:48 +0000 (13:42 -0700)]
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.
Jim Miller [Mon, 29 Oct 2012 20:42:44 +0000 (13:42 -0700)]
am
ebda6cb0: am
c8896dab: am
a71984f3: Cleanup keyguard signals
* commit '
ebda6cb064a179893446889272ca5fd9d9c98097':
Cleanup keyguard signals
Michael Jurka [Mon, 29 Oct 2012 20:42:40 +0000 (13:42 -0700)]
am
6dd6d43a: am
b1c5ec17: am
1254f2f4: Persist reordering/deleting widgets on keyguard
* commit '
6dd6d43a8bf25ce5abe58f86c0ddae430ab96c4f':
Persist reordering/deleting widgets on keyguard
Robert Ly [Mon, 29 Oct 2012 20:42:37 +0000 (13:42 -0700)]
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':
Jim Miller [Mon, 29 Oct 2012 20:42:33 +0000 (13:42 -0700)]
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
John Spurlock [Mon, 29 Oct 2012 20:42:29 +0000 (13:42 -0700)]
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':
Adam Powell [Mon, 29 Oct 2012 20:42:25 +0000 (13:42 -0700)]
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
Chet Haase [Mon, 29 Oct 2012 20:42:21 +0000 (13:42 -0700)]
am
c3ea37ef: am
c2b46a02: am
b3975088: am
9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
* commit '
c3ea37ef7282c15eafeec18caab5a4164e41e490':
Daniel Sandler [Mon, 29 Oct 2012 20:42:17 +0000 (13:42 -0700)]
am
07791574: am
3e41588b: am
d85a960b: Merge "Fix Google Now on lockscreen." into jb-mr1-lockscreen-dev
* commit '
0779157434a7b4ac8842f594a37dbda2079311f3':
Fix Google Now on lockscreen.
Fabrice Di Meglio [Mon, 29 Oct 2012 20:42:13 +0000 (13:42 -0700)]
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':
John Spurlock [Mon, 29 Oct 2012 20:42:09 +0000 (13:42 -0700)]
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).
Svetoslav Ganov [Mon, 29 Oct 2012 20:42:05 +0000 (13:42 -0700)]
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':
Daniel Sandler [Mon, 29 Oct 2012 20:42:01 +0000 (13:42 -0700)]
am
9c578ae9: am
25c0e692: am
c57f0d3e: Merge "Haptics for PIN enter key" into jb-mr1-lockscreen-dev
* commit '
9c578ae93f1867447bcb3f0bffe2deab330c094d':
Haptics for PIN enter key
Daniel Sandler [Mon, 29 Oct 2012 20:41:57 +0000 (13:41 -0700)]
am
7a77f1f3: am
b6890d34: am
40d98edb: Merge "Haptics for PIN keys." into jb-mr1-lockscreen-dev
* commit '
7a77f1f3a5c83a29d50391ea39a3cd2e47449662':
Haptics for PIN keys.
Bryan Mawhinney [Mon, 29 Oct 2012 20:41:32 +0000 (13:41 -0700)]
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':
Daniel Sandler [Mon, 29 Oct 2012 20:41:05 +0000 (13:41 -0700)]
am
0608c843: am
165303f6: am
d5692742: PIN pad cosmetics.
* commit '
0608c84310fef390370a691e35cf6034e666d852':
PIN pad cosmetics.
Daniel Sandler [Mon, 29 Oct 2012 20:40:47 +0000 (13:40 -0700)]
am
67df65a4: am
51b0919d: am
2c1ce056: Cleaning up password input.
* commit '
67df65a4978edf9e01917d9cf20cb38ed1b785d8':
Cleaning up password input.
Daniel Sandler [Mon, 29 Oct 2012 20:40:43 +0000 (13:40 -0700)]
am
119ddb84: am
9e126b92: am
51d39f2d: Add ECA to PIN view
* commit '
119ddb84c53000446449f0fbcab47523df8812fd':
Add ECA to PIN view
Jim Miller [Mon, 29 Oct 2012 20:40:39 +0000 (13:40 -0700)]
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
Michael Jurka [Mon, 29 Oct 2012 20:40:35 +0000 (13:40 -0700)]
Michael Jurka [Mon, 29 Oct 2012 20:40:31 +0000 (13:40 -0700)]
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
Dianne Hackborn [Mon, 29 Oct 2012 20:40:23 +0000 (13:40 -0700)]
am
4ba6ae27: am
62778aaa: am
db3efba6: am
ead7d90e: Merge "Fix issue #
7408647: Add getUserCount() API" into jb-mr1-dev
* commit '
4ba6ae271d2326c918f4a2160519fb6773b1a7df':
Daniel Sandler [Mon, 29 Oct 2012 20:40:19 +0000 (13:40 -0700)]
am
0b98cf3b: am
4dc794a7: am
5fbc82ef: am
38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev
* commit '
0b98cf3b2d3e5ce6f49785145494fcb30916da26':
Adam Powell [Mon, 29 Oct 2012 20:40:10 +0000 (13:40 -0700)]
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
Irfan Sheriff [Mon, 29 Oct 2012 20:40:05 +0000 (13:40 -0700)]
am
471289fa: am
446e66ed: am
9253f561: am
4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev
* commit '
471289fab9b968ea6d0ce626fd95d761db338f8b':
Jeff Brown [Mon, 29 Oct 2012 20:40:02 +0000 (13:40 -0700)]
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':
Adam Powell [Mon, 29 Oct 2012 20:39:58 +0000 (13:39 -0700)]
am
76fe94c0: am
82da5b17: am
c0657fb3: Integrate changes from lockscreen proto app
* commit '
76fe94c067b68347ada44f14aec713411e4b2753':
Integrate changes from lockscreen proto app
Romain Guy [Mon, 29 Oct 2012 20:39:54 +0000 (13:39 -0700)]
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':
Baligh Uddin [Mon, 29 Oct 2012 20:39:50 +0000 (13:39 -0700)]
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
Justin Koh [Mon, 29 Oct 2012 20:37:17 +0000 (13:37 -0700)]
am
56d9696b: Merge "Expose PreferenceManager constructor / Preference#performClick" into jb-mr1-aah-dev
* commit '
56d9696bb717ab0c7deebf4c84b0ff2094bd6cff':
Expose PreferenceManager constructor / Preference#performClick
Jeff Brown [Mon, 29 Oct 2012 20:37:10 +0000 (13:37 -0700)]
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.
Daniel Sandler [Mon, 29 Oct 2012 20:37:07 +0000 (13:37 -0700)]
am
6b2d4196: am
50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev
* commit '
6b2d41966ad7970d0dd4a891fbf41641514df418':
Final icon for (Day)dreams.
Chris Wren [Mon, 29 Oct 2012 20:36:59 +0000 (13:36 -0700)]
am
592f6343: am
f0fd172a: lock out clicks while switching.
* commit '
592f6343726b61ad199236ccf6077941ad23aa74':
lock out clicks while switching.
John Spurlock [Mon, 29 Oct 2012 20:36:56 +0000 (13:36 -0700)]
am
ee12f5aa: am
47cde77b: Fix camera bugs found overnight.
* commit '
ee12f5aa5701a0ace1bb61ea599cb024494b22cc':
Fix camera bugs found overnight.
Adam Powell [Mon, 29 Oct 2012 20:36:50 +0000 (13:36 -0700)]
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
Jim Miller [Mon, 29 Oct 2012 20:36:44 +0000 (13:36 -0700)]
am
3dd3a41a: am
9b1db682: Fix issue where security view sometimes doesn\'t show.
* commit '
3dd3a41aabfae3d5d27809b067da99568a516e22':
Fix issue where security view sometimes doesn't show.
Jim Miller [Mon, 29 Oct 2012 20:36:40 +0000 (13:36 -0700)]
am
c8896dab: am
a71984f3: Cleanup keyguard signals
* commit '
c8896dab510a3a758f651d92bfff8df0a4512670':
Cleanup keyguard signals
Michael Jurka [Mon, 29 Oct 2012 20:36:36 +0000 (13:36 -0700)]
am
b1c5ec17: am
1254f2f4: Persist reordering/deleting widgets on keyguard
* commit '
b1c5ec176d899b560f51e496b7719241d6ff8693':
Persist reordering/deleting widgets on keyguard
Robert Ly [Mon, 29 Oct 2012 20:36:32 +0000 (13:36 -0700)]
am
1de0549f: am
6a8d6da9: am
148d4131: am
5b45e337: am
d6bbf71d: am
ea502b27: Merge "docs: animations au class" into jb-dev-docs
* commit '
1de0549fd6361c399f2e6e4d0e2c8c83856b9909':
Jim Miller [Mon, 29 Oct 2012 20:36:28 +0000 (13:36 -0700)]
am
33e62a80: am
f90716c9: Merge "Route signals from SlidingChalleng to SecurityView" into jb-mr1-lockscreen-dev
* commit '
33e62a8061803ebf6cc2cfa697a3b8677ba8287f':
Route signals from SlidingChalleng to SecurityView
John Spurlock [Mon, 29 Oct 2012 20:36:23 +0000 (13:36 -0700)]
am
33760695: am
7de482ba: am
5c87f533: Merge "Revert part of fix for b/
7377776 to fix b/
7411356." into jb-mr1-dev
* commit '
3376069578f44aa81d7d30ceee72743a5d9b2158':
Adam Powell [Mon, 29 Oct 2012 20:36:19 +0000 (13:36 -0700)]
am
0d980a3b: am
0b1b5522: Keyguard bouncer notifications; focus moving and the bouncer; slops
* commit '
0d980a3b298a233ed4bbb39955c47a95e51d53c8':
Keyguard bouncer notifications; focus moving and the bouncer; slops
Chet Haase [Mon, 29 Oct 2012 20:36:15 +0000 (13:36 -0700)]
am
c2b46a02: am
b3975088: am
9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
* commit '
c2b46a02ee5e852c90450ad3154845782598d059':
Daniel Sandler [Mon, 29 Oct 2012 20:36:11 +0000 (13:36 -0700)]
am
3e41588b: am
d85a960b: Merge "Fix Google Now on lockscreen." into jb-mr1-lockscreen-dev
* commit '
3e41588b931e40c692c39835f1b2f011822714cb':
Fix Google Now on lockscreen.
Fabrice Di Meglio [Mon, 29 Oct 2012 20:36:07 +0000 (13:36 -0700)]
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 '
6278f80463604c28db0e497ddd17e3182c06d51d':
John Spurlock [Mon, 29 Oct 2012 20:36:03 +0000 (13:36 -0700)]
am
eb4c0cb5: am
2e8a98e2: Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev
* commit '
eb4c0cb5098bfceae762594621f4b5125ca7bbe4':
Manual frameworks/base merge from lockhotness (camera).
Svetoslav Ganov [Mon, 29 Oct 2012 20:36:00 +0000 (13:36 -0700)]
am
f78367e2: am
e3b51ef0: am
324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
* commit '
f78367e2d2dd1d25a2c474308a953149a9a35c60':
Daniel Sandler [Mon, 29 Oct 2012 20:35:56 +0000 (13:35 -0700)]
am
25c0e692: am
c57f0d3e: Merge "Haptics for PIN enter key" into jb-mr1-lockscreen-dev
* commit '
25c0e69287c479253b7520304ee4508aa05acc62':
Haptics for PIN enter key
Daniel Sandler [Mon, 29 Oct 2012 20:35:53 +0000 (13:35 -0700)]
am
b6890d34: am
40d98edb: Merge "Haptics for PIN keys." into jb-mr1-lockscreen-dev
* commit '
b6890d341222b0d1d8a34b391fa1634d4cc353f7':
Haptics for PIN keys.
Bryan Mawhinney [Mon, 29 Oct 2012 20:35:49 +0000 (13:35 -0700)]
am
033afa8c: am
661c2e74: am
33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev
* commit '
033afa8c818a877e28fbf809a573929bdc460b90':
Daniel Sandler [Mon, 29 Oct 2012 20:35:46 +0000 (13:35 -0700)]
am
165303f6: am
d5692742: PIN pad cosmetics.
* commit '
165303f6453e641b9ffe666d434c9ae581a8ab7e':
PIN pad cosmetics.
Daniel Sandler [Mon, 29 Oct 2012 20:35:42 +0000 (13:35 -0700)]
am
51b0919d: am
2c1ce056: Cleaning up password input.
* commit '
51b0919d301c10717c910928c5a03048e224f01f':
Cleaning up password input.
Daniel Sandler [Mon, 29 Oct 2012 20:35:38 +0000 (13:35 -0700)]
am
9e126b92: am
51d39f2d: Add ECA to PIN view
* commit '
9e126b92513388331b8af969d2d6f80b0408f795':
Add ECA to PIN view
Jim Miller [Mon, 29 Oct 2012 20:35:33 +0000 (13:35 -0700)]
am
cc5abfd4: am
df99b1d5: Merge "Fix new password view in keyguard" into jb-mr1-lockscreen-dev
* commit '
cc5abfd4d6e62dd9c34f5aa8c6c08dfdab8a21ed':
Fix new password view in keyguard
Michael Jurka [Mon, 29 Oct 2012 20:35:26 +0000 (13:35 -0700)]
Michael Jurka [Mon, 29 Oct 2012 20:35:20 +0000 (13:35 -0700)]
am
e88eebbb: am
147dfc86: Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev
* commit '
e88eebbb3ba8999cd81e79dc62a8dd14c64b592d':
Adding ability to add multiple widgets to keyguard
Dianne Hackborn [Mon, 29 Oct 2012 20:35:16 +0000 (13:35 -0700)]
am
62778aaa: am
db3efba6: am
ead7d90e: Merge "Fix issue #
7408647: Add getUserCount() API" into jb-mr1-dev
* commit '
62778aaa0317f0bdfb6901e8e6493161717e9b2a':
Daniel Sandler [Mon, 29 Oct 2012 20:35:13 +0000 (13:35 -0700)]
am
4dc794a7: am
5fbc82ef: am
38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev
* commit '
4dc794a779ab6d208e276b88a9a2f12ee5a4034e':
Adam Powell [Mon, 29 Oct 2012 20:35:07 +0000 (13:35 -0700)]
am
662bf7b2: am
eee20931: Beginnings of bouncer support; add scrims and state tracking
* commit '
662bf7b23e74bb7b92c3ace8ddfdeea1a6791961':
Beginnings of bouncer support; add scrims and state tracking
Irfan Sheriff [Mon, 29 Oct 2012 20:35:02 +0000 (13:35 -0700)]
am
446e66ed: am
9253f561: am
4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev
* commit '
446e66edd8eb335d23697614102c80fe3fe94655':
Jeff Brown [Mon, 29 Oct 2012 20:34:56 +0000 (13:34 -0700)]
am
0234e9db: am
2ca85c20: am
900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
* commit '
0234e9db974a05e93f691e2e613117867e59a79d':
Adam Powell [Mon, 29 Oct 2012 20:34:52 +0000 (13:34 -0700)]
am
82da5b17: am
c0657fb3: Integrate changes from lockscreen proto app
* commit '
82da5b173c586ce085a85421ebebdd281508f0ba':
Integrate changes from lockscreen proto app
Romain Guy [Mon, 29 Oct 2012 20:34:49 +0000 (13:34 -0700)]
am
b18e19f5: am
ee0f615f: am
99333315: Merge "Ensure we have a GL context before deleting View layers Bug #
7391098" into jb-mr1-dev
* commit '
b18e19f5a018bfd59fdc2b2f0582698c9a6e5994':
Baligh Uddin [Mon, 29 Oct 2012 20:34:45 +0000 (13:34 -0700)]
am
38f7ae14: am
f785af4d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
38f7ae14dfff0004675383adde61f051e6483353':
Import translations. DO NOT MERGE
Justin Koh [Mon, 29 Oct 2012 20:32:11 +0000 (13:32 -0700)]
Merge "Expose PreferenceManager constructor / Preference#performClick" into jb-mr1-aah-dev
Jeff Brown [Mon, 29 Oct 2012 20:32:02 +0000 (13:32 -0700)]
am
4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
* commit '
4e0bf7c48638f5c9b222c8781809019df0b39048':
Add MediaRouter API to get presentation display.
Daniel Sandler [Mon, 29 Oct 2012 20:31:55 +0000 (13:31 -0700)]
am
50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev
* commit '
50e1f9eb9333451f0e07b1878b5a78bbcdec27ab':
Final icon for (Day)dreams.
Chris Wren [Mon, 29 Oct 2012 20:31:52 +0000 (13:31 -0700)]
am
f0fd172a: lock out clicks while switching.
* commit '
f0fd172a7d4a71da413e5bb6aad9ef611ce2a837':
lock out clicks while switching.
John Spurlock [Mon, 29 Oct 2012 20:31:48 +0000 (13:31 -0700)]
am
47cde77b: Fix camera bugs found overnight.
* commit '
47cde77bc7ac5c3a1e486691596a7534ad855ff2':
Fix camera bugs found overnight.
Adam Powell [Mon, 29 Oct 2012 20:31:40 +0000 (13:31 -0700)]
am
6f35209e: Integrate assets from UX; drag/bouncer animation behavior in slider
* commit '
6f35209e728a7a9a56afbbdefd3d7bfa1e05ea73':
Integrate assets from UX; drag/bouncer animation behavior in slider
Jim Miller [Mon, 29 Oct 2012 20:31:36 +0000 (13:31 -0700)]
am
9b1db682: Fix issue where security view sometimes doesn\'t show.
* commit '
9b1db682c32d103974b0f1193b50e77e254d5589':
Fix issue where security view sometimes doesn't show.
Jim Miller [Mon, 29 Oct 2012 20:31:30 +0000 (13:31 -0700)]
am
a71984f3: Cleanup keyguard signals
* commit '
a71984f3da47c6e6e3164c170735362a3222d3ad':
Cleanup keyguard signals
Michael Jurka [Mon, 29 Oct 2012 20:31:27 +0000 (13:31 -0700)]
am
1254f2f4: Persist reordering/deleting widgets on keyguard
* commit '
1254f2f42f7173ef51d0034975ab5cb7d44f8209':
Persist reordering/deleting widgets on keyguard
Robert Ly [Mon, 29 Oct 2012 20:31:23 +0000 (13:31 -0700)]
am
6a8d6da9: am
148d4131: am
5b45e337: am
d6bbf71d: am
ea502b27: Merge "docs: animations au class" into jb-dev-docs
* commit '
6a8d6da9bb8829011bcc249e308461ea64e431e1':
Jim Miller [Mon, 29 Oct 2012 20:31:19 +0000 (13:31 -0700)]
am
f90716c9: Merge "Route signals from SlidingChalleng to SecurityView" into jb-mr1-lockscreen-dev
* commit '
f90716c9cc9f5ebed9d6bbdae40295490d94890f':
Route signals from SlidingChalleng to SecurityView
John Spurlock [Mon, 29 Oct 2012 20:31:15 +0000 (13:31 -0700)]
am
7de482ba: am
5c87f533: Merge "Revert part of fix for b/
7377776 to fix b/
7411356." into jb-mr1-dev
* commit '
7de482babc55f1034d37552a0b254427694b3584':
Adam Powell [Mon, 29 Oct 2012 20:31:12 +0000 (13:31 -0700)]
am
0b1b5522: Keyguard bouncer notifications; focus moving and the bouncer; slops
* commit '
0b1b552268bc6641cc5d01fb80c12258da9c6985':
Keyguard bouncer notifications; focus moving and the bouncer; slops
Chet Haase [Mon, 29 Oct 2012 20:31:08 +0000 (13:31 -0700)]
am
b3975088: am
9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
* commit '
b3975088b6f10d45ed5589f10887a4bc12fe942c':
Daniel Sandler [Mon, 29 Oct 2012 20:31:04 +0000 (13:31 -0700)]
am
d85a960b: Merge "Fix Google Now on lockscreen." into jb-mr1-lockscreen-dev
* commit '
d85a960b14203f63c7e2b8b16235b60ea1023151':
Fix Google Now on lockscreen.
Fabrice Di Meglio [Mon, 29 Oct 2012 20:31:01 +0000 (13:31 -0700)]
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 '
654761a059f85ced7316e4027a93ba18b5071e0f':
John Spurlock [Mon, 29 Oct 2012 20:30:56 +0000 (13:30 -0700)]
am
2e8a98e2: Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev
* commit '
2e8a98e269486700d985f842806ce70e3a394dc9':
Manual frameworks/base merge from lockhotness (camera).
Svetoslav Ganov [Mon, 29 Oct 2012 20:30:53 +0000 (13:30 -0700)]
am
e3b51ef0: am
324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
* commit '
e3b51ef0022187aeb0e39f332a3c693dcfcdf625':
Baligh Uddin [Mon, 29 Oct 2012 20:30:49 +0000 (13:30 -0700)]
am
36e37990: (-s ours) am
511e3874: am
a187b478: (-s ours) am
188bf0e6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
36e37990826c9d5708d9efb50b184827eba4c93f':
Daniel Sandler [Mon, 29 Oct 2012 20:30:48 +0000 (13:30 -0700)]
am
c57f0d3e: Merge "Haptics for PIN enter key" into jb-mr1-lockscreen-dev
* commit '
c57f0d3e540f916f629d160148231bb38d3deb64':
Haptics for PIN enter key
Daniel Sandler [Mon, 29 Oct 2012 20:30:45 +0000 (13:30 -0700)]
am
40d98edb: Merge "Haptics for PIN keys." into jb-mr1-lockscreen-dev
* commit '
40d98edb43e3e897b1db4ac9f47bb522f585d3a5':
Haptics for PIN keys.
OSDN Git Service
