OSDN Git Service
Adam Cohen [Mon, 29 Oct 2012 21:23:12 +0000 (14:23 -0700)]
am
40011d6f: am
8daee807: Merge "3D carousel initial stab -- paging outlines / alpha effects pending design" into jb-mr1-lockscreen-dev
* commit '
40011d6fef363e4cdc9c90ba3139e9199801c786':
3D carousel initial stab -- paging outlines / alpha effects pending design
Michael Jurka [Mon, 29 Oct 2012 21:23:08 +0000 (14:23 -0700)]
am
18b5b1f4: am
a15eeacf: Merge "Fix bug where it wasn\'t possible to add widgets" into jb-mr1-lockscreen-dev
* commit '
18b5b1f46298ad35398d8ba3dbd3156ad14296e6':
Fix bug where it wasn't possible to add widgets
Amith Yamasani [Mon, 29 Oct 2012 21:23:05 +0000 (14:23 -0700)]
am
de264c6d: am
369f1c92: am
08482454: Merge "Fix the user name for the owner." into jb-mr1-dev
* commit '
de264c6d18a7b68c0f2f7f1a27ab8c8b31e7f39d':
Fabrice Di Meglio [Mon, 29 Oct 2012 21:23:01 +0000 (14:23 -0700)]
am
bb0e7645: am
b8a220cb: am
07ce0ca2: Merge "Fix bug #
7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
* commit '
bb0e76453b9a9a1947ac91a7af6cd6c657cbbe32':
Jeff Brown [Mon, 29 Oct 2012 21:22:56 +0000 (14:22 -0700)]
am
b6fcfdb8: am
d3d523da: am
4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
* commit '
b6fcfdb890b3460453708dbf38d5c20befa98383':
Daniel Sandler [Mon, 29 Oct 2012 21:22:53 +0000 (14:22 -0700)]
am
7587e2a8: am
a41ca127: am
50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev
* commit '
7587e2a8455cdcd4a739877825cd0286347e0e28':
Adam Powell [Mon, 29 Oct 2012 21:22:48 +0000 (14:22 -0700)]
am
a5b74cc4: am
942a60d8: Merge "Fix lockscreen slider bugs" into jb-mr1-lockscreen-dev
* commit '
a5b74cc4c911d533a8c7784b4f0bbdf22cfee25f':
Fix lockscreen slider bugs
John Spurlock [Mon, 29 Oct 2012 21:22:44 +0000 (14:22 -0700)]
am
e25974c3: am
011717d0: Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev
* commit '
e25974c347e29221bfaa9ce071797469f0bfc4f4':
Implement "sticky" widget logic.
Daniel Sandler [Mon, 29 Oct 2012 21:22:38 +0000 (14:22 -0700)]
am
3d6438c8: am
1f887cb2: Merge "Make the add widget button hitrectangle smaller." into jb-mr1-lockscreen-dev
* commit '
3d6438c89448341416a4da705d35338626d72c90':
Make the add widget button hitrectangle smaller.
Daniel Sandler [Mon, 29 Oct 2012 21:22:33 +0000 (14:22 -0700)]
am
cc3e894a: am
61426f3d: Merge "Remove the handle headroom if the challenge is open." into jb-mr1-lockscreen-dev
* commit '
cc3e894a99e9479512f40c30ed0c782dcb021539':
Remove the handle headroom if the challenge is open.
Daniel Sandler [Mon, 29 Oct 2012 21:22:29 +0000 (14:22 -0700)]
am
a84d353c: am
c9a7d989: Merge "Expand top of touchable area of challenge drag handle." into jb-mr1-lockscreen-dev
* commit '
a84d353c772c3e2bdec4b2f36f6822ee62d117ed':
Expand top of touchable area of challenge drag handle.
John Spurlock [Mon, 29 Oct 2012 21:22:25 +0000 (14:22 -0700)]
am
f04a6ee7: am
af5b49c1: Merge "Update swipe edge size to match ux prototype." into jb-mr1-lockscreen-dev
* commit '
f04a6ee7058a65cc1d2e24c5e572eb03b4914ed0':
Update swipe edge size to match ux prototype.
Dianne Hackborn [Mon, 29 Oct 2012 21:22:18 +0000 (14:22 -0700)]
am
e1ea4d35: am
8a6f6a8c: Merge "Fix issue #
7419050: Time is not getting updated after launching Clock" into jb-mr1-dev
* commit '
e1ea4d35d3abc05f2cd7bd961373ef164caf2a5b':
Fix issue #
7419050: Time is not getting updated after launching Clock
Amith Yamasani [Mon, 29 Oct 2012 21:22:11 +0000 (14:22 -0700)]
am
16f18a4c: am
08482454: Merge "Fix the user name for the owner." into jb-mr1-dev
* commit '
16f18a4ce879c53a06cffc552a5d25e73bed5327':
Fix the user name for the owner.
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
Adam Cohen [Mon, 29 Oct 2012 21:01:20 +0000 (14:01 -0700)]
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
Michael Jurka [Mon, 29 Oct 2012 21:01:10 +0000 (14:01 -0700)]
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
Amith Yamasani [Mon, 29 Oct 2012 21:01:07 +0000 (14:01 -0700)]
am
369f1c92: am
08482454: Merge "Fix the user name for the owner." into jb-mr1-dev
* commit '
369f1c92e7cc1fba13b04698fb310fded1a85eda':
Fabrice Di Meglio [Mon, 29 Oct 2012 21:01:03 +0000 (14:01 -0700)]
am
b8a220cb: am
07ce0ca2: Merge "Fix bug #
7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
* commit '
b8a220cbef4bc6a3af327fce51d59aacd91a9935':
Jeff Brown [Mon, 29 Oct 2012 21:01:00 +0000 (14:01 -0700)]
am
d3d523da: am
4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
* commit '
d3d523da9a9906beb78c1fd9fa90dac7ea10e5ad':
Daniel Sandler [Mon, 29 Oct 2012 21:00:56 +0000 (14:00 -0700)]
am
a41ca127: am
50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev
* commit '
a41ca127a6bb81ce4f660bda25d62105fba6de3a':
Adam Powell [Mon, 29 Oct 2012 21:00:53 +0000 (14:00 -0700)]
am
942a60d8: Merge "Fix lockscreen slider bugs" into jb-mr1-lockscreen-dev
* commit '
942a60d8a40a55b94ce443a71e7dc632911f0e84':
Fix lockscreen slider bugs
John Spurlock [Mon, 29 Oct 2012 21:00:48 +0000 (14:00 -0700)]
am
011717d0: Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev
* commit '
011717d0648878eedec9e6de90b8fba12f550df7':
Implement "sticky" widget logic.
Daniel Sandler [Mon, 29 Oct 2012 21:00:43 +0000 (14:00 -0700)]
am
1f887cb2: Merge "Make the add widget button hitrectangle smaller." into jb-mr1-lockscreen-dev
* commit '
1f887cb2928695c81df9cfbbb730225ee81051dd':
Make the add widget button hitrectangle smaller.
Daniel Sandler [Mon, 29 Oct 2012 21:00:39 +0000 (14:00 -0700)]
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.
Daniel Sandler [Mon, 29 Oct 2012 21:00:36 +0000 (14:00 -0700)]
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.
John Spurlock [Mon, 29 Oct 2012 21:00:32 +0000 (14:00 -0700)]
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.
Dianne Hackborn [Mon, 29 Oct 2012 20:56:01 +0000 (13:56 -0700)]
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
Amith Yamasani [Mon, 29 Oct 2012 20:55:57 +0000 (13:55 -0700)]
am
08482454: Merge "Fix the user name for the owner." into jb-mr1-dev
* commit '
084824548f9706db8356ed4480c282288ffc0bd0':
Fix the user name for the owner.
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
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':
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.
Bryan Mawhinney [Mon, 29 Oct 2012 20:30:41 +0000 (13:30 -0700)]
am
661c2e74: am
33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev
* commit '
661c2e7495955f063ce0108ec2d76164fd75bec5':
Daniel Sandler [Mon, 29 Oct 2012 20:30:36 +0000 (13:30 -0700)]
am
d5692742: PIN pad cosmetics.
* commit '
d5692742c1ff056e9fe55a495632229c86ed5384':
PIN pad cosmetics.
Daniel Sandler [Mon, 29 Oct 2012 20:30:32 +0000 (13:30 -0700)]
am
2c1ce056: Cleaning up password input.
* commit '
2c1ce0564fbd329e9e9ccfca100c69cfc1fd2645':
Cleaning up password input.
Daniel Sandler [Mon, 29 Oct 2012 20:30:28 +0000 (13:30 -0700)]
am
51d39f2d: Add ECA to PIN view
* commit '
51d39f2df9ed787644290fbff49b3a8282444c9a':
Add ECA to PIN view
Jim Miller [Mon, 29 Oct 2012 20:30:24 +0000 (13:30 -0700)]
am
df99b1d5: Merge "Fix new password view in keyguard" into jb-mr1-lockscreen-dev
* commit '
df99b1d5d34c69f1a2e4490dadae5e69a0dd5a72':
Fix new password view in keyguard
Michael Jurka [Mon, 29 Oct 2012 20:30:20 +0000 (13:30 -0700)]
Michael Jurka [Mon, 29 Oct 2012 20:30:16 +0000 (13:30 -0700)]
am
147dfc86: Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev
* commit '
147dfc8642ecbdce527d18bdbeece7b7d05dc883':
Adding ability to add multiple widgets to keyguard
Dianne Hackborn [Mon, 29 Oct 2012 20:30:09 +0000 (13:30 -0700)]
am
db3efba6: am
ead7d90e: Merge "Fix issue #
7408647: Add getUserCount() API" into jb-mr1-dev
* commit '
db3efba6fc3a71cfd0a6406704970f1bcb13242f':
Daniel Sandler [Mon, 29 Oct 2012 20:30:04 +0000 (13:30 -0700)]
am
5fbc82ef: am
38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev
* commit '
5fbc82ef79277d14444549098147ecea69caf6a6':
Adam Powell [Mon, 29 Oct 2012 20:30:00 +0000 (13:30 -0700)]
am
eee20931: Beginnings of bouncer support; add scrims and state tracking
* commit '
eee209313d564be37b8fc068f785b3844cd6597e':
Beginnings of bouncer support; add scrims and state tracking
Irfan Sheriff [Mon, 29 Oct 2012 20:29:57 +0000 (13:29 -0700)]
am
9253f561: am
4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev
* commit '
9253f56163a7b88a09bc4347ba6fe631dd7a08d8':
Jeff Brown [Mon, 29 Oct 2012 20:29:47 +0000 (13:29 -0700)]
am
2ca85c20: am
900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
* commit '
2ca85c20517037a86fd59eba7946267dd49b4c61':
Adam Powell [Mon, 29 Oct 2012 20:29:43 +0000 (13:29 -0700)]
am
c0657fb3: Integrate changes from lockscreen proto app
* commit '
c0657fb36ce5ede652e8af084e484d07abfb449d':
Integrate changes from lockscreen proto app
Romain Guy [Mon, 29 Oct 2012 20:29:40 +0000 (13:29 -0700)]
am
ee0f615f: am
99333315: Merge "Ensure we have a GL context before deleting View layers Bug #
7391098" into jb-mr1-dev
* commit '
ee0f615ffdbb790a6bb64b0efe444b4c7f8fe291':
Baligh Uddin [Mon, 29 Oct 2012 20:29:36 +0000 (13:29 -0700)]
am
f785af4d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
f785af4d2ed49b8bf947df28d77b6c9b7cf1611d':
Import translations. DO NOT MERGE
OSDN Git Service
