drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,516 Commits 1 Branch 0 Tags
Commit Graph

93516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Irfan Sheriff
5bcec69d95 am 753fa545: am 33f78b9e: am c389ca61: am 90a80bb8: Merge "Handle null BSSID" into jb-mr1-dev 
* commit '753fa5456e7981f6cc388a603af0b2cc2b4839ca':
 2012-10-26 15:36:07 -07:00
Xia Wang
72ac9c5b4c am c8f195f5: am 1f510785: am 474c56d3: am 64e5aa73: Merge "Fix connectivity manager test for tablet with data connection, multi-user support bug#7366674" into jb-mr1-dev 
* commit 'c8f195f5cda565382ca78b2f273f8e6323721789':
 2012-10-26 15:36:04 -07:00
Svetoslav Ganov
df47e94de8 am 79853eaa: am 6f43a7ae: am c6fd9865: am 966496f5: Merge "More descriptive content description for quick settings toggle. Bug: 7362316 Change-Id: I7829402793e407e7ca483e1de2583df3b6c235bf" into jb-mr1-dev 
* commit '79853eaa1237974b276ad9e0ade192286844ec92':
 2012-10-26 15:36:00 -07:00
Chet Haase
5a2ac46584 am 640bfd9d: am 0cdb7d4d: am d348ec20: am d95316e2: Merge "Skip drawing offscreen objects" into jb-mr1-dev 
* commit '640bfd9dc01c522ecc787679cc77ffe044a69731':
 2012-10-26 15:35:56 -07:00
Romain Guy
d2fffc6dd2 am 6f7200b4: am ea12fb2e: am f223282b: am 16627347: Merge "Enable mipmapping, without a deadlock this time Bug #7353771" into jb-mr1-dev 
* commit '6f7200b4ab218e00e4abe107cfbaa39160b2c215':
 2012-10-26 15:35:53 -07:00
Daniel Sandler
6944cb98ad am a663e20a: am 0353847d: am b838ba69: am 26f544ae: Merge "For Matias." into jb-mr1-dev 
* commit 'a663e20adf9d23734b7a32aa27faadc5cb685d76':
 2012-10-26 15:35:49 -07:00
Irfan Sheriff
6a884a5db7 am e9c72762: am 3755de28: am f5d46fd0: am d4a149d9: Merge "Frequency conflict handling" into jb-mr1-dev 
* commit 'e9c72762d38d40bb7ab475b3e98bc42f0d057408':
 2012-10-26 15:35:45 -07:00
Yu Shan Emily Lau
f794a87ffe am 14b38bff: am 84bad8be: am ee974a46: am fc2652ef: Merge "Fix the NPE for the memwriter." into jb-mr1-dev 
* commit '14b38bff7608b5f9b7abebaa788e37cb76402aca':
 2012-10-26 15:35:42 -07:00
Fabrice Di Meglio
c5ca8ee377 am 929c32c6: am 1eb0b69a: am 52d84585: am e9a33c60: Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev 
* commit '929c32c64fe826ce51c6b15bd3aa4c6313435987':
 2012-10-26 15:35:38 -07:00
Fabrice Di Meglio
16fa01de55 am 648d000f: am 917cc6a6: am 19f5b3e2: am 161cfef3: Merge "Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow" into jb-mr1-dev 
* commit '648d000f8b35e505ed752c18ac345f13e874688e':
 2012-10-26 15:35:34 -07:00
Daniel Sandler
4436f50bfd am 543b76f7: am 4c259e32: am cdd2e3d6: am b702e5df: Merge "Fix Bluetooth QS tile." into jb-mr1-dev 
* commit '543b76f7b114fcd885c7f7e64044f28e754ebcbf':
 2012-10-26 15:35:30 -07:00
Daniel Sandler
fda30efa14 am a477398d: am 64f19e46: am 9d1177d4: am 25e1456e: Merge "Fade out the notification/settings panels just before close." into jb-mr1-dev 
* commit 'a477398d02b0cba9b0e0517263550e0cb803b05a':
 2012-10-26 15:35:26 -07:00
Daniel Sandler
187c4be5e7 am 60b0c309: am 1b2ee267: am badf7651: am f06125aa: Merge "Fixes for QS:" into jb-mr1-dev 
* commit '60b0c3096249d9035c4ac8632a5ee28f18856d3b':
 2012-10-26 15:35:22 -07:00
Justin Ho
605ed1f9fc am a75f632c: am 29681b7b: am abaf7731: am 144d4055: 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 'a75f632c0641b158e719403c366418aaa5da512c':
 2012-10-26 15:35:19 -07:00
Dianne Hackborn
ee1d79215a am 8b060c32: am 8fa2b4b4: am ab61e562: am dec9e164: Merge "Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)" into jb-mr1-dev 
* commit '8b060c329adca29785abfb656081347ad98129bb':
 2012-10-26 15:35:15 -07:00
Bart Sears
6b9763a233 am 5066728e: am 63a828f1: am 0cb8a638: am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev 
* commit '5066728e61b03c5f6ad65478607a86f4fa544acc':
 2012-10-26 15:35:11 -07:00
Chet Haase
9c37d44978 am 97e22c72: am b97f9329: am b6b52483: am be29d82f: Merge "Correctly adjust clip regions that lie offscreen" into jb-mr1-dev 
* commit '97e22c724e83cb8b0e51a156f9e136bd70b630c5':
 2012-10-26 15:35:08 -07:00
Daniel Sandler
9b341da1e6 am 3e6bb1d6: am f2ef0f9f: am 595703cd: am 91ffeddb: Hide settings button from tablet notification panel. 
* commit '3e6bb1d6308618682dc5cf9c7ae489be56c18bae':
 2012-10-26 15:35:04 -07:00
Amith Yamasani
c1f2741414 am fc670764: am 6b76374f: am 3727bef8: am b6c171b1: Merge "Do cleanup when Stopping users" into jb-mr1-dev 
* commit 'fc670764e3cd5578f5cffcec944b998586d9afb7':
 2012-10-26 15:35:00 -07:00
Romain Guy
70951deb23 am 6ca3d699: am 348cdc47: am f094d963: am ec5acee1: Merge "workaround to unbreak the build (deadlock during boot)" into jb-mr1-dev 
* commit '6ca3d6999a73a480ec9d71cd3884c0b12c7c7e03':
 2012-10-26 15:34:57 -07:00
Daniel Sandler
eb01f00df9 am b72e0041: am 41d4fde1: am 783bd686: am b6454adb: Merge "Quickening." into jb-mr1-dev 
* commit 'b72e0041f5666dbfd348e0db9e1c33fc5ac5df3f':
 2012-10-26 15:34:53 -07:00
Baligh Uddin
f56422454f am b9896510: (-s ours) am 83fc0be8: am 1b9a1418: am c3984879: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b989651008c2844c8508b747f369b5ddbb8aa952':
 2012-10-26 15:34:49 -07:00
Baligh Uddin
896507c25b am 056aed68: (-s ours) am a625e8a3: (-s ours) am 19b304e7: am 779a19fe: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '056aed68a3c8c3c7e3b399b672e1372062560a84':
 2012-10-26 15:34:45 -07:00
Craig Mautner
2025d2e9f2 am 85b33eae: am 6109075b: am c6ccb29b: Merge "Call requestFocus and ensure that screenOn is set." into jb-mr1-dev 
* commit '85b33eae074707a7ea2371a1920f4d7cd6f308fa':
 2012-10-26 15:30:55 -07:00