Daniel Sandler
8a26bf5aea
Impose a height & width downward on challenge views.
...
This means that challenges may no longer wrap_content, even
vertically. But it's the only way to rationalize across
different challenges, some of which want to be a fixed size,
some match_parent, and some wrap_content.
This change also fixes some problems with the password view
as well as PIN view (usable again on sw360 devices like
Galaxy Nexus).
Bug: 7427586
Change-Id: I648e68c5159fef7cf594d4bfe8f6d4bdd5da6b6a
Proto-Id: I280b4875a9deee5dfb7409bdfa8ed0b96fbd0cff
2012-10-30 13:59:07 -04:00
Winson Chung
70aa528b73
Fixing some regressions in tablet reordering/deleting.
...
Change-Id: Ib3e48fa2606c0259603f6daf3b2ef72e1c8e292d
2012-10-30 10:56:51 -07:00
Victoria Lease
34c7ed0dbd
DO NOT MERGE suggest LocationRequest rather than Criteria
...
This is a cherry-pick of Ieb5ef28ab1e6b4b3c4d2b8ceb3a601083b4f8e2f
from master.
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: I00375a419c745bb46ff454bc5e4aa0bfac2b3fc3
2012-10-30 10:52:25 -07:00
Dianne Hackborn
8f2251403d
am 44251a70: Merge "Work on issue #7343200 : Fails to show wallpaper in the background..." into jb-mr1-dev
...
* commit '44251a70edba3e950aab1f706e1ff34e2fa4dfae':
Work on issue #7343200 : Fails to show wallpaper in the background...
2012-10-30 10:49:49 -07:00
Dianne Hackborn
ef3aab130c
am 44251a70: Merge "Work on issue #7343200 : Fails to show wallpaper in the background..." into jb-mr1-dev
...
* commit '44251a70edba3e950aab1f706e1ff34e2fa4dfae':
Work on issue #7343200 : Fails to show wallpaper in the background...
2012-10-30 10:49:21 -07:00
Dianne Hackborn
44251a70ed
Merge "Work on issue #7343200 : Fails to show wallpaper in the background..." into jb-mr1-dev
2012-10-30 10:45:49 -07:00
Amith Yamasani
2618797c20
am 13a6df91: Merge "Only send broadcasts to registered receivers" into jb-mr1-dev
...
* commit '13a6df91d9016063057aed07d21c8135f22f7f18':
Only send broadcasts to registered receivers
2012-10-30 10:02:36 -07:00
Amith Yamasani
ed1eca0543
am 13a6df91: Merge "Only send broadcasts to registered receivers" into jb-mr1-dev
...
* commit '13a6df91d9016063057aed07d21c8135f22f7f18':
Only send broadcasts to registered receivers
2012-10-30 10:02:09 -07:00
Amith Yamasani
13a6df91d9
Merge "Only send broadcasts to registered receivers" into jb-mr1-dev
2012-10-30 10:00:04 -07:00
Roman Nurik
fe49e125b4
am 825a094e: Merge "Update Device Art Generator for Nexus 4, 7, and 10." into jb-mr1-dev
...
* commit '825a094eda418b230199aea0f940a881197ea5d3':
Update Device Art Generator for Nexus 4, 7, and 10.
2012-10-30 09:58:52 -07:00
Roman Nurik
53af017be5
am 825a094e: Merge "Update Device Art Generator for Nexus 4, 7, and 10." into jb-mr1-dev
...
* commit '825a094eda418b230199aea0f940a881197ea5d3':
Update Device Art Generator for Nexus 4, 7, and 10.
2012-10-30 09:58:25 -07:00
Roman Nurik
825a094eda
Merge "Update Device Art Generator for Nexus 4, 7, and 10." into jb-mr1-dev
2012-10-30 09:56:02 -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
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
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
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
Adam Cohen
9633ea97c2
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
2012-10-30 08:48:52 -07:00
Adam Cohen
7fb0021d18
am effc03a9: Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev
...
* commit 'effc03a952a881108fcbb51d4007ea0c21694077':
Polish to 3d carousel and standard pager
2012-10-30 08:48:48 -07:00
Eric Laurent
f68f41b474
am e7cd58bd: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev
...
* commit 'e7cd58bd0323c02ebc51e48db11fe926ac4b9f9c':
2012-10-30 08:48:44 -07:00
Chris Wren
fe9356c074
am 1d269e8e: Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev
...
* commit '1d269e8e8fc508f59e4010777f4da6a2feafb0a4':
single unlock target with honycomb semantics
2012-10-30 08:48:38 -07:00
Daniel Sandler
8337288183
am fdbbbba4: Updated add-widget graphics
...
* commit 'fdbbbba4cd4807bed1200f714609d4000501d4ee':
Updated add-widget graphics
2012-10-30 08:48:35 -07:00