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
Jean-Baptiste Queru
b573eb4453
Merge "Delete browerplugin tests - do not merge"
2011-01-28 15:26:59 -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
Eric Fischer
c9a4eb08a0
am 5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '5f2def8cfdad2491a646be69347444a3be6ddf84':
Import revised translations. DO NOT MERGE
2011-01-28 14:19:36 -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
Eric Fischer
bb3356d637
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-01-28 14:10:43 -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
Joe Onorato
ee37f4d420
Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
...
* changes:
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:40:45 -08:00
Joe Onorato
311e33ddd1
Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb
2011-01-28 13:40:28 -08:00
Dianne Hackborn
065b683e26
am 10e4148b: Merge "Fix issue #3291173 : Problem report for NewsRoom - RSS News Reader" into honeycomb
...
* commit '10e4148b62c9bfed945c1bcea9dd5eea2a17b0d0':
Fix issue #3291173 : Problem report for NewsRoom - RSS News Reader
2011-01-28 12:46:51 -08:00
Dianne Hackborn
e40389171f
Merge "Fix issue #3291173 : Problem report for NewsRoom - RSS News Reader" into honeycomb
2011-01-28 12:44:52 -08:00
Xavier Ducrohet
57be3f1d31
am 361d6148: Merge "LayoutLib: Update with the new resource map APIs." into honeycomb
...
* commit '361d614822fcda456ba80f166e5d97447adb7e79':
LayoutLib: Update with the new resource map APIs.
2011-01-28 12:40:30 -08:00
Xavier Ducrohet
2b63b8306b
Merge "LayoutLib: Update with the new resource map APIs." into honeycomb
2011-01-28 12:38:40 -08:00
Daniel Sandler
ea28d411fd
am f0ca959b: Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb
...
* commit 'f0ca959b02cb9e81c116f7dece0bc345fb54de0c':
Fix overlapping app icon & info in notifications with large icons.
2011-01-28 12:20:11 -08:00
Daniel Sandler
ea0c499624
Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb
2011-01-28 12:18:11 -08:00
Jamie Gennis
749172269a
Quiet the SurfaceFlingerClient dequeueBuffer error.
...
This is a temporary WAR for the case where dequeueBuffer is called when
all the buffers owned by a SurfaceTexture are not available - either
they're the current texture buffer or the next one. Currently, an error
is returned in that case, and this change just prevents that error from
being logged. In the future this will be fixed to not return an error
in that case.
Bug: 3356050
Change-Id: Ic6cc304881a63ce134cfd0bcb4265e3e3fa94b6a
2011-01-28 12:08:18 -08:00
Dirk Dougherty
438a2420b0
am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
...
* commit 'fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
Doc change: Add time-lapse video to 3.0 highlights.
2011-01-28 12:00:51 -08:00
Dirk Dougherty
11057a96fd
Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
2011-01-28 11:57:42 -08:00
Andreas Huber
60c2d783a4
am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)"" into honeycomb
...
* commit '79c4648597dab2b7786c8f067896ab66abe190de':
Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"
2011-01-28 11:51:16 -08:00
Andreas Huber
b7ee5074dd
Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"" into honeycomb
2011-01-28 11:49:03 -08:00
Daniel Sandler
d01f5e3121
am 2ded7ef4: Merge "Allow taps to once again penetrate the darkness." into honeycomb
...
* commit '2ded7ef444d4e089e0ce4874c791f19ec198fc36':
Allow taps to once again penetrate the darkness.
2011-01-28 11:23:47 -08:00
Daniel Sandler
fab00f6920
Merge "Allow taps to once again penetrate the darkness." into honeycomb
2011-01-28 11:21:27 -08:00
Gilles Debunne
7d1b9518b0
am e1df07fc: Merge "Fix for an IOOBoundsException in Paint." into honeycomb
...
* commit 'e1df07fc5a88da0242a6ade054423ec464c5318f':
Fix for an IOOBoundsException in Paint.
2011-01-28 11:02:21 -08:00
Gilles Debunne
288e4320da
Merge "Fix for an IOOBoundsException in Paint." into honeycomb
2011-01-28 10:58:53 -08:00
Jamie Gennis
b9470e7cf6
am 3c0f91b0: Merge "Add docs about threading to SurfaceTexture." into honeycomb
...
* commit '3c0f91b0e1312287a271ba890d52cdb8bb75e52d':
Add docs about threading to SurfaceTexture.
2011-01-28 10:44:44 -08:00