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

42232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
satok
f163b4d331 am e40dea0d: Fix a bug that IME switch disappiers at switching IME subtype. 
* commit 'e40dea0d06ec1c04db80191fd2965363b4fac781':
  Fix a bug that IME switch disappiers at switching IME subtype.
 2011-01-29 09:50:03 -08:00
Jean-Baptiste Queru
d9e6bda6b9 am 34ebb5bf: (-s ours) am 87d19759: Delete browerplugin tests - do not merge 
* commit '34ebb5bfec0794d5852b47edaa8b9d4cea22e515':
  Delete browerplugin tests - do not merge
 2011-01-29 09:36:02 -08:00
Jean-Baptiste Queru
6ace65d25f am 88d7300d: (-s ours) am d4c8cec0: am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge" 
* commit '88d7300d2abaf638c2c0b5505b657b401f881c14':
  Delete browerplugin tests - do not merge
 2011-01-29 09:35:55 -08:00
Robert Greenwalt
f8fdec50c7 resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp 
Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963
 2011-01-29 09:32:04 -08:00
Eric Fischer
a0e51ef2a4 am 287fbba5: (-s ours) am 5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '287fbba5b88cfba1e55fd98979ebe83b4b8ed8f4':
  Import revised translations.  DO NOT MERGE
 2011-01-29 09:13:21 -08:00
satok
e40dea0d06 Fix a bug that IME switch disappiers at switching IME subtype. 
Bug: 3404788

Change-Id: I741642ac690a1b4c6ca1225ee271bffe39164170
 2011-01-30 02:03:48 +09:00
Dirk Dougherty
51bae7e74a am 30a85ec7: am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 
* commit '30a85ec7e8d79448fbd0d0af3ac25b656f8428c4':
  Doc change: Add time-lapse video to 3.0 highlights.
 2011-01-29 08:57:25 -08:00
Andreas Huber
c2bee3ae2d am 70888c00: (-s ours) am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP. 
* commit '70888c00a0371692a07132f0dd94208456dd44c1':
  DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
 2011-01-29 08:57:21 -08:00
Jean-Baptiste Queru
4eeb10470f Merge 13212f83 from gingerbread-plus-aosp 
Change-Id: I9a8ee0c7e7896aea85e7a7c18ee82927091cb670
 2011-01-29 08:54:06 -08:00
Jim Miller
4876c29f48 am 145643ca: (-s ours) am 226e5756: Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread 
* commit '145643ca4bb98a88977026ea4d7866e391d53dce':
  Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
 2011-01-29 08:47:55 -08:00
Jean-Baptiste Queru
bf9f3ea72e Merge 34afc2cd from gingerbread-plus-aosp 
Change-Id: I2471571af1d8e34e7270cb6f765f16b4a474bb28
 2011-01-29 08:45:29 -08:00
Eric Fischer
16e52bcbdf am e49e30cc: (-s ours) am 3d73c4d3: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'e49e30cc4d9411326735f15d92e8d7455467072f':
  Import revised translations.  DO NOT MERGE
 2011-01-29 08:02:19 -08:00
Nick Pelly
7a69ffa0e4 am 32f7d50d: am 21d0a173: Fix build - javadoc. 
* commit '32f7d50df147e4eb171044aad376bd1425fcf5e7':
  Fix build - javadoc.
 2011-01-29 08:02:04 -08:00
Jean-Baptiste Queru
34ebb5bfec am 87d19759: Delete browerplugin tests - do not merge 
* commit '87d197597c9130b10ba9d67f17ed81db26e35cd8':
  Delete browerplugin tests - do not merge
 2011-01-29 08:00:52 -08:00
Scott Main
213705e37b am 51330184: am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread 
* commit '51330184feb1b8d01ac48f4f13e4b91e7e334401':
  cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
 2011-01-29 07:59:28 -08:00
Jean-Baptiste Queru
88d7300d2a am d4c8cec0: am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge" 
* commit 'd4c8cec094dbf7bcfa3f31bedae15e5c65b13e94':
  Delete browerplugin tests - do not merge
 2011-01-29 07:58:36 -08:00
Jean-Baptiste Queru
87d197597c Delete browerplugin tests - do not merge 
Those don't build in all environments.

Change-Id: Ie564d464d2745df0114236f2c28aa1254d0f65b5
 2011-01-29 07:41:39 -08:00
Jean-Baptiste Queru
d4c8cec094 am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge" 
* commit '9720323a5138acafbe30da38d61eeac469b675a4':
  Delete browerplugin tests - do not merge
 2011-01-29 07:39:47 -08:00
Jean-Baptiste Queru
7d4b7dab39 Merge 55e124c4 from gingerbread-plus-aosp 
Change-Id: I8b428792ced31b73e8cc3743ab38e157578e9377
 2011-01-29 07:32:39 -08:00
Robert Greenwalt
aa3866e6fa am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread 
* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70':
  Add some network types that OEM's are asking for.
 2011-01-29 06:55:38 -08:00
Robert Greenwalt
b79c611ebf am 19eecb02: Merge "Don\'t use mobile networktype icon if not connected" into honeycomb 
* commit '19eecb028fe094e5f41d9ddeb1e6aac1d096da43':
  Don't use mobile networktype icon if not connected
 2011-01-29 06:44:35 -08:00
Robert Greenwalt
6b739dc729 Merge "Add some network types that OEM's are asking for." into gingerbread 2011-01-29 06:38:35 -08:00
Robert Greenwalt
19eecb028f Merge "Don't use mobile networktype icon if not connected" into honeycomb 2011-01-29 06:35:57 -08:00
Justin Ho
a5e92d18b0 am 9b1df164: Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb 
* commit '9b1df1646ff4d480eebe2fd9cd394915b7925e92':
  Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style
 2011-01-28 22:54:11 -08:00
Justin Ho
9b1df1646f Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb 2011-01-28 22:51:51 -08:00
Justin Ho
35326b876e Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style 
Change-Id: Ib78eb3f75b7734c0244fbc9ac58c52d2ffbbdb27
 2011-01-28 22:49:43 -08:00
Justin Ho
ab865ba773 am 9371f703: Merge "New honeycomb sound set" into honeycomb 
* commit '9371f7030011da2bcc45587e59a40a498f92dfb4':
  New honeycomb sound set
 2011-01-28 19:21:33 -08:00
Justin Ho
9371f70300 Merge "New honeycomb sound set" into honeycomb 2011-01-28 19:18:51 -08:00
Justin Ho
5f3bbcf554 New honeycomb sound set 
Change-Id: Iaf3062f57f613702ea946fdf65e02f6265342ad5
 2011-01-28 19:15:23 -08:00
Joe Onorato
7f51171ab3 am a0f2cdb5: Merge "999" into honeycomb 
* commit 'a0f2cdb50720b0a1960e5342b376867b2c9ad1df':
  999
 2011-01-28 18:50:03 -08:00
Joe Onorato
a0f2cdb507 Merge "999" into honeycomb 2011-01-28 18:47:57 -08:00
Joe Onorato
c6925ca684 999 
Bug: 3403177
Change-Id: Ib53098f364bb15249f27f89127e0d2a4daf81d6a
 2011-01-28 18:46:20 -08:00
Mathias Agopian
8d778b375c am 231da079: Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb 
* commit '231da079c93664fa7d81c7e957990f17a6334b17':
  fix [3389263] OMX.Nvidia.h264.decode fails to shutdown
 2011-01-28 18:40:44 -08:00
Mathias Agopian
231da079c9 Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb 2011-01-28 18:38:58 -08:00
Mathias Agopian
1723b049c6 fix [3389263] OMX.Nvidia.h264.decode fails to shutdown 
We were still destroying an ANativeWindow's buffer pretty soon
after it was removed from the window manager. This time
we really wait for the ISurace to go away.

Change-Id: I329273fedaeef76ee92836f6180c2c3808389330
 2011-01-28 18:23:24 -08:00
Jason Sams
a66b759ab0 am bd08c7c0: Merge "Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection." into honeycomb 
* commit 'bd08c7c0c99fa84dbf3c043f4e6dff07320410b7':
  Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection.
 2011-01-28 18:00:09 -08:00
Jason Sams
359113b42e am c8f6b6fb: Merge "DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1." into honeycomb 
* commit 'c8f6b6fbbc853bd89a7def780e8d9a4cabe6d0e2':
  DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1.
 2011-01-28 17:58:04 -08:00
Jason Sams
bd08c7c0c9 Merge "Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection." into honeycomb 2011-01-28 17:56:28 -08:00
Jason Sams
c8f6b6fbbc Merge "DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1." into honeycomb 2011-01-28 17:56:09 -08:00
Xavier Ducrohet
115a5dd52c am f597f750: Merge "LayoutLib: update with Pair API." into honeycomb 
* commit 'f597f750392a26e1bc33430ff52e2dd3674c875b':
  LayoutLib: update with Pair API.
 2011-01-28 17:23:45 -08:00
Xavier Ducrohet
f597f75039 Merge "LayoutLib: update with Pair API." into honeycomb 2011-01-28 17:21:57 -08:00
Irfan Sheriff
cc1bd4a8ea am 739f6bc6: Keep never as the default wifi sleep settings 
* commit '739f6bc675c0caa11a1d46b18de24e6c884f723a':
  Keep never as the default wifi sleep settings
 2011-01-28 17:19:38 -08:00
Robert Greenwalt
40cdd9b650 Don't use mobile networktype icon if not connected 
bug:3398345
Change-Id: I0e8beb54e909e02bc551c54d65c5fed8e4e8cb10
 2011-01-28 17:17:49 -08:00
Irfan Sheriff
739f6bc675 Keep never as the default wifi sleep settings 
Bug: 3404049
Change-Id: I824b8cb7b28223cfb4eb89cabc7cb237a4e1e6db
 2011-01-28 17:01:29 -08:00
Xavier Ducrohet
b353495192 LayoutLib: update with Pair API. 
Change-Id: Iba945153f7544872ea84e3311584223aea740e2e
 2011-01-28 16:54:15 -08:00
Joe Onorato
9fecc19f97 am 430dde3e: Merge "Don\'t force all views to be asking for lights out just because somebody did." into honeycomb 
* commit '430dde3ef3b9b82bfca4ae51e225c6ad88aee514':
  Don't force all views to be asking for lights out just because somebody did.
 2011-01-28 16:39:44 -08:00
Joe Onorato
430dde3ef3 Merge "Don't force all views to be asking for lights out just because somebody did." into honeycomb 2011-01-28 16:38:01 -08:00
Joe Onorato
957a189bf2 Don't force all views to be asking for lights out just because somebody did. 
Bug: 3396308
Bug: 3395422
Change-Id: Ic97a689bda12d3b53a6ecace504d411f2beb87d5
 2011-01-28 16:36:16 -08:00
Dianne Hackborn
7b7280fd07 am 6ec44395: Merge "Fix issue #3403539: WordPress crashes on Honeycomb" into honeycomb 
* commit '6ec44395f304a478fb56f20ca5e941514ed0a48e':
  Fix issue #3403539: WordPress crashes on Honeycomb
 2011-01-28 16:35:40 -08:00
Dianne Hackborn
6ec44395f3 Merge "Fix issue #3403539: WordPress crashes on Honeycomb" into honeycomb 2011-01-28 16:34:02 -08:00