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

56650 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
453091b2fd Merge "Fix bug 5168889 - action bar not respecting return codes of onCreate/Prepare menu" 2011-08-17 14:44:51 -07:00
Xavier Ducrohet
32f6846516 am ddf155b8: am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work" 
* commit 'ddf155b8338eb894a97612e4cb21257c11d8434a':
  Fix String16 operator+ to actually work
 2011-08-17 14:40:57 -07:00
Xavier Ducrohet
ddf155b833 am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work" 
* commit '5dcda1fda53bdc6dfe80cf37e62cacdc216224b1':
  Fix String16 operator+ to actually work
 2011-08-17 14:38:15 -07:00
Xavier Ducrohet
5dcda1fda5 am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work" 
* commit '88512f59bc051a42f4dd70acc8af5622f7e99db6':
  Fix String16 operator+ to actually work
 2011-08-17 14:35:20 -07:00
Xavier Ducrohet
88512f59bc am a8313e71: Merge "Fix String16 operator+ to actually work" 
* commit 'a8313e71fe8b483448d14e22610101c5f3672744':
  Fix String16 operator+ to actually work
 2011-08-17 14:31:08 -07:00
Xavier Ducrohet
a8313e71fe Merge "Fix String16 operator+ to actually work" 2011-08-17 14:18:04 -07:00
Gilles Debunne
45add1abe3 Merge "Fix bit comparison for checking the variant of the input type." 2011-08-17 14:03:56 -07:00
Adam Powell
f35d049b99 Fix bug 5168889 - action bar not respecting return codes of onCreate/Prepare menu 
Change-Id: If28630cb21e74bde7a2474ce060078ea30170b9d
 2011-08-17 13:57:52 -07:00
Eric Fischer
841b941202 Merge "Remove translations that contain mangled format strings." 2011-08-17 13:47:39 -07:00
Eric Fischer
a283026b45 Remove translations that contain mangled format strings. 
Bug 5147271

Change-Id: I8aad101f1fca5e469ffd933cf77ac07a82f4daaa
 2011-08-17 13:43:28 -07:00
Alex Sakhartchouk
4270295ae8 Merge "Fixing asynchronous performance issues." 2011-08-17 13:29:24 -07:00
Andreas Huber
5a9ffaa4cb Merge "Make sure we have all the sample table metadata before declaring a track valid." 2011-08-17 13:21:40 -07:00
Andreas Huber
987cb2ed4a Make sure we have all the sample table metadata before declaring a track valid. 
Change-Id: I2dfbc3e6017b5cd264e4cccfa47d19047b2e7f31
related-to-bug: 5178976
 2011-08-17 13:03:51 -07:00
Claudia de Veaux
50d34a7595 Merge "Edits to remove "fail" references, plus edits to "stopped by mistake" dialog. Bugs: 5174094 and 5165745" 2011-08-17 12:52:04 -07:00
Adam Cohen
842d9de74f Merge "Getting rid of the (hidden) oldName parameter for widgets" 2011-08-17 11:39:32 -07:00
Adam Cohen
bac26a1205 Getting rid of the (hidden) oldName parameter for widgets 
Change-Id: I191cf64ed045fd7cb53e106f337cbeab5a914336
 2011-08-17 11:37:58 -07:00
Justin Ho
e117d0bda1 Merge "Updated day_picker Bug: 5076695" 2011-08-17 11:17:32 -07:00
James Dong
24ac9e1ec2 Merge "Don't time out prematurely for video encoding waiting for output buffers" 2011-08-17 11:14:49 -07:00
Luca Zanolin
15b8016434 Fix bit comparison for checking the variant of the input type. 
Change-Id: I0c74af09e29e39fbd092c10b107ea7aa3273a680
 2011-08-17 18:47:27 +01:00
Alon Albert
14ee9a117e Merge "Check for periodic sync that is in the future Bug: 5164762 Change-Id: If578737bcfc4f83756f75c516657afdfc601caf1" 2011-08-17 10:34:35 -07:00
Justin Ho
071bb808ee Updated day_picker 
Bug: 5076695

Change-Id: I02366c9a784d40587f0028fe45c7dc584205a511
 2011-08-17 10:23:51 -07:00
Eric Laurent
bc91ea6bff Merge "Change condition to enter silent mode." 2011-08-17 10:19:06 -07:00
Mathias Agopian
21fb6343ce Merge "as a debug option SrufaceFlinger can now connect to DDMS" 2011-08-17 09:58:33 -07:00
Joe Fernandez
e3be9b9452 Merge "docs: OpenGL ES 1.0 and 2.0 Tutorials" 2011-08-17 09:31:45 -07:00
Justin Ho
04d6372055 Merge "New spinners Bug: 5165176" 2011-08-17 09:13:16 -07:00
Daniel Sandler
518a67b2b6 Merge "Remove longpress support from the software Home key." 2011-08-17 06:48:13 -07:00
Daniel Sandler
3e1cee60dd Merge "Breathing room between RSSI and battery on tablets." 2011-08-17 06:47:11 -07:00
Svetoslav Ganov
d859c45927 Merge "Breaks the build" 2011-08-17 05:27:07 -07:00
Svetoslav Ganov
709349396b Breaks the build 
Revert "Adding accessibility support to the PIN lock screen."

This reverts commit 0d67c8900276494cd38539bce40342e11ed83508
 2011-08-17 05:16:17 -07:00
Chih-Chung Chang
d51b218b47 Merge "Display thumbnails one by one and cache them." 2011-08-17 04:41:33 -07:00
Svetoslav Ganov
309b18e791 Merge "Adding accessibility support to the PIN lock screen." 2011-08-17 04:31:37 -07:00
Kristian Monsen
deed89a8d5 Merge "Fix for bug 3429537 Google voice (web version) does not play messages on HC" 2011-08-17 02:41:39 -07:00
Kristian Monsen
bd151dee64 Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2" 2011-08-17 02:41:00 -07:00
Ben Murdoch
f1142b051b Merge "No need to pass an AssetManager to native when creating a WebView" 2011-08-17 02:28:52 -07:00
Dianne Hackborn
e518be3085 am 51beb81a: am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications." 
* commit '51beb81a8e901020293b7a30a68b405bca71d258':
  Handle stopping of services with still bound applications.
 2011-08-16 20:47:39 -07:00
Dianne Hackborn
51beb81a8e am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications." 
* commit 'ee93fd5c0d7b0296fca17363ec00dc2ee63a0841':
  Handle stopping of services with still bound applications.
 2011-08-16 20:45:19 -07:00
Dianne Hackborn
ee93fd5c0d am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications." 
* commit '7a0d746bf2eaca4ff9d150e2cd2604b72ec5a2cb':
  Handle stopping of services with still bound applications.
 2011-08-16 20:42:17 -07:00
Dianne Hackborn
7a0d746bf2 am baaf3ce6: Merge "Handle stopping of services with still bound applications." 
* commit 'baaf3ce6385da0f9f5ff6e2195e26c339ee9949e':
  Handle stopping of services with still bound applications.
 2011-08-16 20:39:50 -07:00
Claudia de Veaux
f78c3c6d43 Edits to remove "fail" references, plus edits to "stopped by mistake" dialog. 
Bugs: 5174094 and 5165745

Change-Id: Ie3e94b4fd5c814a5cbb52af7e2b8c8568ed0b89a

Reverted change from "failed" to "unsuccessful" on line 1928 per Dianne. This is a message to someone running a low-level factory test.

Adding escape to single quote.
 2011-08-16 20:23:47 -07:00
Dianne Hackborn
baaf3ce638 Merge "Handle stopping of services with still bound applications." 2011-08-16 19:29:25 -07:00
James Dong
c5f9a42c50 Merge "Use camcorder profiles for MediaRecorderStressTest" 2011-08-16 18:26:54 -07:00
Scott Main
dfd94b460e Merge "cherrypick Change-Id: I245fcc37495196b46d1930f74bdb7632fc106af2 docs: update ndk requirements issue 5157542" 2011-08-16 18:26:34 -07:00
Fabrice Di Meglio
c5f7a851b3 Merge "Fix bug #5174495 Harfbuzz shaping is broken after taking care of Indic" 2011-08-16 17:35:06 -07:00
Fabrice Di Meglio
5960723061 Fix bug #5174495 Harfbuzz shaping is broken after taking care of Indic 
- revert back to old working code where the script was setup for Harfbuzz\
depending of the direction of the run

Change-Id: I7ec740732b51ccf05b6744b7f9d2fcb35555478d
 2011-08-16 17:14:20 -07:00
Christopher Tate
755bd67a50 Merge "Don't crash if a drag recipient throws an uncaught exception" 2011-08-16 17:03:24 -07:00
Alon Albert
cc6edf378e Check for periodic sync that is in the future 
Bug: 5164762
Change-Id: If578737bcfc4f83756f75c516657afdfc601caf1
 2011-08-16 16:58:20 -07:00
Adam Powell
751b85e8c3 Merge "Fix bug 5048082 - Conversation doesn't scroll after you send a message" 2011-08-16 16:46:48 -07:00
Amith Yamasani
d140605fb4 Merge "Rename an asset and update ic_commit_* drawables." 2011-08-16 16:45:13 -07:00
Adam Powell
ee78b173aa Fix bug 5048082 - Conversation doesn't scroll after you send a message 
Fix TRANSCRIPT_MODE_NORMAL to work properly when multiple data set change
events happen before a relayout.

Change-Id: If866f7c649c1119d088020f1231b916047402b8c
 2011-08-16 16:39:59 -07:00
Amith Yamasani
ed2d658af0 Merge "Move the padding to the text field in SearchView." 2011-08-16 16:19:56 -07:00