31878 Commits

Author SHA1 Message Date
Mike Lockwood
ba7655432c MTP: Fix problems with signed ints in MtpCursor.cpp
BUG: 2978335

Change-Id: Ie9f3dea3b88b00a555e1ca3232f196e83ee7a6da
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-23 22:08:16 -04:00
Ben Murdoch
62275a461e Make WebTextView display an "AutoFill this form" option
When the user clicks to AutoFill the form, we propogate a message
to WebCore through WebViewCore to actually perform the action.

Corresponding change in external/webkit needed to implement the
native method that gets called to execute

Change-Id: I6c75ab9b2c5404580de549b69102ab9374493c34
2010-09-23 17:03:51 +01:00
satok
1115d0da1a Merge "Add methods for managing subtypes" 2010-09-23 00:28:25 -07:00
satok
ab751aa085 Add methods for managing subtypes
- added showInputMethodSubtypePicker to public API
-- show the selector dialog for subtypes
- added getter, setter and event handler to InputMethodManagerService
- extract InputMethodSubtype to the top level class for using it in aidl
- TODO: make an enabler for input method subtypes
- TODO: handle the event of changing an input method subtype in LatinIME

Change-Id: I49f8c6675ac4b06511635d14a37bd398738eff33
2010-09-23 16:25:07 +09:00
repo sync
09225a4c8f am c0f2d952: am 0b7d6de1: Fix the build.
Merge commit 'c0f2d9522ea5891352e219c4ca8f85ac59287604'

* commit 'c0f2d9522ea5891352e219c4ca8f85ac59287604':
  Fix the build.
2010-09-23 00:11:07 -07:00
Chia-chi Yeh
6b762aaa8d resolved conflicts for merge of 2b652855 to master
Change-Id: I3604c95530823605d66cb56be7a37c55399a9271
2010-09-23 14:59:58 +08:00
repo sync
c0f2d9522e am 0b7d6de1: Fix the build.
Merge commit '0b7d6de1559a4a78af76ab501e0a15afc396c2b9' into gingerbread-plus-aosp

* commit '0b7d6de1559a4a78af76ab501e0a15afc396c2b9':
  Fix the build.
2010-09-22 23:56:42 -07:00
repo sync
0b7d6de155 Fix the build.
Change-Id: I82210cb2d41f532583f83ea17e6f2d8d49280a30
2010-09-23 14:52:24 +08:00
repo sync
2b6528554e am 75c3853e: Merge changes I7efff4f2,I1631ee20,I14d9886a,Ic2858920,Iff588130,I37ba9d83 into gingerbread
Merge commit '75c3853ec5e4bb306fa4a614e5005df1a4e75b92' into gingerbread-plus-aosp

* commit '75c3853ec5e4bb306fa4a614e5005df1a4e75b92':
  SIP: Make SipAudioCallImpl use SimpleSessionDescription instead of javax.sdp.
  SDP: Add a simple class to help manipulate session descriptions.
  RTP: Add log throttle for "no data".
  RTP: Update native part to reflect the API change.
  RTP: Add two getters to retrieve the current configuration from AudioStream.
  RTP: Extend codec capability and update the APIs.
2010-09-22 23:17:24 -07:00
repo sync
75c3853ec5 Merge changes I7efff4f2,I1631ee20,I14d9886a,Ic2858920,Iff588130,I37ba9d83 into gingerbread
* changes:
  SIP: Make SipAudioCallImpl use SimpleSessionDescription instead of javax.sdp.
  SDP: Add a simple class to help manipulate session descriptions.
  RTP: Add log throttle for "no data".
  RTP: Update native part to reflect the API change.
  RTP: Add two getters to retrieve the current configuration from AudioStream.
  RTP: Extend codec capability and update the APIs.
2010-09-22 23:14:15 -07:00
repo sync
84f7f6ba39 SIP: Make SipAudioCallImpl use SimpleSessionDescription instead of javax.sdp.
Change-Id: I7efff4f29ca84c3e7c17ef066b7186b514a777b2
2010-09-23 14:07:45 +08:00
Wei-Ta Chen
a23cdda0a5 am ac487f70: am 6b849e21: Unhide BitmapRegionDecoder.
Merge commit 'ac487f708f7b58dbd4f3021b520c6ed5975daebe'

* commit 'ac487f708f7b58dbd4f3021b520c6ed5975daebe':
  Unhide BitmapRegionDecoder.
2010-09-22 23:06:55 -07:00
Wei-Ta Chen
ac487f708f am 6b849e21: Unhide BitmapRegionDecoder.
Merge commit '6b849e2123be98eb2a1a25b8abf0b13a279ce952' into gingerbread-plus-aosp

* commit '6b849e2123be98eb2a1a25b8abf0b13a279ce952':
  Unhide BitmapRegionDecoder.
2010-09-22 23:03:30 -07:00
Wei-Ta Chen
6b849e2123 Unhide BitmapRegionDecoder.
1. Rename LargeBitmap to BitmapRegionDecoder
2. Move the instantiations of BitmapRegionDecoder out of BitmapFactory.
3. Remove the use of MemoryFile in BitmapRegionDecoder, since MemoryFile's API had been modified in master. Otherwise, the change will break the master build.
4. Move AssetStreamAdaptor, AutoFDSeek and nullObjectReturn to Utils.h because BitmapFactory.cpp and BitmapRegionDecoder.cpp both need to use these utility functions.

Most of the modifications, except for (2) and (3), were reviewed in https://android-git.corp.google.com/g/#change,64716 .
However, that change broke the master build due to (3) and was reverted eventually.
So, instead of withdrawing this change and waiting for that change to be checked in again, I merge the two changes into one.

Change-Id: I2202c0fbbbd6d6676bbd9637e690023ea4099c40
2010-09-23 13:56:52 +08:00
Romain Guy
8e2b203c38 Merge "Correctly initialize/refresh layers." 2010-09-22 22:52:40 -07:00
Romain Guy
38c85b907a Correctly initialize/refresh layers.
Change-Id: Id8cdcf587b13098460f7d4aa1bd17708784d89bb
2010-09-22 22:51:12 -07:00
Chia-chi Yeh
e6c0c10958 SDP: Add a simple class to help manipulate session descriptions.
Change-Id: I1631ee20e8b4a9ad8e2184356b5d13de66e03db1
2010-09-23 13:31:01 +08:00
Adam Powell
0de6582cb5 am 37e3f49f: (-s ours) am e8189420: Merge "DO NOT MERGE Apply new styles to the status bar/notification shade" into gingerbread
Merge commit '37e3f49fb4b5ac23a985ab12b7951523be54b688'

* commit '37e3f49fb4b5ac23a985ab12b7951523be54b688':
  DO NOT MERGE Apply new styles to the status bar/notification shade
2010-09-22 22:07:40 -07:00
Adam Powell
37e3f49fb4 am e8189420: Merge "DO NOT MERGE Apply new styles to the status bar/notification shade" into gingerbread
Merge commit 'e81894201979513de87269a21a1802da72d2b954' into gingerbread-plus-aosp

* commit 'e81894201979513de87269a21a1802da72d2b954':
  DO NOT MERGE Apply new styles to the status bar/notification shade
2010-09-22 21:10:41 -07:00
Adam Powell
e818942019 Merge "DO NOT MERGE Apply new styles to the status bar/notification shade" into gingerbread 2010-09-22 21:08:10 -07:00
Adam Powell
e241621e98 DO NOT MERGE Apply new styles to the status bar/notification shade
Change-Id: I5e89891852ff96f113083ac87bcfd74732c43faa
2010-09-22 21:06:37 -07:00
Mike Lockwood
4670a92f61 Merge "MediaScanner: disable album artist support until MediaProvider really supports it" 2010-09-22 20:30:48 -07:00
Mike Lockwood
ff371cf0ed MediaScanner: disable album artist support until MediaProvider really supports it
Fixes a "no such column" exception in MediaProvider.update() that I somehow
missed when testing the MediaProvider refactoring.

Change-Id: Icc502a5c0e3bd150b353972d000b978a9e044abc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-22 23:25:33 -04:00
Romain Guy
806de5b1c5 Remove unused constant.
Change-Id: I02e8f76cc1406e693f822822808b3485d2158884
2010-09-22 20:08:33 -07:00
Romain Guy
7275290a1f Merge "Draw text decorations with lines instead of rectangles." 2010-09-22 19:50:27 -07:00
Romain Guy
e20ecbd12d Draw text decorations with lines instead of rectangles.
Change-Id: Icd25c85c3a24da96a3d2f76f9477da6f87e0303c
2010-09-22 19:49:04 -07:00
Mike Lockwood
a9158425cc Merge "Changes to support MediaProvider refactoring" 2010-09-22 18:50:06 -07:00
Brad Fitzpatrick
40d073cf87 am 1c384697: am 89647b11: Don\'t do single byte writes in DropBoxManagerService
Merge commit '1c3846979a657e4e2b1f7864fa6defb65b3bbf42'

* commit '1c3846979a657e4e2b1f7864fa6defb65b3bbf42':
  Don't do single byte writes in DropBoxManagerService
2010-09-22 18:37:11 -07:00
Brad Fitzpatrick
1c3846979a am 89647b11: Don\'t do single byte writes in DropBoxManagerService
Merge commit '89647b1172cdf40a3681922150122b0bd2ea83f1' into gingerbread-plus-aosp

* commit '89647b1172cdf40a3681922150122b0bd2ea83f1':
  Don't do single byte writes in DropBoxManagerService
2010-09-22 18:33:46 -07:00
Brad Fitzpatrick
89647b1172 Don't do single byte writes in DropBoxManagerService
Bug: 3018772
Change-Id: I6990041f059aeb2a4c29e59b1a3d78d19bf9b02f
2010-09-22 17:49:16 -07:00
Joe Onorato
5eb22e2ce1 am 19c4b29d: am 8310b42f: Add javadoc saying that wake locks are ref counted by default.
Merge commit '19c4b29d46aece70dbe532ba9078c904fbc62502'

* commit '19c4b29d46aece70dbe532ba9078c904fbc62502':
  Add javadoc saying that wake locks are ref counted by default.
2010-09-22 17:33:54 -07:00
Joe Onorato
19c4b29d46 am 8310b42f: Add javadoc saying that wake locks are ref counted by default.
Merge commit '8310b42fbc086b0f05fc8ef45ac34c7e099c485e' into gingerbread-plus-aosp

* commit '8310b42fbc086b0f05fc8ef45ac34c7e099c485e':
  Add javadoc saying that wake locks are ref counted by default.
2010-09-22 17:29:49 -07:00
Amith Yamasani
483c4b1d1f am abdd2c7f: am 95f600b5: Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread
Merge commit 'abdd2c7f03651e95424133c2be948238c6dc7bf6'

* commit 'abdd2c7f03651e95424133c2be948238c6dc7bf6':
  Fix NPE in PowerManagerService on boot, if some settings are corrupted.
2010-09-22 17:06:48 -07:00
John Wang
c188b3d077 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-09-22 17:06:45 -07:00
Dmitri Plotnikov
7b30772ae1 Merge "Adding PHOTO_URI and PHOTO_THUMBNAIL_URI." 2010-09-22 17:05:28 -07:00
Eric Laurent
ec0efd0ceb am 11746caa: am 08959c63: Merge "Request permission for global audio effects." into gingerbread
Merge commit '11746caaa852984ff186bf5b8807e2c14cd7c1bc'

* commit '11746caaa852984ff186bf5b8807e2c14cd7c1bc':
  Request permission for global audio effects.
2010-09-22 17:04:48 -07:00
Steve Howard
66df755834 am 1d056cd6: am 127146ee: Merge "Decrease sensitivity of orientation changes a bit." into gingerbread
Merge commit '1d056cd6ef6d6bdea00a92f411b0eaec7694b624'

* commit '1d056cd6ef6d6bdea00a92f411b0eaec7694b624':
  Decrease sensitivity of orientation changes a bit.
2010-09-22 17:04:15 -07:00
Eric Laurent
736da9cd1f am 4744774a: am 3efbc555: Merge "Fix more audio effects auto tests" into gingerbread
Merge commit '4744774a7a3644489ec1159f5554a41eb943a51b'

* commit '4744774a7a3644489ec1159f5554a41eb943a51b':
  Fix more audio effects auto tests
2010-09-22 17:03:41 -07:00
Joe Onorato
8310b42fbc Add javadoc saying that wake locks are ref counted by default.
Bug: 3012561
Change-Id: I441a42fdb12ba6d87d6f5a49463d6ddcc300acb7
2010-09-22 16:54:36 -07:00
Romain Guy
deea2df0a7 Merge "Fix OpenGL errors in various places." 2010-09-22 16:46:37 -07:00
Romain Guy
29d8997bd4 Fix OpenGL errors in various places.
Change-Id: I3a4e115d8fb13b6c443e65460d92987b16f2524c
2010-09-22 16:44:49 -07:00
Amith Yamasani
abdd2c7f03 am 95f600b5: Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread
Merge commit '95f600b55f617fcc94985fee07927aff48160362' into gingerbread-plus-aosp

* commit '95f600b55f617fcc94985fee07927aff48160362':
  Fix NPE in PowerManagerService on boot, if some settings are corrupted.
2010-09-22 16:35:11 -07:00
Amith Yamasani
95f600b55f Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread 2010-09-22 16:29:49 -07:00
Amith Yamasani
8b61983ee8 Fix NPE in PowerManagerService on boot, if some settings are corrupted.
Bug: 2715038
Change-Id: I10c08b359ff3cde732c37eb6dff0877cdb021cd9
2010-09-22 16:11:59 -07:00
Eric Laurent
11746caaa8 am 08959c63: Merge "Request permission for global audio effects." into gingerbread
Merge commit '08959c6396b8a52194554f961ae8fd874c994e4e' into gingerbread-plus-aosp

* commit '08959c6396b8a52194554f961ae8fd874c994e4e':
  Request permission for global audio effects.
2010-09-22 16:05:37 -07:00
Steve Howard
1d056cd6ef am 127146ee: Merge "Decrease sensitivity of orientation changes a bit." into gingerbread
Merge commit '127146ee1c716d785fd70207045625c0c1f1d1ef' into gingerbread-plus-aosp

* commit '127146ee1c716d785fd70207045625c0c1f1d1ef':
  Decrease sensitivity of orientation changes a bit.
2010-09-22 16:05:03 -07:00
Eric Laurent
08959c6396 Merge "Request permission for global audio effects." into gingerbread 2010-09-22 16:00:59 -07:00
Eric Laurent
4744774a7a am 3efbc555: Merge "Fix more audio effects auto tests" into gingerbread
Merge commit '3efbc55545673f3988cb1b2934b903d78f8873cd' into gingerbread-plus-aosp

* commit '3efbc55545673f3988cb1b2934b903d78f8873cd':
  Fix more audio effects auto tests
2010-09-22 15:59:28 -07:00
Jason Sams
95ee96282f Merge "Better debugging for scripts." 2010-09-22 15:59:06 -07:00
Eric Laurent
14beea487c Request permission for global audio effects.
Applications creating an audio effect on the output mix must
have the MODIFY_AUDIO_SETTINGS permission.

Change-Id: I57d88533f91ad0d33680107d79abcec28f7263b5
2010-09-22 15:58:38 -07:00