Craig Mautner
7373f45cbf
am fe9bd871: am 2d9f13cf: am b05e449b: am be2a4a5e: Merge "When removing windows remove from resize list." into jb-mr1-dev
...
* commit 'fe9bd87106a7974e068f02486d3525667e4763e8':
2012-10-26 18:18:12 -07:00
Irfan Sheriff
6c90b0e372
am 66be661c: am f1aabd93: am d895caf7: am b98c2fb0: Merge "Do a clean shutdown of p2p" into jb-mr1-dev
...
* commit '66be661c459e3bc24215fe14c613eb98c24cd6e1':
2012-10-26 18:18:09 -07:00
Chet Haase
6d1d37ac24
am 74a41fb5: am e7564bd6: am e114fcc7: am 58e60c23: Merge "Track size changes correctly for static wallpapers" into jb-mr1-dev
...
* commit '74a41fb5242998beacf8fe13c733ab35615853ce':
2012-10-26 18:18:05 -07:00
Jeff Hamilton
50a508bb92
am 5f397461: am 3be4c86c: am d76ba621: am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev
...
* commit '5f397461ab519ff012937b0079e5bb70b5d2ff53':
2012-10-26 18:18:01 -07:00
Scott Main
2b3379b504
am 4018b220: am d5bef5dd: am 4e2e6dfd: am e9b533bf: am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface
...
* commit '4018b220f1c3f530603937b9ba75afd35ef938ed':
2012-10-26 18:17:57 -07:00
Xavier Ducrohet
cd0549fac4
am 38cb7725: (-s ours) am aa3770fb: am e8c9ce73: am 5e42147a: (-s ours) am 64b3de29: (-s ours) am 434cd38f: Update layoutlib for jb mr1. do not merge.
...
* commit '38cb77254ac6f81a36b4f72dcae1db37a2762644':
2012-10-26 18:17:53 -07:00
Christopher Tate
86fb11b889
am fd8c61b4: am 9de39197: am 32202893: am 1ea75b88: Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev
...
* commit 'fd8c61b46ef7b73af42a082b51909b59535e95bd':
2012-10-26 18:17:50 -07:00
Scott Main
a9b200a2a9
am 4d7df836: am b2f81b8c: am c88e9184: am db164da8: Merge "improve some docs for dreams" into jb-mr1-dev
...
* commit '4d7df836d2db486f0991c2e40d3271b7a12263ed':
2012-10-26 18:17:46 -07:00
Chet Haase
266e23a827
am 81514647: am 89824595: am 4bcf8740: am 18937b22: Merge "Stop reloading wallpaper bitmap" into jb-mr1-dev
...
* commit '8151464782b2e87aa279679b4eb6355374732960':
2012-10-26 18:17:42 -07:00
Victoria Lease
598d55dcd0
am 8ff3586c: am ff33a010: am 645a16fb: am 588fb15d: Merge "LocationManager permissions cleanup" into jb-mr1-dev
...
* commit '8ff3586c5bf5c6bd924002e0d315dbf55e65ddea':
2012-10-26 18:17:39 -07:00
Amith Yamasani
5160492ad2
am a42bcce8: am 061bcd27: am 868f82ae: am 0141faec: Merge "Allow services to query the info for a dying user." into jb-mr1-dev
...
* commit 'a42bcce8ac47b7208951c89bbbc136ba70213be7':
2012-10-26 18:17:35 -07:00
Daniel Sandler
470e109bd7
am e3002155: am 40fae0bb: am f400513d: am 6a377f30: Merge "Fix glitch when using settings pulldown then switching to notifications." into jb-mr1-dev
...
* commit 'e300215503b9166af8305f15fcd5ed78d4b2ae5b':
2012-10-26 18:17:31 -07:00
Michael Jurka
48149e869b
am 27f80826: am 7fa48e69: am faa82590: am 341aa8e0: Merge "Potential fix for bug 7352816" into jb-mr1-dev
...
* commit '27f8082651defa70551a56b328d18ac7a24dfe47':
2012-10-26 18:17:27 -07:00
Daniel Sandler
6ee5021223
am b15ff37f: am 4db77891: am 3f846089: am a4c356ca: Merge "Add missing layout params" into jb-mr1-dev
...
* commit 'b15ff37fbbda7676d95147279a59ba5d25aa23bb':
2012-10-26 18:17:23 -07:00
Jeff Brown
1a8f64563b
am 6664a94b: am 335b606c: am 0ad3bb8b: am 88c66cbb: Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev
...
* commit '6664a94b9922903bc102934d3e4e8956e22d3654':
2012-10-26 18:17:19 -07:00
Jeff Brown
ef283e9c15
am 6d6463c9: am 61c3629c: am 80ffd26f: am 586503d5: Merge "Add special mirroring modes for demonstration purposes." into jb-mr1-dev
...
* commit '6d6463c92e1e6ee3f9acb19057df25712fa7f89c':
2012-10-26 18:17:16 -07:00
Jeff Sharkey
8ddfae5d4b
am f8d6a0bf: am a57f443a: am e21a2e72: am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev
...
* commit 'f8d6a0bf8601a6457bbb5af541e3c763fba2d418':
2012-10-26 18:17:12 -07:00
Baligh Uddin
83d7426799
am 9ce37a5e: (-s ours) am 45a4aff0: (-s ours) am 2fa64ac6: am 3e336bd6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '9ce37a5ec0ccde58ab73b05a60213657d0bb1d4d':
2012-10-26 18:17:08 -07:00
Craig Mautner
fe9bd87106
am 2d9f13cf: am b05e449b: am be2a4a5e: Merge "When removing windows remove from resize list." into jb-mr1-dev
...
* commit '2d9f13cfb5b4c803a08b5d324fad99fb5adf59d8':
2012-10-26 18:12:53 -07:00
Irfan Sheriff
66be661c45
am f1aabd93: am d895caf7: am b98c2fb0: Merge "Do a clean shutdown of p2p" into jb-mr1-dev
...
* commit 'f1aabd93c2ed94c7fde77f0ba2444d2c4dfa01f2':
2012-10-26 18:12:50 -07:00
Chet Haase
74a41fb524
am e7564bd6: am e114fcc7: am 58e60c23: Merge "Track size changes correctly for static wallpapers" into jb-mr1-dev
...
* commit 'e7564bd64dfa7208365fa4977b250cd8930818ed':
2012-10-26 18:12:46 -07:00
Jeff Hamilton
5f397461ab
am 3be4c86c: am d76ba621: am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev
...
* commit '3be4c86c510e5c9c32f3f32f46be5db50165bd09':
2012-10-26 18:12:42 -07:00
Scott Main
4018b220f1
am d5bef5dd: am 4e2e6dfd: am e9b533bf: am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface
...
* commit 'd5bef5ddcbd42e7cacf6cd169e37738dae1478ac':
2012-10-26 18:12:39 -07:00
Xavier Ducrohet
38cb77254a
am aa3770fb: am e8c9ce73: am 5e42147a: (-s ours) am 64b3de29: (-s ours) am 434cd38f: Update layoutlib for jb mr1. do not merge.
...
* commit 'aa3770fbaeef3b54dc6946e65ed89b53b47e5c94':
2012-10-26 18:12:35 -07:00
Christopher Tate
fd8c61b46e
am 9de39197: am 32202893: am 1ea75b88: Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev
...
* commit '9de3919738ec8d020191c5b57e2852d219d28f0c':
2012-10-26 18:12:31 -07:00
Scott Main
4d7df836d2
am b2f81b8c: am c88e9184: am db164da8: Merge "improve some docs for dreams" into jb-mr1-dev
...
* commit 'b2f81b8c98b32ab10e4a4b4798061249c9305da4':
2012-10-26 18:12:28 -07:00
Chet Haase
8151464782
am 89824595: am 4bcf8740: am 18937b22: Merge "Stop reloading wallpaper bitmap" into jb-mr1-dev
...
* commit '89824595b616e0c84a660f2dbc04c422ae6530ce':
2012-10-26 18:12:24 -07:00
Victoria Lease
8ff3586c5b
am ff33a010: am 645a16fb: am 588fb15d: Merge "LocationManager permissions cleanup" into jb-mr1-dev
...
* commit 'ff33a01091d1d30fd7ddf54adaa636a7837599bf':
2012-10-26 18:12:19 -07:00
Amith Yamasani
a42bcce8ac
am 061bcd27: am 868f82ae: am 0141faec: Merge "Allow services to query the info for a dying user." into jb-mr1-dev
...
* commit '061bcd27030f5d71519abb2b8f3f03aa15bf93c8':
2012-10-26 18:12:16 -07:00
Daniel Sandler
e300215503
am 40fae0bb: am f400513d: am 6a377f30: Merge "Fix glitch when using settings pulldown then switching to notifications." into jb-mr1-dev
...
* commit '40fae0bbc0889a16b5a708b08be56d021f3d6f29':
2012-10-26 18:12:11 -07:00
Michael Jurka
27f8082651
am 7fa48e69: am faa82590: am 341aa8e0: Merge "Potential fix for bug 7352816" into jb-mr1-dev
...
* commit '7fa48e695bbfd282f3fe01a10661cde8c858eccf':
2012-10-26 18:12:07 -07:00
Daniel Sandler
b15ff37fbb
am 4db77891: am 3f846089: am a4c356ca: Merge "Add missing layout params" into jb-mr1-dev
...
* commit '4db77891e5386297a4be1dc86a63b7464f901255':
2012-10-26 18:11:59 -07:00
Jeff Brown
6664a94b99
am 335b606c: am 0ad3bb8b: am 88c66cbb: Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev
...
* commit '335b606c344b2c4881636d3d13ef826c92fdea99':
2012-10-26 18:11:56 -07:00
Jeff Brown
6d6463c92e
am 61c3629c: am 80ffd26f: am 586503d5: Merge "Add special mirroring modes for demonstration purposes." into jb-mr1-dev
...
* commit '61c3629c8d79de9cf9d621805c4b3ca4b96f153b':
2012-10-26 18:11:52 -07:00
Jeff Sharkey
f8d6a0bf86
am a57f443a: am e21a2e72: am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev
...
* commit 'a57f443ae709e1a2cfc0fa96468e716ed86550a8':
2012-10-26 18:11:48 -07:00
Baligh Uddin
9ce37a5ec0
am 45a4aff0: (-s ours) am 2fa64ac6: am 3e336bd6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '45a4aff0ccea0cd15bbd6ff1d6fa7798cc4c72de':
2012-10-26 18:11:48 -07:00
Marco Nelissen
92b4e28e17
Merge "Don't create files when scanning"
2012-10-26 16:43:56 -07:00
Marco Nelissen
348aa65e93
Don't create files when scanning
...
MediaScanner would insert non-existent files into the database
if you asked it nicely, thereby creating them.
b/7298303
Change-Id: Ie8496072248f2041e5a73cc04083e2a31c78f046
2012-10-26 16:29:59 -07:00
Craig Mautner
448b186ad3
am 2025d2e9: am 85b33eae: am 6109075b: am c6ccb29b: Merge "Call requestFocus and ensure that screenOn is set." into jb-mr1-dev
...
* commit '2025d2e9f2b9e68b98b83ab7b37342da16ddadc7':
2012-10-26 15:36:51 -07:00
Daniel Sandler
b2eeb26aa7
am c137d9c5: am e3032024: am 47a8b59a: am c1dc37cb: Merge "You can only use the 2-finger shortcut when opening the panel." into jb-mr1-dev
...
* commit 'c137d9c5f30155c64d51bb2d60da512672e08c95':
2012-10-26 15:36:48 -07:00
Romain Guy
21738ff0a6
am bdec31a8: am 763be738: am 650c47a1: am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212 " into jb-mr1-dev
...
* commit 'bdec31a86e9d379e54df607f0a91e9fb3e4565c1':
2012-10-26 15:36:44 -07:00
Jeff Brown
9a25ce9eee
am 1626bd09: am 60880773: am d488b231: am 23fa0320: Merge "Add a notification icon when connected to wireless display." into jb-mr1-dev
...
* commit '1626bd09073f27ab0d7ee6fb10a379576cb61c24':
2012-10-26 15:36:41 -07:00
Xavier Ducrohet
64ddb6f99a
am 8e81680e: am 070292d9: am 6f05ae33: am 9c474738: Merge "Update layoutlib for jb mr1." into jb-mr1-dev
...
* commit '8e81680e7203098642ff35dce949f5d39eab921e':
2012-10-26 15:36:37 -07:00
Justin Ho
9102ca8108
am 7b43f317: am f570098a: am 54a956ca: am 871a6d7d: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev
...
* commit '7b43f31725f4f536481fd924d030e06452490bc7':
2012-10-26 15:36:33 -07:00
Justin Ho
1387b9c247
am 7cb15cd4: am ac96ea1f: am 195eb1ab: am 4db31657: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev
...
* commit '7cb15cd4d4d534e7a3e920382c487a7bccdf7306':
2012-10-26 15:36:30 -07:00
Yu Shan Emily Lau
dff1defa9d
am ba9774dd: am 1f672b57: am bd8a2758: am 0f2d0147: Merge "Append the test case name in the beginning of the test log." into jb-mr1-dev
...
* commit 'ba9774ddb8a1f9a7234b900e225506f9a166bdd1':
2012-10-26 15:36:26 -07:00
Chet Haase
c5bd506a4d
am 4a3da4b1: am 95f44af0: am 285d0932: am 6f3e7bbf: Merge "Fix for previous commit on non-interesecting invalidations" into jb-mr1-dev
...
* commit '4a3da4b12f868b24f874a90dcee574b7672c8430':
2012-10-26 15:36:22 -07:00
Romain Guy
8c93e4417b
am 5cb89e41: am e13a90f2: am 6763bfe4: am 3301654a: Merge "Fix javadoc" into jb-mr1-dev
...
* commit '5cb89e417b364a44b8539f3f71a7eb969015cbb8':
2012-10-26 15:36:19 -07:00
Raph Levien
6718d6fbd3
am 416897dd: am c4ce4c78: am 0d7c0ab9: am 1720e073: Merge "Update Arabic fonts to remove Rial ligature" into jb-mr1-dev
...
* commit '416897ddae5315d1aa5727e656790dc10b2a52ef':
2012-10-26 15:36:15 -07:00
Mike Cleron
1d820a8b60
am 9a076c69: am a1af8023: am 37419507: am e663925f: Merge "Show clear all when returning from flip quick settings." into jb-mr1-dev
...
* commit '9a076c69834f57851f850dd098821cf6ead569b0':
2012-10-26 15:36:11 -07:00
