Jean-Baptiste Queru
7bce428ccc
am 6fd507b9: Merge "stagefright avcenc: Switch tmp variables to use the right type, to avoid casting"
...
* commit '6fd507b92746481f63922059697226c8ec6ad72b':
stagefright avcenc: Switch tmp variables to use the right type, to avoid casting
2012-05-21 14:52:45 -07:00
Winson Chung
3c881358f0
am c7937363: am 1a111852: Merge "Updating default wallpaper for non-xlarge devices. (Bug 6460469)" into jb-dev
...
* commit 'c7937363620aca900bde14e5398b8ecec77fe579':
Updating default wallpaper for non-xlarge devices. (Bug 6460469)
2012-05-21 14:51:30 -07:00
Winson Chung
c793736362
am 1a111852: Merge "Updating default wallpaper for non-xlarge devices. (Bug 6460469)" into jb-dev
...
* commit '1a111852e3ea21ea25053f2e3afc50bad7bbc9e8':
Updating default wallpaper for non-xlarge devices. (Bug 6460469)
2012-05-21 14:47:03 -07:00
Winson Chung
1a111852e3
Merge "Updating default wallpaper for non-xlarge devices. (Bug 6460469)" into jb-dev
2012-05-21 14:44:15 -07:00
Michael Kolb
56cb79416a
am d4755c95: am ab68bbaf: Merge "add flag to websearch intent" into jb-dev
...
* commit 'd4755c952985c60b3b376a198e30bdee01048f9f':
add flag to websearch intent
2012-05-21 14:33:00 -07:00
Romain Guy
abafe372ee
am 6fa51de8: am 46a8b1ac: Merge "Remove unused, obsolete debug code" into jb-dev
...
* commit '6fa51de80bae65a93346ed18628010a0867607cc':
Remove unused, obsolete debug code
2012-05-21 14:32:43 -07:00
Daniel Sandler
28e2064ffc
am 7a999b82: am 2926948d: Merge "Add RemoteViews.setViewPadding()." into jb-dev
...
* commit '7a999b820456e49a8c3d76a31d9a23edee746e56':
Add RemoteViews.setViewPadding().
2012-05-21 14:32:40 -07:00
Raphael Moll
82b65ab731
am 82ca5ffb: am 9c06ac09: Merge "Merge "AAPT: support a new --ignore-assets flag."" into jb-dev
...
* commit '82ca5ffb53ff909aa240532ebdfa1f98dc0db178':
Merge "AAPT: support a new --ignore-assets flag."
2012-05-21 14:32:24 -07:00
Jeff Brown
7754e537de
am 7bc6d801: am ee3bb649: Merge "Disable debug logs." into jb-dev
...
* commit '7bc6d801d384c7593ba5f2f3293024083a822995':
Disable debug logs.
2012-05-21 14:32:20 -07:00
Daniel Sandler
eb818188aa
am 97ccf4a8: am 90497c18: Merge "Remotable view method for TextView.setTextSize(int, float)." into jb-dev
...
* commit '97ccf4a8528ff101bc1aed5dbe9798e2fbefa7cd':
Remotable view method for TextView.setTextSize(int, float).
2012-05-21 14:32:12 -07:00
Philip Milne
c5f1296d3f
am 464c4e98: am bfa3d50b: Merge "Doc changes for GridLayout." into jb-dev
...
* commit '464c4e987998c4335ad837bd165243e50c6ea5f0':
Doc changes for GridLayout.
2012-05-21 14:31:58 -07:00
Romain Guy
a6f041ac6d
am 169ff019: am d7e4ae48: Merge "Update AsyncTask documentation" into jb-dev
...
* commit '169ff0199b50085a970db347f0616eb2a1f46f82':
Update AsyncTask documentation
2012-05-21 14:31:51 -07:00
John Wang
8ebe1e5e5d
am 6e317b2f: am 45131d0c: Merge "Only reset time from NITZ in zone fix." into jb-dev
...
* commit '6e317b2f43c8a3091a5c7e8e30952c2b69ec0ee4':
Only reset time from NITZ in zone fix.
2012-05-21 14:31:40 -07:00
John Wang
e71aa69f45
am 6841139c: am dabf4e41: Merge "Change "uk" to "gb" in COUNTRY_CODES." into jb-dev
...
* commit '6841139cb5bbb23b49ab0a735011e242ce89d4e2':
Change "uk" to "gb" in COUNTRY_CODES.
2012-05-21 14:31:37 -07:00
Chris Wren
085eb02de2
am 56a02e6e: am 29bb6d92: Support more items in the Notification.InboxStyle, plus an overflow.
...
* commit '56a02e6e61f7ae437f06b095e8c4310edcb5e9ab':
Support more items in the Notification.InboxStyle, plus an overflow.
2012-05-21 14:31:30 -07:00
satok
1fe6daba78
am 5978c628: am d7ba8143: Merge "Fix the issue on the inconsistent condition of InputMethodSubtype" into jb-dev
...
* commit '5978c628cddffb232a5c17a64a8baf76af8b344f':
Fix the issue on the inconsistent condition of InputMethodSubtype
2012-05-21 14:29:55 -07:00
Pannag Sanketi
7ed2b1ffb2
am 2b876783: am 850c2c36: Merge "Fixing the weird preview size w/ effects on camera" into jb-dev
...
* commit '2b8767837b19edd49999572e1979f0cde09d6544':
Fixing the weird preview size w/ effects on camera
2012-05-21 14:29:40 -07:00
satok
fce614a305
am ee8ddd52: am 5d4d23eb: Merge "Consolidate the initialization of InputMethodManagerService not to use resource values until system ready" into jb-dev
...
* commit 'ee8ddd52ff4c5db698c81beacbcbdb709a119b8d':
Consolidate the initialization of InputMethodManagerService not to use resource values until system ready
2012-05-21 14:29:37 -07:00
Jeff Brown
534e6488bc
am dd8e50f4: am cf39bdf3: Add support for switching between multiple keyboard layouts.
...
* commit 'dd8e50f4b96578acd402ff4b199ca1649adf25fd':
Add support for switching between multiple keyboard layouts.
2012-05-21 14:29:33 -07:00
Jeff Brown
60ff93e432
am 3ec5724d: am 51f24302: Support toast cancellation.
...
* commit '3ec5724d60e29ecb032cc4c9dc5d82924d5eee93':
Support toast cancellation.
2012-05-21 14:29:30 -07:00
Dianne Hackborn
b1b0058346
am 72669b5f: am 13a0271c: Merge "Add aapt support for generating proguard rules for onClick methods." into jb-dev
...
* commit '72669b5f4663937b09d33f9d951f0b86a03fa98b':
Add aapt support for generating proguard rules for onClick methods.
2012-05-21 14:29:14 -07:00
The Android Open Source Project
a43a91b727
am 099a220c: Reconcile with jb-release nakasi-factoryrom-release
...
* commit '099a220cf57f00732d347cd49422c849354d2e38':
Updating default wallpaper.
cherry-picked w/conflicts: ce77ce1d2b2cd99e2b14695542098af37b2943db
Fix issue where static wallpaper was offset on boot
Fix persisting wifi state on setWifiEnabled() call
Eliminate deferred surface destruction.
Hide the expanded status bar view when not in use.
New fonts in notifications.
Fix 1U notifications.
2012-05-21 14:28:58 -07:00
Dianne Hackborn
8e7ef446fb
am 944d624f: (-s ours) am 35013d0e: Merge "DO NOT MERGE: Remove a few left-over layout direction things." into jb-dev
...
* commit '944d624fc23406ebce4c6640243cca23c5cb90f0':
DO NOT MERGE: Remove a few left-over layout direction things.
2012-05-21 14:28:03 -07:00
Romain Guy
bd3217591d
am 86ed8bfa: am 52fcdd01: Merge "Fix documentation" into jb-dev
...
* commit '86ed8bfa5e9f5ed92570db7bc2011074464f86eb':
Fix documentation
2012-05-21 14:27:54 -07:00
Adam Powell
698c80eae3
am ed4b91f2: am 52bfe0ff: Merge "Sentence case is the best case. Just Once is not a special case." into jb-dev
...
* commit 'ed4b91f2e7c6cbbb1704c64eb17849af5c81f37f':
Sentence case is the best case. Just Once is not a special case.
2012-05-21 14:27:46 -07:00
Craig Mautner
4f248d0d5c
am 8fcfdd39: am 255632d1: Merge "Prevent dim surface from flashing." into jb-dev
...
* commit '8fcfdd39dd571dfdfb4b4fd267566761e76207fc':
Prevent dim surface from flashing.
2012-05-21 14:27:43 -07:00
Romain Guy
fc0c048ef4
am c301e78c: am 9579bf82: Merge "Gallery, we need to talk..." into jb-dev
...
* commit 'c301e78c78188803137e2b9abfa27cd0f1ffaff5':
Gallery, we need to talk...
2012-05-21 14:27:40 -07:00
Mathias Agopian
100054c49d
am 92432b65: am 2598a5c8: Merge "drop frame in case of error in updateTexImage" into jb-dev
...
* commit '92432b65538a0eabd2621879c0327bf3e299228e':
drop frame in case of error in updateTexImage
2012-05-21 14:27:31 -07:00
Raphael Moll
b80866a44e
am f67f834a: am 8748399f: am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env var."
...
* commit 'f67f834a9cb7ee9b743e79af85cb42bd45b5aa23':
Support a new ANDROID_AAPT_IGNORE env var.
2012-05-21 14:27:08 -07:00
alanv
7d62419c85
Make TextView respect ACCESSIBILITY_SPEAK_PASSWORD preference.
...
Bug: 6523447
Change-Id: I2610b558395dc53a74b5c8c36c09673898da44f2
2012-05-21 14:23:17 -07:00
Jean-Baptiste Queru
0af2f46da7
resolved conflicts for merge of 38e34874 to master
...
Change-Id: I7b8683be5a84c7c874e47876e8208a602f789320
2012-05-21 14:22:19 -07:00
Michael Kolb
d4755c9529
am ab68bbaf: Merge "add flag to websearch intent" into jb-dev
...
* commit 'ab68bbaf26cd526f6a5b8928533356d1f0fc7886':
add flag to websearch intent
2012-05-21 14:17:06 -07:00
Michael Kolb
ab68bbaf26
Merge "add flag to websearch intent" into jb-dev
2012-05-21 14:14:34 -07:00
Jean-Baptiste Queru
64f77c5e31
Merge "stagefright avcenc: Use intptr_t for casting pointers to integers"
2012-05-21 14:12:56 -07:00
Romain Guy
68373bf484
am 1b61dc2e: am 43a760ba: Merge "Don\'t crash on Surface.unlockAndPost() but log & try again Bug #6482593 " into jb-dev
...
* commit '1b61dc2eb7f738bb49142db14a7d339e2fd90545':
Don't crash on Surface.unlockAndPost() but log & try again Bug #6482593
2012-05-21 14:12:53 -07:00
Jean-Baptiste Queru
6fd507b927
Merge "stagefright avcenc: Switch tmp variables to use the right type, to avoid casting"
2012-05-21 14:12:49 -07:00
Dianne Hackborn
bd8e6f9d1c
am c5fe4737: am fb5c3dba: Fix issue #6440173 : MenuItem.setIcon(Drawable) scaling incorrectly...
...
* commit 'c5fe47376c905e946eafbabdb78db4c128d3d71b':
Fix issue #6440173 : MenuItem.setIcon(Drawable) scaling incorrectly...
2012-05-21 14:12:48 -07:00
Dianne Hackborn
5d9bb86367
am 9beee6ad: am d51ac09f: Merge "Fix activity resolver, issues #6519130 and #6507239 " into jb-dev
...
* commit '9beee6ad206541f351faad5cf30b9d0216f07d22':
Fix activity resolver, issues #6519130 and #6507239
2012-05-21 14:12:39 -07:00
Justin Ho
76f6efc7c7
am 321213a6: am 00d1c3a7: Merge "Updating default wallpaper." into jb-dev
...
* commit '321213a6c637367d461b341af415589eced1e800':
Updating default wallpaper.
2012-05-21 14:12:36 -07:00
Jeff Sharkey
dc7643d84c
am 40bd46ae: am 9cb660fa: Merge "Guard against apps breaking CHOOSER contract." into jb-dev
...
* commit '40bd46aefde45a216ff73f8c40497a50eccdb1e0':
Guard against apps breaking CHOOSER contract.
2012-05-21 14:12:33 -07:00
Dianne Hackborn
891a844646
am bcb7f04a: am e312c61f: Merge "Improve fitSystemWindows() documentation." into jb-dev
...
* commit 'bcb7f04a7ca05a606d1b293dbe975f1710135be7':
Improve fitSystemWindows() documentation.
2012-05-21 14:12:30 -07:00
Jeff Sharkey
577a2e055c
am 17bee29b: am 787c9ec5: Merge "Transition from DEV network stats to XT." into jb-dev
...
* commit '17bee29b1fb0c8caa90860d8b98a69e616530b44':
Transition from DEV network stats to XT.
2012-05-21 14:12:22 -07:00
Romain Guy
a42ea84445
am d568e4d2: am 196a7dae: Merge "Sanitize display list properties" into jb-dev
...
* commit 'd568e4d2ac0ba100c91c0e24b969c6efc726172a':
Sanitize display list properties
2012-05-21 14:12:19 -07:00
Elliott Hughes
3a00a28ddf
am a4cae284: am 4b51e293: Merge "Fix the preloaded-classes tool for JellyBean." into jb-dev
...
* commit 'a4cae2847eb086742ff9d3b24a469242bd9ddae1':
Fix the preloaded-classes tool for JellyBean.
2012-05-21 14:12:16 -07:00
Daniel Sandler
c39b8fa901
am 5f0d6063: am 7e22a223: Merge "Updated disconnected rssi icons." into jb-dev
...
* commit '5f0d6063fac445f4628feeeafbc34dab35d34966':
Updated disconnected rssi icons.
2012-05-21 14:12:13 -07:00
Kazuhiro Ondo
8f669f49fa
Improve sim ready event handling for CdmaLte.
...
bug: 6463933
Change-Id: I751f760badb87c1fe4b78fd68921257cec4a4b9d
2012-05-21 14:09:17 -07:00
Svetoslav Ganov
e15ccb93ad
Changing the interaction model of the touch explorer.
...
1. Now the user have to double tap to activate the last
item. If the last touched window is not active because
it does not take input focus the click on the last
touch explored location. Othewise the click is on the
accessibility focus location.
bug:5932640
Change-Id: Ibb7b97262a7c5f2f94abef429e02790fdc91a8dd
2012-05-21 14:08:57 -07:00
Winson Chung
171a994bcd
Updating default wallpaper for non-xlarge devices. (Bug 6460469)
...
Change-Id: If73c0ec2e77a94db2dfc3343fc0c65577f976a91
2012-05-21 14:06:39 -07:00
Jim Miller
998bb76529
Fix6398209: reveal search when home button is long-pressed
...
This change add a feature to reveal the swipe to search interface
when the home key is pressed for longer than 50ms. It progressively
reveals the interface. It still requires a bit of tuning, but all
the basic parameters are in this CL.
Change-Id: I1d3a5bb7b912265eb41da68bc9313eee1af2e415
2012-05-21 13:55:44 -07:00
Romain Guy
e2d7f182ff
Remove DEBUG_LATENCY flag
...
This flag was replaced with the more versatile and powerful systrace.
Change-Id: I2267698f86fe9ba9e1102856795ca641001fecd5
2012-05-21 13:55:15 -07:00