Commit Graph

36986 Commits

Author SHA1 Message Date
Chet Haase
830f0220f3 Merge "Don't constrain invalidation rect when not clipping children" 2011-07-19 11:40:34 -07:00
Wu-cheng Li
394356c41b Merge "Add camera new picture and new video broadcast intents." 2011-07-19 11:16:20 -07:00
Shimeng (Simon) Wang
c11c0db950 Merge "Change log msg since viewport can be changed before first layout." 2011-07-19 11:15:49 -07:00
James Dong
f363e02aa5 Merge "Remove PV AVC decoder" 2011-07-19 11:00:50 -07:00
Philip Milne
1536c1faf8 Merge "Fix build breakage." 2011-07-19 10:36:46 -07:00
Shimeng (Simon) Wang
a069bee607 Merge "Add in i18n TLDs and new TLDs to the URL RegEx matcher." 2011-07-19 10:31:52 -07:00
Xavier Ducrohet
2a28425bfb am 9139868b: am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java"
* commit '9139868b6c5cb29b3665984225dceb0193fec31d':
  Add dependency generation to Aapt for R.java
2011-07-19 10:23:19 -07:00
Xavier Ducrohet
5fd062e746 am bf31250b: am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects"
* commit 'bf31250ba0858a2e72a3906a1f0216846683bc2e':
  Copy once-created R.java into library projects
2011-07-19 10:23:16 -07:00
Xavier Ducrohet
06d0fdd825 am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java"
* commit 'ba6c98db8f21016f81ecac35bb0ea3c433044bb7':
  Add dependency generation to Aapt for R.java
2011-07-19 10:18:28 -07:00
Xavier Ducrohet
0044cffa75 am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects"
* commit 'd5431ed5505a42e5e33c8bf7cc2ff72792979be9':
  Copy once-created R.java into library projects
2011-07-19 10:18:25 -07:00
Fabrice Di Meglio
e8c0ca0618 Merge "Test Gallery layout direction." 2011-07-19 10:16:04 -07:00
Xavier Ducrohet
a3563e8f8c am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java"
* commit '82943ecfe2c4266cf3db50326240825fefcaa38f':
  Add dependency generation to Aapt for R.java
2011-07-19 10:15:11 -07:00
Xavier Ducrohet
0092886a15 am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects"
* commit '2e659ae59c17a0c0584d35b8c400a294c9d49e12':
  Copy once-created R.java into library projects
2011-07-19 10:15:09 -07:00
Xavier Ducrohet
dae75dd7d5 am d40c93f6: Merge "Add dependency generation to Aapt for R.java"
* commit 'd40c93f61ca5b3f2351b8db716f67b58f1625e85':
  Add dependency generation to Aapt for R.java
2011-07-19 10:10:17 -07:00
Xavier Ducrohet
e74c354c7e am 42755155: Merge "Copy once-created R.java into library projects"
* commit '42755155d6e8ddc3201b08def2bf262a64fa25f2':
  Copy once-created R.java into library projects
2011-07-19 10:10:15 -07:00
Philip Milne
b30f03d604 Merge "Gather View's hierarchy notifications into methods that can easily be overidden." 2011-07-19 10:03:43 -07:00
Xavier Ducrohet
166845ba93 Merge "Add dependency generation to Aapt for R.java" 2011-07-19 10:03:16 -07:00
Xavier Ducrohet
c6c26cd7ec Merge "Copy once-created R.java into library projects" 2011-07-19 10:03:05 -07:00
Narayan Kamath
c4960acac1 Merge "Fix a threading issue in AudioPlaybackHandler" 2011-07-19 10:01:05 -07:00
Narayan Kamath
f27d6f8183 Merge "Return the play stayed locked." 2011-07-19 10:00:58 -07:00
Chet Haase
1087e5e541 Merge "Don't recreate view's display list when size hasn't changed" 2011-07-19 07:21:03 -07:00
satok
d0f53ad7de Merge "Hide "Configure input method" button when the screen is locked." 2011-07-18 20:43:24 -07:00
satok
108ed56563 Merge "Enable IMEs to set additional subtypes in background" 2011-07-18 20:42:54 -07:00
Jeff Brown
cc11feae58 Merge "Fix drag and drop regression. Bug: 5032496" 2011-07-18 20:08:48 -07:00
Jeff Brown
404dd20610 Merge "Remove an unnecessary finalizer." 2011-07-18 19:47:10 -07:00
Bart Sears
fadc294088 Merge "Revert "Add in i18n TLDs and new TLDs to the URL RegEx matcher."" 2011-07-18 19:45:33 -07:00
Adam Powell
525dcdbf8f Merge "Fix bug 5031652 - offer a way to associate metadata with an ActionMode" 2011-07-18 19:40:17 -07:00
Todor Kalaydjiev
e855608228 Merge "Manually bring change Ie8fb8162 to master ("Add images to ERI icon list"). Fixes b/4604593." 2011-07-18 18:45:36 -07:00
Wink Saville
ec77b49f8c am 6e8c7dd2: am cd4636ec: Add LteOnCdmaDevice system property.
* commit '6e8c7dd2128b2a46f5d56ed46d4d530af6ad38f5':
  Add LteOnCdmaDevice system property.
2011-07-18 18:42:41 -07:00
Wink Saville
e5b9400b84 am cd4636ec: Add LteOnCdmaDevice system property.
* commit 'cd4636ec08a50ab890acab0cf0c3c3f07f91896a':
  Add LteOnCdmaDevice system property.
2011-07-18 18:39:41 -07:00
Shimeng (Simon) Wang
bd0609212c Merge "Add in i18n TLDs and new TLDs to the URL RegEx matcher." 2011-07-18 18:04:51 -07:00
Romain Guy
d2f8b47f1b Merge "Update TextureView.lockCanvas() test." 2011-07-18 17:51:59 -07:00
Fabrice Di Meglio
511059946c Merge "Add unit tests for bug #5037425 Canvas.drawText can't handle Right-to-Left text and text composing" 2011-07-18 17:43:11 -07:00
Doug Kwan
aa52ebb8b9 Merge "Add C code to use BDADDR_ANY macro properly. The macro expands into code that is not valid C++. So we need to use a C helper." 2011-07-18 17:02:55 -07:00
Conley Owens
4dac1c4e10 am e5143d6c: am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit 'e5143d6c09f0e9a960661a2b0a5916c33fcafc4d':
  stagefright aacenc: Mark codeWord as UWord16
2011-07-18 16:57:04 -07:00
Conley Owens
83937f38f0 am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit 'a4aef41a74a69b0296b88361ffb33d0470a26362':
  stagefright aacenc: Mark codeWord as UWord16
2011-07-18 16:55:33 -07:00
Conley Owens
60f8195edc am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit 'a74774fd9146aa22801487d3652dc18e9e328b8e':
  stagefright aacenc: Mark codeWord as UWord16
2011-07-18 16:53:41 -07:00
Conley Owens
61d3cf3bfa am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit '4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
  stagefright aacenc: Mark codeWord as UWord16
2011-07-18 16:52:26 -07:00
Conley Owens
0d0cbd3d03 Merge "stagefright aacenc: Mark codeWord as UWord16" 2011-07-18 16:49:43 -07:00
Adam Powell
6776d1911d Merge "Make the theme attribute actionModeStyle public." 2011-07-18 16:29:53 -07:00
Romain Guy
e7aa305f50 Merge "Trim OpenGLRenderer's memory usage whenever possible" 2011-07-18 16:06:31 -07:00
Dianne Hackborn
58e16f46b2 Merge "Fix issue # 5017868: Twitter crashes on start:" 2011-07-18 16:03:08 -07:00
Mike Lockwood
a96fcc9c51 Merge "UsbManager: document that passing null setCurrentFunction restores default function" 2011-07-18 15:59:35 -07:00
Deckard Autoverifier
8ac35d9886 am 3ab6ccda: am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '3ab6ccda447c605c35c8854a2ec8c49c2a0653a6':
  stagefright: Include stdlib.h for malloc/free
2011-07-18 15:46:26 -07:00
Deckard Autoverifier
58a01d9465 am b32af642: am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit 'b32af642454f3113cb1539821eb3b0dbf4174974':
  stagefright amrwbenc: Remove a duplicate, unused file
2011-07-18 15:46:21 -07:00
Deckard Autoverifier
0ccd5a4b14 am d4dee1a5: am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit 'd4dee1a57fdcd1bd1e7c621163e89039cf88d9f9':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
2011-07-18 15:46:18 -07:00
Deckard Autoverifier
a7f805c612 am b7f0d825: am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit 'b7f0d825c56dced10bb7df7cfc624ef9ebffe21c':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
2011-07-18 15:46:14 -07:00
Deckard Autoverifier
c2c84e91b2 am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '2acddc54e1e7a9f41b4b5acc2e8984c46539425a':
  stagefright: Include stdlib.h for malloc/free
2011-07-18 15:44:03 -07:00
Deckard Autoverifier
fb8bca5cda am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '31140598866c668047fc6dede7944e146aa21a0a':
  stagefright amrwbenc: Remove a duplicate, unused file
2011-07-18 15:44:01 -07:00
Deckard Autoverifier
6ec08140b2 am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '29fd8cdbe554ca65c57dd9eea59dc57e3392acc3':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
2011-07-18 15:43:58 -07:00