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

4701 Commits

Author SHA1 Message Date
Evan Millar
97c5a99344 am 326eaa33: Merge change I0fae86b8 into eclair 
Merge commit '326eaa334da566c3dcae29b17f255c63c8bb919a' into eclair-mr2

* commit '326eaa334da566c3dcae29b17f255c63c8bb919a':
  Make QuickContact styles public.
 2009-11-03 11:04:53 -08:00
Android (Google) Code Review
326eaa334d Merge change I0fae86b8 into eclair 
* changes:
  Make QuickContact styles public.
 2009-11-03 13:58:03 -05:00
Evan Millar
0fae86b80f Make QuickContact styles public. 
This should have been done for the 2.0 sdk, but fell through the cracks.
Fortunately this will make it into the 2.1 sdk.
 2009-11-03 09:49:43 -08:00
Mike Lockwood
0ce9c58fe3 am d2c68794: Merge changes I116424c4,Ibd0ef67f into eclair 
Merge commit 'd2c68794364120d0531667e797f078416ebef3f5' into eclair-mr2

* commit 'd2c68794364120d0531667e797f078416ebef3f5':
  Remove obsolete hardware auto-brightness support.
  Add documentation for proximity and light sensors.
 2009-11-03 09:37:50 -08:00
Mike Lockwood
f90ffcc639 Remove obsolete hardware auto-brightness support. 
Change-Id: Ibd0ef67f887254f26ce19faf0627f8b246ec0a18
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-11-03 11:41:27 -05:00
Mike Lockwood
4115c51875 Add documentation for proximity and light sensors. 
Change-Id: I116424c468d1d3afe89e0e17be773ee8b80ada92
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-11-03 10:36:24 -05:00
Daisuke Miyakawa
6cb76ac37f Rename the term "attribute"/"attr" to "parameter"/param". 
We had been using "parameter"/"param" by mistake, while both vCard
formats uses theterm "attribute"/"attr". This is confusing.

Internal issue number: 2233884
 2009-11-03 17:30:19 +09:00
Dirk Dougherty
21cbd52b7a am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk 
Merge commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4' into eclair-mr2

* commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4':
  doc change: misc doc fixes.
 2009-11-02 18:24:29 -08:00
Dirk Dougherty
483d29c0dd am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk 
Merge commit '671c61d66f8d556f206d167d0f3c3bbe037ed86b' into eclair

* commit '671c61d66f8d556f206d167d0f3c3bbe037ed86b':
  doc change: misc doc fixes.
 2009-11-02 18:17:26 -08:00
Android (Google) Code Review
a229cedadd Merge change I73d6c0f8 into eclair 
* changes:
  Add ability to disable sending Photos using Vcard. Do Not Merge
 2009-11-02 18:46:04 -05:00
Dianne Hackborn
d62b063fd4 am b6a6791f: Merge change I60413727 into eclair 
Merge commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f' into eclair-mr2

* commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f':
  Fix issue #2226370: Resource versions match with equality
 2009-11-02 10:52:22 -08:00
Android (Google) Code Review
b6a6791f38 Merge change I60413727 into eclair 
* changes:
  Fix issue #2226370: Resource versions match with equality
 2009-11-02 13:43:52 -05:00
Daisuke Miyakawa
3f16be2061 Enable vCard tests connect both importer/exporter tests. 
Fix a bug in ContactStruct.

Internal issue number: 2195990
 2009-11-02 15:25:23 +09:00
Dianne Hackborn
553399518f Fix issue #2226370: Resource versions match with equality 
Also fixed turned-around increment of version number for resources. :(

Change-Id: I604137272da984bcd69cee4f174e6b7f2c786e46
 2009-11-01 21:16:59 -08:00
Dirk Dougherty
6b13bc043e doc change: misc doc fixes. 
Bug:2160782
Change-Id: Iaf5d2cc2e3c657700469e8b7394a95bc03fc26f3
 2009-10-30 19:44:22 -07:00
Mike LeBeau
b5868caa8c am d3e4dab9: Merge change I7df84618 into eclair 
Merge commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a' into eclair-mr2

* commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a':
  Add a privateImeOption to represent that the IME should not show
 2009-10-30 18:22:00 -07:00
Android (Google) Code Review
d3e4dab962 Merge change I7df84618 into eclair 
* changes:
  Add a privateImeOption to represent that the IME should not show the voice input microphone, if it otherwise would, whenever the search dialog is planning on showing a voice search button (as specified by the current searchable).
 2009-10-30 21:12:00 -04:00
Jack Wang
227ba2072d am e8228afb: Merge change I92cdc5ed into eclair 
Merge commit 'e8228afb2bd005ae25ce58719f9d678389b26a16' into eclair-mr2

* commit 'e8228afb2bd005ae25ce58719f9d678389b26a16':
  PerformanceCollector: Collect & report perf measurements in key/value form
 2009-10-30 17:07:56 -07:00
Android (Google) Code Review
e8228afb2b Merge change I92cdc5ed into eclair 
* changes:
  PerformanceCollector: Collect & report perf measurements in key/value form
 2009-10-30 20:02:13 -04:00
Mike LeBeau
7df846186d Add a privateImeOption to represent that the IME should not show 
the voice input microphone, if it otherwise would, whenever the
search dialog is planning on showing a voice search button (as
specified by the current searchable).

The IME will respect this shortly.

http://b/2228562
 2009-10-30 16:11:40 -07:00
Jaikumar Ganesh
73d6c0f81f Add ability to disable sending Photos using Vcard. Do Not Merge 
This to fix PBAP support for some car kits which are unable
to handle contacts with photos.
Original Change by: Yue Lixin

Bug: 2183320
Dr No: Eastham
 2009-10-30 15:28:27 -07:00
Mike Reed
58d30b6907 am 1864d01f: Merge change Iae849da2 into eclair 
Merge commit '1864d01f2be0e82da7d8844fa91bee8880282041' into eclair-mr2

* commit '1864d01f2be0e82da7d8844fa91bee8880282041':
  add table maskfilter
 2009-10-30 14:13:44 -07:00
Android (Google) Code Review
1864d01f2b Merge change Iae849da2 into eclair 
* changes:
  add table maskfilter
 2009-10-30 17:03:18 -04:00
Jaikumar Ganesh
bf2efbc064 am 3cf254d2: Merge change I4b3db907 into eclair 
Merge commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f' into eclair-mr2

* commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f':
  Revert the channge where channels were not selected randomly.
 2009-10-30 10:31:25 -07:00
Android (Google) Code Review
3cf254d2ba Merge change I4b3db907 into eclair 
* changes:
  Revert the channge where channels were not selected randomly.
 2009-10-30 13:23:43 -04:00
Jaikumar Ganesh
4b3db907f0 Revert the channge where channels were not selected randomly. 
The Bluez SDP bug has been fixed.
Reverting parts of the commit: 16fb88a673c41b93c5d57ccb28c2697e7d87701a

Bug: 2173752
Dr No: Eastham
 2009-10-30 09:37:25 -07:00
Mike Reed
0e1e623011 add table maskfilter 
hidden for now, since it need only be seen by Launcher2

http://b/issue?id=2210685
 2009-10-30 08:11:58 -04:00
Jeff Sharkey
5546e9e672 am 824838d7: Avoid NPE when callers send null selection args. 
Merge commit '824838d74eb0316f6987a1d98d2d9e9fa8d4e15b' into eclair-mr2

* commit '824838d74eb0316f6987a1d98d2d9e9fa8d4e15b':
  Avoid NPE when callers send null selection args.
 2009-10-29 19:35:32 -07:00
Fred Quintana
6b9954790e am fae288c7: Merge change I9efe265f into eclair 
Merge commit 'fae288c7987f96df05e91ed154e934de267098be' into eclair-mr2

* commit 'fae288c7987f96df05e91ed154e934de267098be':
  unhide AccountManagerResponse
 2009-10-29 19:33:09 -07:00
Ed Heyl
7fb4e4aaf2 am 154d61fc: Merge change Id6f158b3 into eclair 
Merge commit '154d61fc99964bc5ad13384027f063e77b36f9eb' into eclair-mr2

* commit '154d61fc99964bc5ad13384027f063e77b36f9eb':
  Removed javadoc link to hidden class (temporary fix for build)
 2009-10-29 19:32:23 -07:00
San Mehat
67ef832cdb am 957e5867: process: Disable debugging 
Merge commit '957e58670baad8c5995f1368e3b5280f0dbd891f' into eclair-mr2

* commit '957e58670baad8c5995f1368e3b5280f0dbd891f':
  process: Disable debugging
 2009-10-29 19:32:06 -07:00
Costin Manolache
492dbe1752 am 4388b988: Merge change Idc4c7714 into eclair 
Merge commit '4388b98845e6a28c689e500cd6ed1e9bb29a2c12' into eclair-mr2

* commit '4388b98845e6a28c689e500cd6ed1e9bb29a2c12':
  Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
 2009-10-29 19:30:43 -07:00
Jeff Hamilton
cd79e5e173 am b5c05516: Merge change I3b7d5cbe into eclair 
Merge commit 'b5c05516ba2c341655d54f17bdd17a5ab2d173df' into eclair-mr2

* commit 'b5c05516ba2c341655d54f17bdd17a5ab2d173df':
  Copy the selection args when creating a CPO since callers often reuse the passed in array.
 2009-10-29 19:29:16 -07:00
San Mehat
574b99bfcd am 8e312e81: Merge change Ia5109a87 into eclair 
Merge commit '8e312e8160ef0cae569b6127591ee72c70bfda41' into eclair-mr2

* commit '8e312e8160ef0cae569b6127591ee72c70bfda41':
  process: Add debug code to log process group transitions
 2009-10-29 19:28:58 -07:00
Jack Palevich
5be6eedf3b am b575e4df: Merge change I4a943184 into eclair 
Merge commit 'b575e4dffe123dc7c8c579dc9cf6130eae6a4abe' into eclair-mr2

* commit 'b575e4dffe123dc7c8c579dc9cf6130eae6a4abe':
  Avoid trying to throw multiple exceptions at once.
 2009-10-29 19:28:38 -07:00
Suchi Amalapurapu
a7bbedca97 am 22dad592: Merge change I6cae32c7 into eclair 
Merge commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e' into eclair-mr2

* commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e':
  When upgrading packages with shared user ids make sure we are eliminating
 2009-10-29 19:26:46 -07:00
Marco Nelissen
c81e43c8ee resolved conflicts for merge 31957f1b to eclair-mr2 2009-10-29 18:04:17 -07:00
Jeff Sharkey
824838d74e Avoid NPE when callers send null selection args. 
Fixes http://b/2226007
 2009-10-29 17:38:27 -07:00
Android (Google) Code Review
fae288c798 Merge change I9efe265f into eclair 
* changes:
  unhide AccountManagerResponse
 2009-10-29 17:47:52 -04:00
Android (Google) Code Review
154d61fc99 Merge change Id6f158b3 into eclair 
* changes:
  Removed javadoc link to hidden class (temporary fix for build)
 2009-10-29 17:08:34 -04:00
Android (Google) Code Review
758b5b25f0 Merge change I35155c1d into eclair-mr2 
* changes:
  divide mRestoredScale before use
 2009-10-29 16:59:39 -04:00
San Mehat
957e58670b process: Disable debugging 
Signed-off-by: San Mehat <san@google.com>
 2009-10-29 13:59:32 -07:00
Fred Quintana
0fca5b45ff am 5e5eb393: Merge change Id572ffc7 into eclair 
Merge commit '5e5eb393729630800079206498f283de8f02f3a7' into eclair-mr2

* commit '5e5eb393729630800079206498f283de8f02f3a7':
  don't throw an exception when we can't find a pending sync operation in the database
 2009-10-29 13:44:08 -07:00
Android (Google) Code Review
4388b98845 Merge change Idc4c7714 into eclair 
* changes:
  Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
 2009-10-29 16:18:35 -04:00
Costin Manolache
88a211b148 Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes. 2009-10-29 13:14:47 -07:00
Cary Clark
35155c1d8b divide mRestoredScale before use 
Also add debugging to help find incorrect width bug (see bug)

fixes http://b/issue?id=2218767
 2009-10-29 15:34:00 -04:00
Android (Google) Code Review
b5c05516ba Merge change I3b7d5cbe into eclair 
* changes:
  Copy the selection args when creating a CPO since callers often reuse the passed in array.
 2009-10-29 15:11:40 -04:00
Android (Google) Code Review
8e312e8160 Merge change Ia5109a87 into eclair 
* changes:
  process: Add debug code to log process group transitions
 2009-10-29 15:02:53 -04:00
San Mehat
a5109a878e process: Add debug code to log process group transitions 
Signed-off-by: San Mehat <san@google.com>
 2009-10-29 11:50:43 -07:00
Ed Heyl
d6f158b368 Removed javadoc link to hidden class (temporary fix for build) 2009-10-29 10:18:45 -07:00