Commit Graph

9979 Commits

Author SHA1 Message Date
Mike Lockwood
ee333b8716 am 2ecf3f5e: dumpstate: Add backlight information to bugreport output.
Merge commit '2ecf3f5e00ea2ac630ffb405baba33113596cf38' into eclair-plus-aosp

* commit '2ecf3f5e00ea2ac630ffb405baba33113596cf38':
  dumpstate: Add backlight information to bugreport output.
2009-10-07 11:43:27 -07:00
Mathias Agopian
ba4f5d020c am f8e4bc9f: Merge change I0c4cec7e into eclair
Merge commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70' into eclair-plus-aosp

* commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70':
  Attempt to fix [2152536] ANR in browser
2009-10-07 11:42:52 -07:00
Jason Sams
9a09d5a411 am 8df16d63: Merge change I7f047786 into eclair
Merge commit '8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc' into eclair-plus-aosp

* commit '8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc':
  Update the SimpleMesh API to support new attribute types.  Also spilt add/set commands to avoid permutation explosion.
2009-10-07 11:42:19 -07:00
Dmitri Plotnikov
622acba399 am 82e863d8: Merge change Ic0d82ef1 into eclair
Merge commit '82e863d8ab5166fec3dce96ae865d1e2d3bbc021' into eclair-plus-aosp

* commit '82e863d8ab5166fec3dce96ae865d1e2d3bbc021':
  [Issue 2161366] Changing capitalization of string "Via" to "via"
2009-10-07 11:41:35 -07:00
San Mehat
38b86b842a am 7b16834a: Merge change Iaf686344 into eclair
Merge commit '7b16834adc1003f492cd2be4b1bcc3fb73a78c23' into eclair-plus-aosp

* commit '7b16834adc1003f492cd2be4b1bcc3fb73a78c23':
  dumpstate: Display mtime instead of ctime
2009-10-07 11:40:16 -07:00
Wei Huang
d08049b3d8 am 6b370745: bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Merge commit '6b3707452c5921c89258371eec140b0fb76766f8' into eclair-plus-aosp

* commit '6b3707452c5921c89258371eec140b0fb76766f8':
  bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
2009-10-07 11:39:59 -07:00
Mike Cleron
bba3ddcba6 am df64cb41: Merge change I80ce8833 into eclair
Merge commit 'df64cb41fb44d56957cba8e375788d98af7bd8b4' into eclair-plus-aosp

* commit 'df64cb41fb44d56957cba8e375788d98af7bd8b4':
  Icons again
2009-10-07 11:37:47 -07:00
David Brown
9405af7e50 am 88e03757: RotarySelector widget: add callback for "grabbed" state changes.
Merge commit '88e037577f7db140e4ef88b77eefaa910e06e5f5' into eclair-plus-aosp

* commit '88e037577f7db140e4ef88b77eefaa910e06e5f5':
  RotarySelector widget: add callback for "grabbed" state changes.
2009-10-07 11:37:40 -07:00
Eric Fischer
697ff9f963 am 3d7bb3a5: Merge change I3ca8fb69 into eclair
Merge commit '3d7bb3a5e49b559725bba84390b1021d9c527347' into eclair-plus-aosp

* commit '3d7bb3a5e49b559725bba84390b1021d9c527347':
  Import revised translations.  DO NOT MERGE
2009-10-07 11:36:17 -07:00
Jaikumar Ganesh
dcc837d23d am d453fe67: Merge change I5dbd1994 into eclair
Merge commit 'd453fe6709c4d28350e34fa39b4fe73d98a36a0c' into eclair-plus-aosp

* commit 'd453fe6709c4d28350e34fa39b4fe73d98a36a0c':
  Fix rfcomm socket connect return code.
2009-10-07 11:35:03 -07:00
Mathias Agopian
b71eb676f4 am 4ac45597: Merge change I15b0ebb9 into eclair
Merge commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d' into eclair-plus-aosp

* commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d':
  a simple test app for gralloc
2009-10-07 11:34:37 -07:00
Joe Onorato
3ff9017672 am d14cfc27: Merge change I9e384ddd into eclair
Merge commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620' into eclair-plus-aosp

* commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620':
  Add a test pattern as rollo's icon
2009-10-07 11:34:16 -07:00
John Wang
45f61b242e am 99510681: Unhide constant DATA_ACTIVITY_DORMANT.
Merge commit '99510681e9f1c76f82719e724990f744cfdbcefd' into eclair-plus-aosp

* commit '99510681e9f1c76f82719e724990f744cfdbcefd':
  Unhide constant DATA_ACTIVITY_DORMANT.
2009-10-07 11:34:09 -07:00
Mike Lockwood
2ecf3f5e00 dumpstate: Add backlight information to bugreport output.
To help diagnose bugs b/2164183 and b/2164647

Change-Id: Ie80c3b205c231c485d8a24e68b0a9c5e025da479
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-04 17:21:05 -04:00
Android (Google) Code Review
f8e4bc9f77 Merge change I0c4cec7e into eclair
* changes:
  Attempt to fix [2152536] ANR in browser
2009-10-02 23:35:12 -04:00
Android (Google) Code Review
8df16d63d4 Merge change I7f047786 into eclair
* changes:
  Update the SimpleMesh API to support new attribute types.  Also spilt add/set commands to avoid permutation explosion.
2009-10-02 21:40:07 -04:00
Jason Sams
7f047786d9 Update the SimpleMesh API to support new attribute types. Also spilt add/set commands to avoid permutation explosion. 2009-10-02 18:18:35 -07:00
Mathias Agopian
0c4cec7e4d Attempt to fix [2152536] ANR in browser
The ANR is caused by SurfaceFlinger waiting for buffers of a removed surface to become availlable.
When it is removed from the current list, a Surface is marked as NO_INIT, which causes SF to return
immediately in the above case. For some reason, the surface here wasn't marked as NO_INIT.

This change makes the code more robust by always (irregadless or errors) setting the NO_INIT status
in all code paths where a surface is removed from the list.

Additionaly added more information in the logs, should this happen again.
2009-10-02 18:12:30 -07:00
Android (Google) Code Review
82e863d8ab Merge change Ic0d82ef1 into eclair
* changes:
  [Issue 2161366] Changing capitalization of string "Via" to "via"
2009-10-02 19:17:30 -04:00
Dmitri Plotnikov
067ca26c02 [Issue 2161366] Changing capitalization of string "Via" to "via"
Approved by Tim.

Change-Id: Ic0d82ef1c687ecce91edc90a16aeefa17292d565
2009-10-02 16:06:14 -07:00
Android (Google) Code Review
7b16834adc Merge change Iaf686344 into eclair
* changes:
  dumpstate: Display mtime instead of ctime
2009-10-02 16:34:02 -04:00
San Mehat
af6863447c dumpstate: Display mtime instead of ctime
Signed-off-by: San Mehat <san@google.com>
2009-10-02 13:15:53 -07:00
Wei Huang
6b3707452c bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Change-Id: I1453950e406f1991e78530795ed28e6b4a7cf8c6
2009-10-02 11:52:40 -07:00
Android (Google) Code Review
df64cb41fb Merge change I80ce8833 into eclair
* changes:
  Icons again
2009-10-02 03:51:19 -04:00
David Brown
88e037577f RotarySelector widget: add callback for "grabbed" state changes.
This is the frameworks/base part of the fix for Bug 2158434: add a new
callback to the OnDialTriggerListener interface, so the RotarySelector can
tell the app about state changes between NOTHING_GRABBED and
LEFT_HANDLE_GRABBED and RIGHT_HANDLE_GRABBED.

BUG=2158434
DRNO=timsullivan

TESTED=regular incoming calls, call waiting calls, answering a call,
       rejecting a call.  Also verified I didn't affect the
       lock screen at all.
2009-10-02 00:30:08 -07:00
Mike Cleron
80ce883347 Icons again 2009-10-02 00:27:31 -07:00
Android (Google) Code Review
3d7bb3a5e4 Merge change I3ca8fb69 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-10-02 00:47:08 -04:00
Android (Google) Code Review
d453fe6709 Merge change I5dbd1994 into eclair
* changes:
  Fix rfcomm socket connect return code.
2009-10-01 22:46:23 -04:00
Jaikumar Ganesh
a01a4479a1 Fix rfcomm socket connect return code.
The phone would say connected even when powered off.
Bug id: 2161890
DrNo: Hiroshi

Change-Id: I5dbd19941a80e86c7462670fb844a29cf4eb0908
2009-10-01 19:12:18 -07:00
Android (Google) Code Review
4ac45597fb Merge change I15b0ebb9 into eclair
* changes:
  a simple test app for gralloc
2009-10-01 20:25:45 -04:00
Mathias Agopian
15b0ebb925 a simple test app for gralloc 2009-10-01 17:23:05 -07:00
Eric Fischer
4898829b45 Import revised translations. DO NOT MERGE
Approver: jerryw
2009-10-01 16:59:07 -07:00
Android (Google) Code Review
d14cfc2762 Merge change I9e384ddd into eclair
* changes:
  Add a test pattern as rollo's icon
2009-10-01 19:49:27 -04:00
Joe Onorato
9e384dddb8 Add a test pattern as rollo's icon 2009-10-01 16:48:44 -07:00
John Wang
99510681e9 Unhide constant DATA_ACTIVITY_DORMANT. 2009-10-01 10:00:54 -07:00
Marco Nelissen
88be4cb5ee am 9b150b74: Close the cursor before assigning a new one to the same variable.
Merge commit '9b150b74573ce506abd00c692fb42f46980441a3' into eclair-plus-aosp

* commit '9b150b74573ce506abd00c692fb42f46980441a3':
  Close the cursor before assigning a new one to the same variable.
2009-10-01 08:36:00 -07:00
Marco Nelissen
9b150b7457 Close the cursor before assigning a new one to the same variable. 2009-10-01 08:16:02 -07:00
Daniel Sandler
8da45e9ee9 am 87b94b13: Merge change I6e01fa52 into eclair
Merge commit '87b94b13ea8ad708d079ddfafe4801c12c38e57a' into eclair-plus-aosp

* commit '87b94b13ea8ad708d079ddfafe4801c12c38e57a':
  Remove unneeded icon.
2009-10-01 08:10:01 -07:00
Android (Google) Code Review
87b94b13ea Merge change I6e01fa52 into eclair
* changes:
  Remove unneeded icon.
2009-10-01 11:01:34 -04:00
Daniel Sandler
28a1b67a1c Remove unneeded icon.
(Obviated by commit a408791148e816215f65ad81a187051c5fb47c68.)

Change-Id: I6e01fa52f2bbeb28c969e6a033ab0b1032cbc848
2009-10-01 11:00:24 -04:00
Michael Chan
50bd2992b1 am 5a463a69: Merge change Ic2a16d4f into eclair
Merge commit '5a463a693cae501f3e65936ea96e1ca1bae5fc3f' into eclair-plus-aosp

* commit '5a463a693cae501f3e65936ea96e1ca1bae5fc3f':
  b/2148252 Fix emulator
2009-10-01 08:00:16 -07:00
Android (Google) Code Review
5a463a693c Merge change Ic2a16d4f into eclair
* changes:
  b/2148252 Fix emulator
2009-10-01 10:52:01 -04:00
Mike Reed
bd2973db0b am bbed0d68: hide setGammaForText, which is only used for calibrating new devices
Merge commit 'bbed0d68c815446400193bdc8b16fbf73e1ee664' into eclair-plus-aosp

* commit 'bbed0d68c815446400193bdc8b16fbf73e1ee664':
  hide setGammaForText, which is only used for calibrating new devices
2009-10-01 06:42:33 -07:00
Mike Reed
bbed0d68c8 hide setGammaForText, which is only used for calibrating new devices 2009-10-01 09:34:45 -04:00
Jeff Sharkey
b28e9c9ebe am c00099ef: Change intent flags for launching FastTrack.
Merge commit 'c00099ef62fc496429d0a06e580b600f61304f9c' into eclair-plus-aosp

* commit 'c00099ef62fc496429d0a06e580b600f61304f9c':
  Change intent flags for launching FastTrack.
2009-10-01 05:44:33 -07:00
Jeff Sharkey
c00099ef62 Change intent flags for launching FastTrack. 2009-10-01 05:35:59 -07:00
Mathias Agopian
3d9d5fc063 am 271cfe85: Merge change Ia8826d67 into eclair
Merge commit '271cfe85ccfa6d94008dcebb3b97108ca325fe59' into eclair-plus-aosp

* commit '271cfe85ccfa6d94008dcebb3b97108ca325fe59':
  improve boot animation a bit
2009-10-01 03:22:36 -07:00
Android (Google) Code Review
271cfe85cc Merge change Ia8826d67 into eclair
* changes:
  improve boot animation a bit
2009-10-01 06:16:25 -04:00
Mathias Agopian
a8826d6709 improve boot animation a bit 2009-10-01 03:14:30 -07:00
Bjorn Bringert
51654b562b am a6309c30: On BACK in search, hide just IME if IME is fullscreen
Merge commit 'a6309c30722ad3aee88ddc2394cea2a499168d99' into eclair-plus-aosp

* commit 'a6309c30722ad3aee88ddc2394cea2a499168d99':
  On BACK in search, hide just IME if IME is fullscreen
2009-10-01 03:02:48 -07:00