OSDN Git Service
Winson Chung [Tue, 30 Oct 2012 00:14:34 +0000 (17:14 -0700)]
am
e8e627db: am
69d0686f: am
113ca64a: Merge "Making the PagedView full screen on tablets." into jb-mr1-lockscreen-dev
* commit '
e8e627dbdf0cce3528df1b239a7b215d65e63923':
Making the PagedView full screen on tablets.
Dianne Hackborn [Tue, 30 Oct 2012 00:14:30 +0000 (17:14 -0700)]
am
0cc7b94e: am
ffeb45a8: am
8905923c: am
8a6f6a8c: Merge "Fix issue #
7419050: Time is not getting updated after launching Clock" into jb-mr1-dev
* commit '
0cc7b94eee16d72c90bdfdc787118038ee6b1314':
Adam Cohen [Tue, 30 Oct 2012 00:14:26 +0000 (17:14 -0700)]
am
14bc0bd5: am
40011d6f: am
8daee807: Merge "3D carousel initial stab -- paging outlines / alpha effects pending design" into jb-mr1-lockscreen-dev
* commit '
14bc0bd5bef1e92ecb57435133bb3b4b3db3fa10':
3D carousel initial stab -- paging outlines / alpha effects pending design
Michael Jurka [Tue, 30 Oct 2012 00:14:22 +0000 (17:14 -0700)]
am
769e5f0b: am
18b5b1f4: am
a15eeacf: Merge "Fix bug where it wasn\'t possible to add widgets" into jb-mr1-lockscreen-dev
* commit '
769e5f0b30e263831fdbf8ba6f052124c137daa3':
Fix bug where it wasn't possible to add widgets
Amith Yamasani [Tue, 30 Oct 2012 00:14:18 +0000 (17:14 -0700)]
am
a4a15cf6: am
de264c6d: am
369f1c92: am
08482454: Merge "Fix the user name for the owner." into jb-mr1-dev
* commit '
a4a15cf6f3f26468b37f01981e9aa742883cc7aa':
Fabrice Di Meglio [Tue, 30 Oct 2012 00:14:15 +0000 (17:14 -0700)]
am
dbf649b0: am
bb0e7645: am
b8a220cb: am
07ce0ca2: Merge "Fix bug #
7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
* commit '
dbf649b07cc7f848ac5b3f826aa2d819347e2f7b':
Jeff Brown [Tue, 30 Oct 2012 00:14:10 +0000 (17:14 -0700)]
am
86772b38: am
b6fcfdb8: am
d3d523da: am
4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
* commit '
86772b38205a1b05f80d9d40577b4912ccf06c1c':
Daniel Sandler [Tue, 30 Oct 2012 00:14:05 +0000 (17:14 -0700)]
am
764d9120: am
7587e2a8: am
a41ca127: am
50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev
* commit '
764d912075296f9259ba1f05d621654cdc72ae21':
Adam Powell [Tue, 30 Oct 2012 00:14:02 +0000 (17:14 -0700)]
am
54e94487: am
a5b74cc4: am
942a60d8: Merge "Fix lockscreen slider bugs" into jb-mr1-lockscreen-dev
* commit '
54e94487c7eddbac1db1717a2faf4dfebd6da072':
Fix lockscreen slider bugs
John Spurlock [Tue, 30 Oct 2012 00:13:56 +0000 (17:13 -0700)]
am
46d9322f: am
e25974c3: am
011717d0: Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev
* commit '
46d9322fc747990f73155f8635c595dc7ce916ac':
Implement "sticky" widget logic.
Daniel Sandler [Tue, 30 Oct 2012 00:13:52 +0000 (17:13 -0700)]
am
4ac6f492: am
3d6438c8: am
1f887cb2: Merge "Make the add widget button hitrectangle smaller." into jb-mr1-lockscreen-dev
* commit '
4ac6f4922b942ae5561ee882111e22f7cda0a6bb':
Make the add widget button hitrectangle smaller.
Daniel Sandler [Tue, 30 Oct 2012 00:13:48 +0000 (17:13 -0700)]
am
06c43b43: am
cc3e894a: am
61426f3d: Merge "Remove the handle headroom if the challenge is open." into jb-mr1-lockscreen-dev
* commit '
06c43b430e9c97c6abe379dacfad298e5285f2f9':
Remove the handle headroom if the challenge is open.
Daniel Sandler [Tue, 30 Oct 2012 00:13:44 +0000 (17:13 -0700)]
am
f684beb8: am
a84d353c: am
c9a7d989: Merge "Expand top of touchable area of challenge drag handle." into jb-mr1-lockscreen-dev
* commit '
f684beb8ea0603eb53c33f9cf5fecb664b0eb27c':
Expand top of touchable area of challenge drag handle.
John Spurlock [Tue, 30 Oct 2012 00:13:40 +0000 (17:13 -0700)]
am
2123456a: am
f04a6ee7: am
af5b49c1: Merge "Update swipe edge size to match ux prototype." into jb-mr1-lockscreen-dev
* commit '
2123456ae2568684d3ee46d7107e4511ee9e5187':
Update swipe edge size to match ux prototype.
Dianne Hackborn [Tue, 30 Oct 2012 00:13:36 +0000 (17:13 -0700)]
am
8729671c: am
e1ea4d35: am
8a6f6a8c: Merge "Fix issue #
7419050: Time is not getting updated after launching Clock" into jb-mr1-dev
* commit '
8729671cc0f99a5ca03cc7b6911b2bf98a19bef1':
Fix issue #
7419050: Time is not getting updated after launching Clock
Amith Yamasani [Tue, 30 Oct 2012 00:13:29 +0000 (17:13 -0700)]
am
b67f91b6: am
16f18a4c: am
08482454: Merge "Fix the user name for the owner." into jb-mr1-dev
* commit '
b67f91b672d898ae20a1e5848a37aadd33ab8167':
Fix the user name for the owner.
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"
Winson Chung [Mon, 29 Oct 2012 21:23:20 +0000 (14:23 -0700)]
am
69d0686f: am
113ca64a: Merge "Making the PagedView full screen on tablets." into jb-mr1-lockscreen-dev
* commit '
69d0686fdc20e95bd86079f6368acd4affb07b88':
Making the PagedView full screen on tablets.
Dianne Hackborn [Mon, 29 Oct 2012 21:23:16 +0000 (14:23 -0700)]
am
ffeb45a8: am
8905923c: am
8a6f6a8c: Merge "Fix issue #
7419050: Time is not getting updated after launching Clock" into jb-mr1-dev
* commit '
ffeb45a8e579e328e30920426adb9d70c78346a4':
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
Winson Chung [Mon, 29 Oct 2012 21:01:32 +0000 (14:01 -0700)]
am
113ca64a: Merge "Making the PagedView full screen on tablets." into jb-mr1-lockscreen-dev
* commit '
113ca64a2275ad05c1429edcf56c688d823e308a':
Making the PagedView full screen on tablets.
Dianne Hackborn [Mon, 29 Oct 2012 21:01:26 +0000 (14:01 -0700)]
am
8905923c: am
8a6f6a8c: Merge "Fix issue #
7419050: Time is not getting updated after launching Clock" into jb-mr1-dev
* commit '
8905923c63b73deecb82567f16404b2cf90de8cc':
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
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