Jim Miller
ced4645173
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
2012-10-30 09:17:45 -07:00
Adam Cohen
b829b57f74
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
2012-10-30 09:17:41 -07:00
Baligh Uddin
967fa0e3b6
am 83c7422f: am b317db4c: am dbcec903: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '83c7422fc03714a1fb311438208f8c1837af42e7':
2012-10-30 09:17:38 -07:00
Baligh Uddin
461c3157ef
am 45625ca1: am e5e45b18: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '45625ca1d4dd62f4bd4da89a7774c99bb2e28957':
Import translations. DO NOT MERGE
2012-10-30 09:17:35 -07:00
Chris Wren
a014c7a0df
am 16d83fd1: Merge "post user activity on widget pager moves" into jb-mr1-lockscreen-dev
...
* commit '16d83fd13a91c124735e7f4ee2244214ad8523da':
post user activity on widget pager moves
2012-10-30 09:15:06 -07:00
John Spurlock
7d14e57c58
am cf69c56b: "Fix camera widget scale-up regression." -> frameworks/base
...
* commit 'cf69c56b8336e2bd5c8e20f948cc80ca53e0c25a':
"Fix camera widget scale-up regression." -> frameworks/base
2012-10-30 09:15:03 -07:00
Baligh Uddin
359ae5fc7a
am 6bc36ee9: am 5c33a55f: am 2407ed15: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '6bc36ee95f2b4ef6e76cbabb0391dd57473be53b':
2012-10-30 09:14:56 -07:00
Svetoslav Ganov
8f1aaa147d
am 567fa759: Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
...
* commit '567fa759493ac38648674d3121c3b9d731653705':
Lockscreen accessibility - strings.
2012-10-30 09:14:55 -07:00
Adam Cohen
eec804e364
am 8a7785c7: Cleaning up the way in which the challenge influences widget size on first measure pass
...
* commit '8a7785c7aa2df74203276299e10b0d9056cd0560':
Cleaning up the way in which the challenge influences widget size on first measure pass
2012-10-30 09:14:52 -07:00
Baligh Uddin
b7f97ef3fe
am 4e78295a: am ff45c88d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '4e78295ac871a2d3d35b07f18c83868976705097':
Import translations. DO NOT MERGE
2012-10-30 09:14:52 -07:00
Danielle Millett
e984610567
am 1108a2cb: Added a makeInvisible call to Face Unlock
...
* commit '1108a2cb412b054cc9e4acc48182c46c45180c0c':
Added a makeInvisible call to Face Unlock
2012-10-30 09:14:46 -07:00
Adam Powell
2d22c9d720
am cfc3086b: Keyguard polishing
...
* commit 'cfc3086b18396df03f982fb98112649dc5b5a6f2':
Keyguard polishing
2012-10-30 09:14:42 -07:00
Winson Chung
49d42b9318
am 7bf93cf5: Merge "Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition." into jb-mr1-lockscreen-dev
...
* commit '7bf93cf50fc028a50433741b4e1f1ee8b80f74f0':
Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition.
2012-10-30 09:14:38 -07:00
Kenny Root
b769ff3b4f
am 750d5e11: am ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev
...
* commit '750d5e11dffa89f90a71aa55244d069ebd8e39d0':
2012-10-30 09:14:34 -07:00
Mathias Agopian
49d9a615fb
am e4335ada: am 0da554ac: Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev
...
* commit 'e4335adad2c726c6ac49927ae71cecfc8089c3f3':
2012-10-30 09:14:30 -07:00
John Spurlock
c6b4cfa765
am d9910249: Merge ""Implement grace period for camera widget." -> frame/base" into jb-mr1-lockscreen-dev
...
* commit 'd9910249a4127c351f23d46623df645750d3d21e':
"Implement grace period for camera widget." -> frame/base
2012-10-30 09:14:26 -07:00
Eric Laurent
7066b888c2
am c864d952: am 61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev
...
* commit 'c864d952bcb0f229b98254667f273e7a91da5d45':
2012-10-30 09:14:23 -07:00
Jean-Michel Trivi
805345b2b6
am f1c62be6: am 643e3372: Merge "No playback and music widget from other user on user switch" into jb-mr1-dev
...
* commit 'f1c62be6b4f1d631666deedd4ef02981ed7536f9':
2012-10-30 09:14:19 -07:00
Baligh Uddin
38e2dbb51b
am b560cfb3: am c712079b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'b560cfb3b6595939d1cf7bf9ce9ce5d352254993':
2012-10-30 09:14:15 -07:00
Baligh Uddin
39e670af31
am be7a814e: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit 'be7a814e0ec2b419f45abbab520f529aafdc5c65':
Import translations. DO NOT MERGE
2012-10-30 09:14:12 -07:00
Amith Yamasani
8b01b86410
am 264df9b3: am 7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev
...
* commit '264df9b3db93699bc3fab87af6fac3883d31a600':
2012-10-30 09:14:07 -07:00
Baligh Uddin
8904f8faf0
am 3cbc6cd8: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '3cbc6cd87dc854a294c6960cda01bca02ca0af7f':
Import translations. DO NOT MERGE
2012-10-30 09:14:04 -07:00
Baligh Uddin
5ec9e005dc
am f7d69a95: am f64e70fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'f7d69a9558f29920fa8db30e08b467a8f185ef1f':
2012-10-30 09:14:00 -07:00
Victoria Lease
e262eb2f39
am 3e31a0dc: am 83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev
...
* commit '3e31a0dc91600034b32cdb53e72bbb96ddc75317':
2012-10-30 09:13:56 -07:00
Victoria Lease
9674037b68
am c3921fd0: am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev
...
* commit 'c3921fd000ef0174c1b3b3f7547519724f116deb':
2012-10-30 09:13:53 -07:00
Irfan Sheriff
1863f554dd
am 5193efba: am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev
...
* commit '5193efba34071527234f155ffb8cfe8850b14e00':
2012-10-30 09:13:49 -07:00
Jim Miller
f4642bc84b
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
2012-10-30 09:13:46 -07:00
Adam Cohen
c5c0028c6d
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
2012-10-30 09:13:42 -07:00
Baligh Uddin
83c7422fc0
am b317db4c: am dbcec903: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'b317db4c5c32ad419a777986bd97a659af1142d2':
2012-10-30 09:13:38 -07:00
Baligh Uddin
45625ca1d4
am e5e45b18: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit 'e5e45b18319cce8c551ba655e9a7e9ffd41d052e':
Import translations. DO NOT MERGE
2012-10-30 09:13:33 -07:00
Baligh Uddin
6bc36ee95f
am 5c33a55f: am 2407ed15: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '5c33a55fc4bb7c24777c14fd030ebc121aedfce3':
2012-10-30 09:11:32 -07:00
Baligh Uddin
4e78295ac8
am ff45c88d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit 'ff45c88de22a604d4519a1978a76481f31ffd2dc':
Import translations. DO NOT MERGE
2012-10-30 09:11:31 -07:00
John Spurlock
3114b1a09b
Merge "Disable lockscreen window anim when launching camera." into jb-mr1-lockscreen-dev
2012-10-30 09:02:13 -07:00
John Spurlock
e2ac5207f2
Disable lockscreen window anim when launching camera.
...
Prevent the exit animation from running when exiting the lockscreen
due to launching the camera from the camera widget.
Bug:7429770
Change-Id: I2a0148d84158fca11dda4c4a563fe5ab3236be81
2012-10-30 11:53:50 -04:00
Jeff Brown
513119e8b8
am b78af430: am 4d36d9d8: am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev
...
* commit 'b78af430f03c40875e1ee0d1317f2e9537339c15':
2012-10-30 08:53:24 -07:00
Dirk Dougherty
ba621aa963
am f322c943: am 36eba5d0: am 7b9a2889: Doc change: fix some table formatting.
...
* commit 'f322c94333d9fdebc13d866fa4fefd6f6ce28faa':
2012-10-30 08:53:21 -07:00
John Spurlock
bb7faa1f45
am 0cb115f6: am b2f21c53: Merge "Use settings to persist sticky widget." into jb-mr1-lockscreen-dev
...
* commit '0cb115f6bcfbff970cd66d89c9db951b4735c801':
Use settings to persist sticky widget.
2012-10-30 08:53:17 -07:00
Daniel Sandler
ee12c3063d
am 0f527aa5: am bc676a0a: Merge "Improved handle touch interaction." into jb-mr1-lockscreen-dev
...
* commit '0f527aa5f64ba43eb75a00baa162191b6bc8a076':
Improved handle touch interaction.
2012-10-30 08:53:13 -07:00
Daniel Sandler
c55eba7f97
am a01cfd01: am f002bf19: Merge "Bigger lock icon." into jb-mr1-lockscreen-dev
...
* commit 'a01cfd01ac0e836c690cb9bf723c777dcf86d9c9':
Bigger lock icon.
2012-10-30 08:53:10 -07:00
Adam Cohen
10f082c6ca
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
2012-10-30 08:53:06 -07:00
Adam Cohen
c19401a793
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
2012-10-30 08:53:02 -07:00
Eric Laurent
4092a505f8
am f68f41b4: am e7cd58bd: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev
...
* commit 'f68f41b474ed35875a771ec71fb86887b629c58c':
2012-10-30 08:52:59 -07:00
Chris Wren
b04d5c94e7
am fe9356c0: am 1d269e8e: Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev
...
* commit 'fe9356c074278f1a936fbd2d9eb00d9cf1914984':
single unlock target with honycomb semantics
2012-10-30 08:52:55 -07:00
Daniel Sandler
4f98fbe9a9
am 83372881: am fdbbbba4: Updated add-widget graphics
...
* commit '8337288183c9b5e145b44dbc8bae77f463edb4fc':
Updated add-widget graphics
2012-10-30 08:52:52 -07:00
The Android Automerger
604d1ee1e4
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-30 08:52:42 -07:00
Jeff Brown
b78af430f0
am 4d36d9d8: am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev
...
* commit '4d36d9d80c616d469df662089ebf9f335890acb4':
2012-10-30 08:49:12 -07:00
Dirk Dougherty
f322c94333
am 36eba5d0: am 7b9a2889: Doc change: fix some table formatting.
...
* commit '36eba5d0a9bc8a7314349f86d617e300eb6b2fa3':
2012-10-30 08:49:08 -07:00
John Spurlock
0cb115f6bc
am b2f21c53: Merge "Use settings to persist sticky widget." into jb-mr1-lockscreen-dev
...
* commit 'b2f21c53cf423cad5cf2f5d92579258decb40631':
Use settings to persist sticky widget.
2012-10-30 08:49:05 -07:00
Daniel Sandler
0f527aa5f6
am bc676a0a: Merge "Improved handle touch interaction." into jb-mr1-lockscreen-dev
...
* commit 'bc676a0a1d15e932ca74bb94f3ae392e0a9dbbe2':
Improved handle touch interaction.
2012-10-30 08:49:01 -07:00
Daniel Sandler
a01cfd01ac
am f002bf19: Merge "Bigger lock icon." into jb-mr1-lockscreen-dev
...
* commit 'f002bf19e841301388238ef19552c9dfc24d4d72':
Bigger lock icon.
2012-10-30 08:48:57 -07:00