OSDN Git Service
Irfan Sheriff [Tue, 30 Oct 2012 16:17:49 +0000 (09:17 -0700)]
am
1863f554: am
5193efba: am
4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev
* commit '
1863f554dd85aae0a427db305e2803513b120106':
Jim Miller [Tue, 30 Oct 2012 16:17:45 +0000 (09:17 -0700)]
am
f4642bc8: am
0b728244: Update status area and emergency call logic to match new spec
* commit '
f4642bc84b7d7d39d0455498b1944e492185c8d4':
Update status area and emergency call logic to match new spec
Adam Cohen [Tue, 30 Oct 2012 16:17:41 +0000 (09:17 -0700)]
am
c5c0028c: am
e3643138: Implementing new slider / widget interaction where frame goes around the widget
* commit '
c5c0028c6dad676e0c5ba6527aa5a3ce4b459fed':
Implementing new slider / widget interaction where frame goes around the widget
Baligh Uddin [Tue, 30 Oct 2012 16:17:38 +0000 (09:17 -0700)]
am
83c7422f: am
b317db4c: am
dbcec903: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
83c7422fc03714a1fb311438208f8c1837af42e7':
Baligh Uddin [Tue, 30 Oct 2012 16:17:35 +0000 (09:17 -0700)]
am
45625ca1: am
e5e45b18: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
45625ca1d4dd62f4bd4da89a7774c99bb2e28957':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Oct 2012 16:14:56 +0000 (09:14 -0700)]
am
6bc36ee9: am
5c33a55f: am
2407ed15: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
6bc36ee95f2b4ef6e76cbabb0391dd57473be53b':
Baligh Uddin [Tue, 30 Oct 2012 16:14:52 +0000 (09:14 -0700)]
am
4e78295a: am
ff45c88d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
4e78295ac871a2d3d35b07f18c83868976705097':
Import translations. DO NOT MERGE
Irfan Sheriff [Tue, 30 Oct 2012 16:13:49 +0000 (09:13 -0700)]
am
5193efba: am
4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev
* commit '
5193efba34071527234f155ffb8cfe8850b14e00':
Jim Miller [Tue, 30 Oct 2012 16:13:46 +0000 (09:13 -0700)]
am
0b728244: Update status area and emergency call logic to match new spec
* commit '
0b728244dc87b4a453f2191c2cb37a86e91aee0a':
Update status area and emergency call logic to match new spec
Adam Cohen [Tue, 30 Oct 2012 16:13:42 +0000 (09:13 -0700)]
am
e3643138: Implementing new slider / widget interaction where frame goes around the widget
* commit '
e3643138c89d49a01ba6a622ffaf71c9a95d5cdc':
Implementing new slider / widget interaction where frame goes around the widget
Baligh Uddin [Tue, 30 Oct 2012 16:13:38 +0000 (09:13 -0700)]
am
b317db4c: am
dbcec903: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
b317db4c5c32ad419a777986bd97a659af1142d2':
Baligh Uddin [Tue, 30 Oct 2012 16:13:33 +0000 (09:13 -0700)]
am
e5e45b18: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
e5e45b18319cce8c551ba655e9a7e9ffd41d052e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Oct 2012 16:11:32 +0000 (09:11 -0700)]
am
5c33a55f: am
2407ed15: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
5c33a55fc4bb7c24777c14fd030ebc121aedfce3':
Baligh Uddin [Tue, 30 Oct 2012 16:11:31 +0000 (09:11 -0700)]
am
ff45c88d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
ff45c88de22a604d4519a1978a76481f31ffd2dc':
Import translations. DO NOT MERGE
Jeff Brown [Tue, 30 Oct 2012 15:53:24 +0000 (08:53 -0700)]
am
b78af430: am
4d36d9d8: am
99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev
* commit '
b78af430f03c40875e1ee0d1317f2e9537339c15':
Dirk Dougherty [Tue, 30 Oct 2012 15:53:21 +0000 (08:53 -0700)]
am
f322c943: am
36eba5d0: am
7b9a2889: Doc change: fix some table formatting.
* commit '
f322c94333d9fdebc13d866fa4fefd6f6ce28faa':
John Spurlock [Tue, 30 Oct 2012 15:53:17 +0000 (08:53 -0700)]
am
0cb115f6: am
b2f21c53: Merge "Use settings to persist sticky widget." into jb-mr1-lockscreen-dev
* commit '
0cb115f6bcfbff970cd66d89c9db951b4735c801':
Use settings to persist sticky widget.
Daniel Sandler [Tue, 30 Oct 2012 15:53:13 +0000 (08:53 -0700)]
am
0f527aa5: am
bc676a0a: Merge "Improved handle touch interaction." into jb-mr1-lockscreen-dev
* commit '
0f527aa5f64ba43eb75a00baa162191b6bc8a076':
Improved handle touch interaction.
Daniel Sandler [Tue, 30 Oct 2012 15:53:10 +0000 (08:53 -0700)]
am
a01cfd01: am
f002bf19: Merge "Bigger lock icon." into jb-mr1-lockscreen-dev
* commit '
a01cfd01ac0e836c690cb9bf723c777dcf86d9c9':
Bigger lock icon.
Adam Cohen [Tue, 30 Oct 2012 15:53:06 +0000 (08:53 -0700)]
am
9633ea97: am
47c6cfaa: Ensuring layers are enabled on screen on and that pages are correctly transformed
* commit '
9633ea97c2558d7cb346cc227d3b1d479a176f1a':
Ensuring layers are enabled on screen on and that pages are correctly transformed
Adam Cohen [Tue, 30 Oct 2012 15:53:02 +0000 (08:53 -0700)]
am
7fb0021d: am
effc03a9: Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev
* commit '
7fb0021d18a6491fdc816027081bff8c8d65f5aa':
Polish to 3d carousel and standard pager
Eric Laurent [Tue, 30 Oct 2012 15:52:59 +0000 (08:52 -0700)]
am
f68f41b4: am
e7cd58bd: am
c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev
* commit '
f68f41b474ed35875a771ec71fb86887b629c58c':
Chris Wren [Tue, 30 Oct 2012 15:52:55 +0000 (08:52 -0700)]
am
fe9356c0: am
1d269e8e: Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev
* commit '
fe9356c074278f1a936fbd2d9eb00d9cf1914984':
single unlock target with honycomb semantics
Daniel Sandler [Tue, 30 Oct 2012 15:52:52 +0000 (08:52 -0700)]
am
83372881: am
fdbbbba4: Updated add-widget graphics
* commit '
8337288183c9b5e145b44dbc8bae77f463edb4fc':
Updated add-widget graphics
Jeff Brown [Tue, 30 Oct 2012 15:49:12 +0000 (08:49 -0700)]
am
4d36d9d8: am
99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev
* commit '
4d36d9d80c616d469df662089ebf9f335890acb4':
Dirk Dougherty [Tue, 30 Oct 2012 15:49:08 +0000 (08:49 -0700)]
am
36eba5d0: am
7b9a2889: Doc change: fix some table formatting.
* commit '
36eba5d0a9bc8a7314349f86d617e300eb6b2fa3':
John Spurlock [Tue, 30 Oct 2012 15:49:05 +0000 (08:49 -0700)]
am
b2f21c53: Merge "Use settings to persist sticky widget." into jb-mr1-lockscreen-dev
* commit '
b2f21c53cf423cad5cf2f5d92579258decb40631':
Use settings to persist sticky widget.
Daniel Sandler [Tue, 30 Oct 2012 15:49:01 +0000 (08:49 -0700)]
am
bc676a0a: Merge "Improved handle touch interaction." into jb-mr1-lockscreen-dev
* commit '
bc676a0a1d15e932ca74bb94f3ae392e0a9dbbe2':
Improved handle touch interaction.
Daniel Sandler [Tue, 30 Oct 2012 15:48:57 +0000 (08:48 -0700)]
am
f002bf19: Merge "Bigger lock icon." into jb-mr1-lockscreen-dev
* commit '
f002bf19e841301388238ef19552c9dfc24d4d72':
Bigger lock icon.
Adam Cohen [Tue, 30 Oct 2012 15:48:52 +0000 (08:48 -0700)]
am
47c6cfaa: Ensuring layers are enabled on screen on and that pages are correctly transformed
* commit '
47c6cfaa3799951f999a4d2000cb628080708551':
Ensuring layers are enabled on screen on and that pages are correctly transformed
Adam Cohen [Tue, 30 Oct 2012 15:48:48 +0000 (08:48 -0700)]
am
effc03a9: Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev
* commit '
effc03a952a881108fcbb51d4007ea0c21694077':
Polish to 3d carousel and standard pager
Eric Laurent [Tue, 30 Oct 2012 15:48:44 +0000 (08:48 -0700)]
am
e7cd58bd: am
c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev
* commit '
e7cd58bd0323c02ebc51e48db11fe926ac4b9f9c':
Chris Wren [Tue, 30 Oct 2012 15:48:38 +0000 (08:48 -0700)]
am
1d269e8e: Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev
* commit '
1d269e8e8fc508f59e4010777f4da6a2feafb0a4':
single unlock target with honycomb semantics
Daniel Sandler [Tue, 30 Oct 2012 15:48:35 +0000 (08:48 -0700)]
am
fdbbbba4: Updated add-widget graphics
* commit '
fdbbbba4cd4807bed1200f714609d4000501d4ee':
Updated add-widget graphics
Kenny Root [Tue, 30 Oct 2012 00:21:28 +0000 (17:21 -0700)]
am
b33588e1: am
ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev
* commit '
b33588e1353076398b081a2ec4c79a04305e256e':
Move app-lib definition up for system app scanning
Kenny Root [Tue, 30 Oct 2012 00:18:04 +0000 (17:18 -0700)]
am
ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev
* commit '
ca60ba1874a6537b42854b52cd766ebf1a8c8189':
Move app-lib definition up for system app scanning
Kenny Root [Tue, 30 Oct 2012 00:14:50 +0000 (17:14 -0700)]
Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev
Mathias Agopian [Mon, 29 Oct 2012 23:55:40 +0000 (16:55 -0700)]
am
fdd714f8: am
0da554ac: Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev
* commit '
fdd714f8d52a7ab2b96839b7cfe8ed917417383b':
fix an overflow in the orientation sensonr calculations
Mathias Agopian [Mon, 29 Oct 2012 23:52:41 +0000 (16:52 -0700)]
am
0da554ac: Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev
* commit '
0da554acfbf7cf0b8e522c5b8b83588cf6f72ddf':
fix an overflow in the orientation sensonr calculations
Mathias Agopian [Mon, 29 Oct 2012 23:49:48 +0000 (16:49 -0700)]
Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev
Mathias Agopian [Mon, 29 Oct 2012 23:03:46 +0000 (16:03 -0700)]
fix an overflow in the orientation sensonr calculations
this would cause the TYPE_ORIENTATION sensor to report NaN after
40 to 800 hours of up-time. this problem only affects the older
and deprecated SensorListener API.
Bug:
7434842
Change-Id: Ie8593cca9c98e4907e417db4106c06151e3ee9a1
Eric Laurent [Mon, 29 Oct 2012 22:28:08 +0000 (15:28 -0700)]
am
40d076e6: am
61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev
* commit '
40d076e61748ba304f754501ddaad63a0255bf96':
audio service: make dock audio is off by default
Jean-Michel Trivi [Mon, 29 Oct 2012 22:28:04 +0000 (15:28 -0700)]
am
0c419856: am
643e3372: Merge "No playback and music widget from other user on user switch" into jb-mr1-dev
* commit '
0c41985698f87ef15eb9b84f7727cc937307420b':
No playback and music widget from other user on user switch
Eric Laurent [Mon, 29 Oct 2012 22:25:29 +0000 (15:25 -0700)]
am
61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev
* commit '
61ebf9cd8f0b7bfbad6840bb828f2300beef745d':
audio service: make dock audio is off by default
Jean-Michel Trivi [Mon, 29 Oct 2012 22:25:24 +0000 (15:25 -0700)]
am
643e3372: Merge "No playback and music widget from other user on user switch" into jb-mr1-dev
* commit '
643e33725866f76402ae147f5b585f7dafdc6d17':
No playback and music widget from other user on user switch
Baligh Uddin [Mon, 29 Oct 2012 22:22:54 +0000 (15:22 -0700)]
am
c80f671a: am
c712079b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
c80f671a02c204947b0df569a17f8b2258383454':
Import translations. DO NOT MERGE
Eric Laurent [Mon, 29 Oct 2012 22:21:33 +0000 (15:21 -0700)]
Merge "audio service: make dock audio is off by default" into jb-mr1-dev
Jean-Michel Trivi [Mon, 29 Oct 2012 22:16:13 +0000 (15:16 -0700)]
Merge "No playback and music widget from other user on user switch" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 22:12:28 +0000 (15:12 -0700)]
am
c86c4ae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
c86c4ae693d13f467807cbd8c3aa2025045018c2':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 22:12:25 +0000 (15:12 -0700)]
am
c712079b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
c712079b5c3c34b7a38b8cd0bfc974f8832c1ab0':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 22:10:09 +0000 (15:10 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 22:08:52 +0000 (15:08 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Amith Yamasani [Mon, 29 Oct 2012 22:05:07 +0000 (15:05 -0700)]
am
7fd41276: am
7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev
* commit '
7fd412767c063ccd2d80a3db6a0d27cf0ff6d261':
Fix for some downloaded apps showing up on all users
Baligh Uddin [Mon, 29 Oct 2012 22:05:06 +0000 (15:05 -0700)]
am
34a1e0dd: (-s ours) am
f64e70fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
34a1e0dda8d6f728e9c324e1e25e3844ec91e4b1':
Import translations. DO NOT MERGE
Amith Yamasani [Mon, 29 Oct 2012 22:02:32 +0000 (15:02 -0700)]
am
7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev
* commit '
7c258505ecfbf726c56814963bee798e74ff4cb4':
Fix for some downloaded apps showing up on all users
Amith Yamasani [Mon, 29 Oct 2012 21:57:20 +0000 (14:57 -0700)]
Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 21:54:29 +0000 (14:54 -0700)]
am
f64e70fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
f64e70fd045c2a786e3d3edf880d806e93beec3b':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 21:51:40 +0000 (14:51 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 21:50:30 +0000 (14:50 -0700)]
am
4ee14e63: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
4ee14e6392b728ab8843fc4a785b70d3ea2701a6':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 21:47:41 +0000 (14:47 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Victoria Lease [Mon, 29 Oct 2012 21:31:08 +0000 (14:31 -0700)]
am
629a90cf: am
83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev
* commit '
629a90cf55cd6aa2e326dfdae2142e2b7e156731':
FusedLocation runs per user as user
Victoria Lease [Mon, 29 Oct 2012 21:31:05 +0000 (14:31 -0700)]
am
4f5561b7: am
167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev
* commit '
4f5561b71007f0b27f6bb385e7a7f4f67c88ed75':
Revert "make FLP play nicely with multiuser"
Irfan Sheriff [Mon, 29 Oct 2012 21:31:01 +0000 (14:31 -0700)]
am
b20dae4a: am
4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev
* commit '
b20dae4a8d63f28bbb6ae8c55f191cc52dd7dc47':
Fix handling escaped chars in ssid
Baligh Uddin [Mon, 29 Oct 2012 21:30:57 +0000 (14:30 -0700)]
am
ed6192f7: am
dbcec903: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
ed6192f7010b37e5252c9a409cb07ce75bb12d36':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 21:30:57 +0000 (14:30 -0700)]
am
7ca0dc50: (-s ours) am
2407ed15: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
7ca0dc50ded270ea0a4d3b0b9ec1b5609a51465f':
Import translations. DO NOT MERGE
Jeff Brown [Mon, 29 Oct 2012 21:23:56 +0000 (14:23 -0700)]
am
9531b1c4: am
99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev
* commit '
9531b1c4889dfb30897eabd4db95364e1f316f44':
Don't scale screen brightness by electron beam level.
Dirk Dougherty [Mon, 29 Oct 2012 21:23:52 +0000 (14:23 -0700)]
am
f1d7dc73: am
7b9a2889: Doc change: fix some table formatting.
* commit '
f1d7dc730fc2fb8a9e5c913fb61df82b9d9104eb':
Doc change: fix some table formatting.
Eric Laurent [Mon, 29 Oct 2012 21:23:48 +0000 (14:23 -0700)]
am
67baf878: am
c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev
* commit '
67baf8781bbf7cb70c0570ab3b3370265c9c7369':
add settings for dock audio enabled
Fabrice Di Meglio [Mon, 29 Oct 2012 21:23:43 +0000 (14:23 -0700)]
am
9d662c77: 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 '
9d662c77650a1cee9d05ad93743684482eeba935':
Revert "Fix bug #
7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"
Victoria Lease [Mon, 29 Oct 2012 21:23:38 +0000 (14:23 -0700)]
am
cee17140: am
319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev
* commit '
cee171409b4145876328f62823277e35387e66e4':
make FLP play nicely with multiuser
Adam Powell [Mon, 29 Oct 2012 21:23:29 +0000 (14:23 -0700)]
am
daa7218a: am
0a27c486: Fix measurement bug in keyguard/MultiPaneChallengeLayout
* commit '
daa7218a9ea4e0d48e4cecf96540e53f2e3d8945':
Fix measurement bug in keyguard/MultiPaneChallengeLayout
Adam Powell [Mon, 29 Oct 2012 21:23:24 +0000 (14:23 -0700)]
am
91885b55: am
b0ed8bdb: Merge "Keyguard - prevent slider intercept when we don\'t want it" into jb-mr1-lockscreen-dev
* commit '
91885b5528ee1b8fec4db08a402eb90a36a84776':
Keyguard - prevent slider intercept when we don't want it
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
Victoria Lease [Mon, 29 Oct 2012 21:12:28 +0000 (14:12 -0700)]
am
83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev
* commit '
83f60c5247ba60b6aa536b2d8191df9289102600':
FusedLocation runs per user as user
Victoria Lease [Mon, 29 Oct 2012 21:12:25 +0000 (14:12 -0700)]
am
167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev
* commit '
167282f19f58ba5271c37bb16c4ea5bcd0bf6303':
Revert "make FLP play nicely with multiuser"
Irfan Sheriff [Mon, 29 Oct 2012 21:12:19 +0000 (14:12 -0700)]
am
4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev
* commit '
4bfa1e99e2ce5aa96465872a159377102a5bb4cb':
Fix handling escaped chars in ssid
Baligh Uddin [Mon, 29 Oct 2012 21:12:04 +0000 (14:12 -0700)]
am
dbcec903: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
dbcec903c858b65c78620e2b06238e42ff4d12da':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 21:12:00 +0000 (14:12 -0700)]
am
2407ed15: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
2407ed15318453e5284153477453a94f19c324f4':
Import translations. DO NOT MERGE
Jeff Brown [Mon, 29 Oct 2012 21:11:56 +0000 (14:11 -0700)]
am
99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev
* commit '
99e88721a8bd19f04278e2fdccd224fc7ee705d4':
Don't scale screen brightness by electron beam level.
Dirk Dougherty [Mon, 29 Oct 2012 21:11:46 +0000 (14:11 -0700)]
am
7b9a2889: Doc change: fix some table formatting.
* commit '
7b9a28892b1821a657bc9de5245528557d15a154':
Doc change: fix some table formatting.
Eric Laurent [Mon, 29 Oct 2012 21:02:31 +0000 (14:02 -0700)]
am
c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev
* commit '
c99a1107c0d4fdf47595e5072192d647a01e13b3':
add settings for dock audio enabled
Fabrice Di Meglio [Mon, 29 Oct 2012 21:01:51 +0000 (14:01 -0700)]
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)"
Victoria Lease [Mon, 29 Oct 2012 21:01:47 +0000 (14:01 -0700)]
am
319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev
* commit '
319c7e85019350e3a5f26c64803900b945130c3b':
make FLP play nicely with multiuser
Adam Powell [Mon, 29 Oct 2012 21:01:44 +0000 (14:01 -0700)]
am
0a27c486: Fix measurement bug in keyguard/MultiPaneChallengeLayout
* commit '
0a27c4865e5f3afe891680f687ac75c6a659fb84':
Fix measurement bug in keyguard/MultiPaneChallengeLayout