Andreas Huber
300d37d2b8
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
21e81dddc6
Merge 13212f83 from gingerbread-plus-aosp
...
Change-Id: I9a8ee0c7e7896aea85e7a7c18ee82927091cb670
2011-01-29 08:54:06 -08:00
Jim Miller
f181cf3c14
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
2e84762231
Merge 34afc2cd from gingerbread-plus-aosp
...
Change-Id: I2471571af1d8e34e7270cb6f765f16b4a474bb28
2011-01-29 08:45:29 -08:00
Eric Fischer
5027c29088
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
8beb0a0866
am 32f7d50d: am 21d0a173: Fix build - javadoc.
...
* commit '32f7d50df147e4eb171044aad376bd1425fcf5e7':
Fix build - javadoc.
2011-01-29 08:02:04 -08:00
Scott Main
c85b7581f1
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
ffdc0440ec
Merge 55e124c4 from gingerbread-plus-aosp
...
Change-Id: I8b428792ced31b73e8cc3743ab38e157578e9377
2011-01-29 07:32:39 -08:00
Robert Greenwalt
6835f6094b
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
1fc7c8ff4b
Merge "Don't use mobile networktype icon if not connected" into honeycomb
2011-01-29 06:35:57 -08:00
Justin Ho
631d53fd1c
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
d453b0cbbf
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
00ee7ba7d7
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
74c7bb3ccc
Merge "New honeycomb sound set" into honeycomb
2011-01-28 19:18:51 -08:00
Joe Onorato
33f49254b5
am a0f2cdb5: Merge "999" into honeycomb
...
* commit 'a0f2cdb50720b0a1960e5342b376867b2c9ad1df':
999
2011-01-28 18:50:03 -08:00
Joe Onorato
67e95b1960
Merge "999" into honeycomb
2011-01-28 18:47:57 -08:00
Mathias Agopian
daabd7c228
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
779160c4ea
Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb
2011-01-28 18:38:58 -08:00
Mathias Agopian
3cc2677efc
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
07eb394e6d
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
c381806ae0
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
56a764c39c
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
c5b1fe9236
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
02f5e29640
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
0f962411f8
Merge "LayoutLib: update with Pair API." into honeycomb
2011-01-28 17:21:57 -08:00
Irfan Sheriff
3a8a479173
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
Joe Onorato
68e01005f0
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
a618e56e61
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
Dianne Hackborn
faec16034b
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
8bd4cefdb4
Merge "Fix issue #3403539 : WordPress crashes on Honeycomb" into honeycomb
2011-01-28 16:34:02 -08:00
Jim Miller
2ea5389b3d
am 6354dd0b: Merge "Fix 3403858: Remove lock icons from status1 area." into honeycomb
...
* commit '6354dd0b3e507b2afebc5ba41cd57866ade5ba94':
Fix 3403858: Remove lock icons from status1 area.
2011-01-28 16:26:05 -08:00
Chet Haase
1236140d70
am 691d43c3: Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb
...
* commit '691d43c35fb953c2f70830d3ebd890a43b54cae3':
Fixed LayoutTransition bug moving multiple views
2011-01-28 16:23:45 -08:00
Jim Miller
11ae43006e
Merge "Fix 3403858: Remove lock icons from status1 area." into honeycomb
2011-01-28 16:21:38 -08:00
Chet Haase
bb58b9cc90
Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb
2011-01-28 16:19:32 -08:00
Eric Fischer
d2e2cdb567
am 0982dc64: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '0982dc6488a921d9d54d23b9180a9acf33c61526':
Import revised translations. DO NOT MERGE
2011-01-28 15:11:14 -08:00
Eric Fischer
a7442c9587
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-28 15:09:16 -08:00
Justin Ho
e46b080102
am 20af1c57: Merge "Correct font size for notifications & control panel." into honeycomb
...
* commit '20af1c57de9651b93a35b67418263b88bc83f3e4':
Correct font size for notifications & control panel.
2011-01-28 15:05:07 -08:00
Justin Ho
31db9b8551
Merge "Correct font size for notifications & control panel." into honeycomb
2011-01-28 15:02:55 -08:00
Brian Muramatsu
1a86374dc3
am 9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb
...
* commit '9eaefb821396b2ac02fcf2cceb2f242a6eb55cf0':
Fix TextUtils#commaEllipsize
2011-01-28 14:53:07 -08:00
Brian Muramatsu
12ef5792f0
Merge "Fix TextUtils#commaEllipsize" into honeycomb
2011-01-28 14:51:10 -08:00
Romain Guy
719eda08be
am b0c939ad: Merge "Prevent crash when detaching a SurfaceView. Bug #3400461 " into honeycomb
...
* commit 'b0c939adfa339c5cbb7f458072119269368b3ba5':
Prevent crash when detaching a SurfaceView. Bug #3400461
2011-01-28 14:20:01 -08:00
Romain Guy
3845b92378
Merge "Prevent crash when detaching a SurfaceView. Bug #3400461 " into honeycomb
2011-01-28 14:17:45 -08:00
Jamie Gennis
e8c431b142
am 2a8f8d57: Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb
...
* commit '2a8f8d57d23a171eaa367faa143f45fdd2f9cc1c':
Quiet the SurfaceFlingerClient dequeueBuffer error.
2011-01-28 14:15:44 -08:00
Jamie Gennis
155c93ad47
Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb
2011-01-28 14:12:57 -08:00
Gilles Debunne
3546e78bd8
am d11f5d2c: Merge "Fix for TextView\'s error popup behavior when using soft keyboard." into honeycomb
...
* commit 'd11f5d2c5e41b4f2f5bda5ecca793efd2ab2300b':
Fix for TextView's error popup behavior when using soft keyboard.
2011-01-28 14:10:08 -08:00
Gilles Debunne
2948bb3f5f
Merge "Fix for TextView's error popup behavior when using soft keyboard." into honeycomb
2011-01-28 14:07:12 -08:00
Adam Powell
304d99871f
am 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb
...
* commit '6b2fda9f4bcc5c35f605876a5c9da9b226196f5e':
Fix bug 3399992 - Make ActionBar menu text styleable
2011-01-28 14:01:06 -08:00
Adam Powell
7791f904da
Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb
2011-01-28 13:58:28 -08:00
Joe Onorato
d24a7df9f0
am cfd0bafd: Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
...
* commit 'cfd0bafdebf1fccd3f5a0baed5cad8a539546e9b':
Make keyguard also ask to turn the back button off, now that it is controlled separately.
Allow independent control of the back and the other navigation buttons.
Allow the status bar disable flags to be used as View's system ui visibility fields.
2011-01-28 13:43:22 -08:00
Joe Onorato
0a72c43a42
am 94eb3d0f: Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb
...
* commit '94eb3d0f7e77eb94c9fee8523c013fbc0f9032c4':
Plumb whether an input view is actually visible or not through from the IME to the status bar.
2011-01-28 13:43:17 -08:00