Jeff Brown
67f0211bfb
am 76bce54b: am 9531b1c4: am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev
...
* commit '76bce54bc8c2cbe213c5aa914f45af9ac9022744':
Don't scale screen brightness by electron beam level.
2012-10-29 17:15:07 -07:00
Dirk Dougherty
2dc68703b2
am 308aae45: am f1d7dc73: am 7b9a2889: Doc change: fix some table formatting.
...
* commit '308aae45dc53b259e603c3436df63d67ce04dd4b':
Doc change: fix some table formatting.
2012-10-29 17:15:03 -07:00
Eric Laurent
9c95a173f7
am 2aa46d35: am 67baf878: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev
...
* commit '2aa46d3518ac7e91f4ae621f767646d6e4b0a120':
add settings for dock audio enabled
2012-10-29 17:14:59 -07:00
Fabrice Di Meglio
ea5e56ad9c
am d31f0ab9: 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 'd31f0ab93f4f35a7ca6df6d428db2a5fd3d6750a':
Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"
2012-10-29 17:14:54 -07:00
Kenny Root
ca60ba1874
Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev
2012-10-29 17:14:51 -07:00
Victoria Lease
8e32da8ef0
am 5452d232: am cee17140: am 319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev
...
* commit '5452d2324773ac1738a1c689eef102f005a8ef87':
make FLP play nicely with multiuser
2012-10-29 17:14:50 -07:00
Adam Powell
cc32e70aeb
am f464bee4: am daa7218a: am 0a27c486: Fix measurement bug in keyguard/MultiPaneChallengeLayout
...
* commit 'f464bee41fa73e7d798bcec7274c20afa032e1bb':
Fix measurement bug in keyguard/MultiPaneChallengeLayout
2012-10-29 17:14:41 -07:00
Adam Powell
0e3a9e4f69
am c4f06ec4: am 91885b55: am b0ed8bdb: Merge "Keyguard - prevent slider intercept when we don\'t want it" into jb-mr1-lockscreen-dev
...
* commit 'c4f06ec48f2bfe2abf415eff01a236aed59e3706':
Keyguard - prevent slider intercept when we don't want it
2012-10-29 17:14:38 -07:00
Winson Chung
64593c9544
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.
2012-10-29 17:14:34 -07:00
Dianne Hackborn
5377e486fb
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':
2012-10-29 17:14:30 -07:00
Adam Cohen
ae40fe2ab1
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
2012-10-29 17:14:26 -07:00
Michael Jurka
a9dced4297
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
2012-10-29 17:14:22 -07:00
Amith Yamasani
cfd807f84a
am a4a15cf6: am de264c6d: am 369f1c92: am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev
...
* commit 'a4a15cf6f3f26468b37f01981e9aa742883cc7aa':
2012-10-29 17:14:18 -07:00
Fabrice Di Meglio
9145df9132
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':
2012-10-29 17:14:15 -07:00
Jeff Brown
242e71c2fc
am 86772b38: am b6fcfdb8: am d3d523da: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
...
* commit '86772b38205a1b05f80d9d40577b4912ccf06c1c':
2012-10-29 17:14:10 -07:00
Daniel Sandler
ef8832ca5a
am 764d9120: am 7587e2a8: am a41ca127: am 50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev
...
* commit '764d912075296f9259ba1f05d621654cdc72ae21':
2012-10-29 17:14:05 -07:00
Adam Powell
f20af07ad0
am 54e94487: am a5b74cc4: am 942a60d8: Merge "Fix lockscreen slider bugs" into jb-mr1-lockscreen-dev
...
* commit '54e94487c7eddbac1db1717a2faf4dfebd6da072':
Fix lockscreen slider bugs
2012-10-29 17:14:02 -07:00
John Spurlock
eda411dae5
am 46d9322f: am e25974c3: am 011717d0: Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev
...
* commit '46d9322fc747990f73155f8635c595dc7ce916ac':
Implement "sticky" widget logic.
2012-10-29 17:13:56 -07:00
Daniel Sandler
0f52a47e36
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.
2012-10-29 17:13:52 -07:00
Daniel Sandler
ac424701d4
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.
2012-10-29 17:13:48 -07:00
Daniel Sandler
7da7d8750c
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.
2012-10-29 17:13:44 -07:00
John Spurlock
d700d30605
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.
2012-10-29 17:13:40 -07:00
Dianne Hackborn
a5d75aec4e
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
2012-10-29 17:13:36 -07:00
Amith Yamasani
b2c07cba32
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.
2012-10-29 17:13:29 -07:00
Fabrice Di Meglio
46e62fe398
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
2012-10-29 17:13:23 -07:00
Mathias Agopian
ecd580d7da
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
2012-10-29 16:55:40 -07:00
Amith Yamasani
e668794230
Only send broadcasts to registered receivers
...
Fix for issue found in #7420259
Not sure if this fixes the actual ringtone issue, but it clears the way.
Change-Id: I7fd5584df2dc254ba7281f57e51143c79bfcff63
2012-10-29 16:54:29 -07:00
Mathias Agopian
e4335adad2
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
2012-10-29 16:53:19 -07:00
Mathias Agopian
fdd714f8d5
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
2012-10-29 16:52:41 -07:00
Mathias Agopian
0da554acfb
Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev
2012-10-29 16:49:48 -07:00
John Spurlock
d9910249a4
Merge ""Implement grace period for camera widget." -> frame/base" into jb-mr1-lockscreen-dev
2012-10-29 16:30:01 -07:00
Mathias Agopian
278a966e80
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
2012-10-29 16:03:46 -07:00
John Spurlock
4b976ea1af
"Implement grace period for camera widget." -> frame/base
...
Change-Id: If3159fa43d9de6188b262f3db76575c6436e138a
2012-10-29 18:48:15 -04:00
Victoria Lease
1ec7b68aae
Merge "don't complain about CDMA support on non-CDMA devices"
2012-10-29 15:44:17 -07:00
Scott Main
b4e71578cb
Merge "suggest LocationRequest rather than Criteria"
2012-10-29 15:34:02 -07:00
Eric Laurent
88ae0ae484
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
2012-10-29 15:28:08 -07:00
Jean-Michel Trivi
15f7136e9b
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
2012-10-29 15:28:04 -07:00
Eric Laurent
40d076e617
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
2012-10-29 15:25:29 -07:00
Jean-Michel Trivi
0c41985698
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
2012-10-29 15:25:24 -07:00
Eric Laurent
c864d952bc
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
2012-10-29 15:24:14 -07:00
Baligh Uddin
12b975d47b
am c80f671a: am c712079b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c80f671a02c204947b0df569a17f8b2258383454':
Import translations. DO NOT MERGE
2012-10-29 15:22:54 -07:00
Eric Laurent
61ebf9cd8f
Merge "audio service: make dock audio is off by default" into jb-mr1-dev
2012-10-29 15:21:33 -07:00
Jean-Michel Trivi
f1c62be6b4
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
2012-10-29 15:19:59 -07:00
Jean-Michel Trivi
643e337258
Merge "No playback and music widget from other user on user switch" into jb-mr1-dev
2012-10-29 15:16:37 -07:00
Baligh Uddin
9ed5d0ef79
Merge "Import translations. DO NOT MERGE"
2012-10-29 15:14:02 -07:00
Baligh Uddin
ded08eb19d
am c86c4ae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'c86c4ae693d13f467807cbd8c3aa2025045018c2':
Import translations. DO NOT MERGE
2012-10-29 15:12:28 -07:00
Baligh Uddin
b560cfb3b6
am c712079b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c712079b5c3c34b7a38b8cd0bfc974f8832c1ab0':
Import translations. DO NOT MERGE
2012-10-29 15:12:28 -07:00
Baligh Uddin
c80f671a02
am c712079b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c712079b5c3c34b7a38b8cd0bfc974f8832c1ab0':
Import translations. DO NOT MERGE
2012-10-29 15:12:25 -07:00
Baligh Uddin
be7a814e0e
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-10-29 15:11:00 -07:00
Victoria Lease
36a7748dfe
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
2012-10-29 15:10:37 -07:00