Commit Graph

4883 Commits

Author SHA1 Message Date
Jean-Michel Trivi
1480aa0397 am b53eaac6: Merge change 25155 into eclair
Merge commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8' into eclair-plus-aosp

* commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8':
  Fix bug 2115258 where the AudioManager javadoc doesn't warn against
2009-09-16 09:10:31 -07:00
Bjorn Bringert
56482d3bba am 57384101: Merge change 25270 into eclair
Merge commit '57384101b9757b1c67570fae60cdb8f89c84bf32' into eclair-plus-aosp

* commit '57384101b9757b1c67570fae60cdb8f89c84bf32':
  Use Resources to load search icons with android.resource URIs
2009-09-16 09:10:25 -07:00
Android (Google) Code Review
b3ee69ae1e Merge change 25155 into eclair
* changes:
  Fix bug 2115258 where the AudioManager javadoc doesn't warn against misuse of some of the methods that should only be used to implement the Settings and Phone apps, and the audio service.
2009-09-16 12:07:37 -04:00
Android (Google) Code Review
f1bcac43d6 Merge change 25270 into eclair
* changes:
  Use Resources to load search icons with android.resource URIs
2009-09-16 12:03:52 -04:00
Chih-Chung Chang
d3331fbf72 am 46ad7961: Unhide cancelAutoFocus API in Camera.
Merge commit '46ad796186bdca8bac75607340aa0fac0c34a9d8' into eclair-plus-aosp

* commit '46ad796186bdca8bac75607340aa0fac0c34a9d8':
  Unhide cancelAutoFocus API in Camera.
2009-09-16 07:58:30 -07:00
Chih-Chung Chang
9fb9293b93 am ccd064d4: Merge change 25255 into eclair
Merge commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1' into eclair-plus-aosp

* commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1':
  Clean ExifInterface. Prepare to make it public.
2009-09-16 05:21:54 -07:00
Android (Google) Code Review
12dadf06b3 Merge change 25255 into eclair
* changes:
  Clean ExifInterface. Prepare to make it public.
2009-09-16 08:14:53 -04:00
Wu-cheng Li
98340edc60 am 7478ea68: Remove trailing spaces.
Merge commit '7478ea6848c0059e65a4089b4ec2ff4158520870' into eclair-plus-aosp

* commit '7478ea6848c0059e65a4089b4ec2ff4158520870':
  Remove trailing spaces.
2009-09-16 04:06:11 -07:00
Chung-yih Wang
bfc33f394d am 8e9ef0e7: Add the hide for the inner class definition.
Merge commit '8e9ef0e78970d0ca399bd3c9aaf9011f0e4aaebe' into eclair-plus-aosp

* commit '8e9ef0e78970d0ca399bd3c9aaf9011f0e4aaebe':
  Add the hide for the inner class definition.
2009-09-16 00:28:52 -07:00
Chung-yih Wang
4ed645655f am 4337476a: Fix the missing part for reading enterprise fields in wifi configuration
Merge commit '4337476a6669ce52549ce4a60f5e4d07f8e3033f' into eclair-plus-aosp

* commit '4337476a6669ce52549ce4a60f5e4d07f8e3033f':
  Fix the missing part for reading enterprise fields in wifi configuration
2009-09-15 23:45:11 -07:00
Jeff Sharkey
04bb77af2a am 85628188: Merge change 25244 into eclair
Merge commit '85628188e74c015060e7f315560e659e53294775' into eclair-plus-aosp

* commit '85628188e74c015060e7f315560e659e53294775':
  Flag indicating if Contacts source has any unsynced groups.
2009-09-15 23:21:45 -07:00
Android (Google) Code Review
99e7cd8fb9 Merge change 25244 into eclair
* changes:
  Flag indicating if Contacts source has any unsynced groups.
2009-09-16 02:16:05 -04:00
Dianne Hackborn
4d9581b360 am 7fc39b26: Merge change 25238 into eclair
Merge commit '7fc39b26fc4ec9df7d147ff34ebba90556cdb4da' into eclair-plus-aosp

* commit '7fc39b26fc4ec9df7d147ff34ebba90556cdb4da':
  Implement issue #1780928: Need support hiding nav keys.
2009-09-15 23:11:35 -07:00
Android (Google) Code Review
3a94132f77 Merge change 25238 into eclair
* changes:
  Implement issue #1780928: Need support hiding nav keys.
2009-09-16 02:04:45 -04:00
Dianne Hackborn
b5df6d801c Implement issue #1780928: Need support hiding nav keys.
This implements support for devices whose hardware can hide
their navigation keys.  It works much like the existing keyboardHidden
configuration, and for compatibility uses the same configuration
change bit.

Also add FLAG_TURN_ON_SCREEN for windows, which has the system
cause the screen to be turned on when the window is displayed.
Great fun when used with FLAG_SHOW_WHEN_LOCKED!

Change-Id: I0b867f19af85cfd8786a14cea194b34f7bdd9b7a
2009-09-15 22:50:40 -07:00
Jeff Sharkey
55c0408549 am 9352b9fb: Merge change 25232 into eclair
Merge commit '9352b9fb9e0b4023c3bba4349eb9e32dc258b80a' into eclair-plus-aosp

* commit '9352b9fb9e0b4023c3bba4349eb9e32dc258b80a':
  Fix NPE when provider returns null cursor.
2009-09-15 22:04:53 -07:00
Android (Google) Code Review
5d59c866af Merge change 25232 into eclair
* changes:
  Fix NPE when provider returns null cursor.
2009-09-16 00:58:06 -04:00
Yu Shan Emily Lau
2c3a5dd68b am 610e3595: modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java Fixed the meta data duration
Merge commit '610e3595d250f78c857126cd08ef2a82ee650415' into eclair-plus-aosp

* commit '610e3595d250f78c857126cd08ef2a82ee650415':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
2009-09-15 20:59:10 -07:00
Daisuke Miyakawa
a3271d1cb5 am 6cf05f1c: Merge change 25206 into eclair
Merge commit '6cf05f1c3d6f4585573c8663a62848a09f6a08ff' into eclair-plus-aosp

* commit '6cf05f1c3d6f4585573c8663a62848a09f6a08ff':
  Make vCard importer code use Account information if possible.
2009-09-15 19:35:25 -07:00
Mathias Agopian
be88151a80 am 1f1135a2: Merge change 25212 into eclair
Merge commit '1f1135a29e7dddae1d813f3d5a39eb57cef2db4a' into eclair-plus-aosp

* commit '1f1135a29e7dddae1d813f3d5a39eb57cef2db4a':
  revert to black video background, since we don't need the color-key anylonger
2009-09-15 19:35:19 -07:00
Mathias Agopian
d0d5a61917 am 7bf75f6d: Merge change 25207 into eclair
Merge commit '7bf75f6dc4b0b19df2b0365ba760da9dd8e1a4c3' into eclair-plus-aosp

* commit '7bf75f6dc4b0b19df2b0365ba760da9dd8e1a4c3':
  fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
2009-09-15 19:35:13 -07:00
Android (Google) Code Review
f2f2787391 Merge change 25206 into eclair
* changes:
  Make vCard importer code use Account information if possible.
2009-09-15 22:33:06 -04:00
Android (Google) Code Review
26b85360cc Merge change 25212 into eclair
* changes:
  revert to black video background, since we don't need the color-key anylonger
2009-09-15 22:32:37 -04:00
Mathias Agopian
b8cfc0f9e1 revert to black video background, since we don't need the color-key anylonger 2009-09-15 19:31:28 -07:00
Android (Google) Code Review
f86558451e Merge change 25207 into eclair
* changes:
  fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
2009-09-15 22:26:26 -04:00
Mathias Agopian
68a6afeb26 fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
Take 2. We needed to check that the usage flags are "good enough" as opposed to "the same".

This reverts commit 8f17a762fe9e9f31e4e86cb60ff2bfb6b10fdee6.
2009-09-15 19:21:31 -07:00
Karl Rosaen
4af01a8b39 am c6587dc8: Merge change 25178 into eclair
Merge commit 'c6587dc870d06e4d5022705d08464fc7abb1c5f8' into eclair-plus-aosp

* commit 'c6587dc870d06e4d5022705d08464fc7abb1c5f8':
  Add RotarySelector widget to android.internal for use by lock screen and incoming call screen.
2009-09-15 19:16:57 -07:00
Nicolas Catania
c9009dd035 am d9e28017: Merge change 25092 into eclair
Merge commit 'd9e28017f6e3da3a176d11fd0c722b1d7811d27b' into eclair-plus-aosp

* commit 'd9e28017f6e3da3a176d11fd0c722b1d7811d27b':
  New field in CallerInfo to cache if the call is an emergency one.
2009-09-15 19:16:51 -07:00
Android (Google) Code Review
1c90feaee1 Merge change 25178 into eclair
* changes:
  Add RotarySelector widget to android.internal for use by lock screen and incoming call screen.
2009-09-15 22:12:58 -04:00
Dianne Hackborn
3059711cda am 6ee7b04d: Merge change 25192 into eclair
Merge commit '6ee7b04d270824214fca0296d0386e0c3d733cdf' into eclair-plus-aosp

* commit '6ee7b04d270824214fca0296d0386e0c3d733cdf':
  Some improvements for wallpaper configuration.
2009-09-15 19:12:08 -07:00
Android (Google) Code Review
0b5b2f970b Merge change 25092 into eclair
* changes:
  New field in CallerInfo to cache if the call is an emergency one.
2009-09-15 22:11:57 -04:00
Android (Google) Code Review
54a17ad821 Merge change 25192 into eclair
* changes:
  Some improvements for wallpaper configuration.
2009-09-15 22:06:24 -04:00
Mathias Agopian
c9b1c7ebc8 am dd8f6186: Merge change 25201 into eclair
Merge commit 'dd8f6186775f69a8fef6213bcdc23be633d1ab6f' into eclair-plus-aosp

* commit 'dd8f6186775f69a8fef6213bcdc23be633d1ab6f':
  Revert "fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer"
2009-09-15 19:02:24 -07:00
Mathias Agopian
25e8e67fa8 am 49071af7: Merge change 25188 into eclair
Merge commit '49071af7bd19491f21f23a59621227ef48c11146' into eclair-plus-aosp

* commit '49071af7bd19491f21f23a59621227ef48c11146':
  make the window-shade use an opaque surface if possible
2009-09-15 19:02:17 -07:00
Android (Google) Code Review
70cc9e16be Merge change 25201 into eclair
* changes:
  Revert "fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer"
2009-09-15 21:57:44 -04:00
Mathias Agopian
3910f5467a Revert "fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer"
This reverts commit 486aa963b63e20b7910e1004cebb4f0afabbd80f.
2009-09-15 18:57:06 -07:00
Android (Google) Code Review
8395d598e2 Merge change 25188 into eclair
* changes:
  make the window-shade use an opaque surface if possible
2009-09-15 21:56:44 -04:00
Derek Sollenberger
24be1d4841 am 5862b673: Merge change 25187 into eclair
Merge commit '5862b673d412e596f3fa419c00bd0ba16bf6c094' into eclair-plus-aosp

* commit '5862b673d412e596f3fa419c00bd0ba16bf6c094':
  fixing documentation for PluginStub
2009-09-15 18:32:01 -07:00
Android (Google) Code Review
3a74bd6779 Merge change 25187 into eclair
* changes:
  fixing documentation for PluginStub
2009-09-15 21:23:42 -04:00
Jim Miller
d7583f7275 am 7c3e493d: Merge change 25177 into eclair
Merge commit '7c3e493d7b2db7f28d6fdb52d79c4d99ef1502b8' into eclair-plus-aosp

* commit '7c3e493d7b2db7f28d6fdb52d79c4d99ef1502b8':
  Fix for #2092883: Allow manual sync even when background data is disabled
2009-09-15 18:20:10 -07:00
Elliott Hughes
5acf88ea09 am d6b10fb8: Merge change 25168 into eclair
Merge commit 'd6b10fb86229ed0e904138ec4604066ea85059db' into eclair-plus-aosp

* commit 'd6b10fb86229ed0e904138ec4604066ea85059db':
  Preload Resources$DefaultTimeZones.
2009-09-15 18:20:04 -07:00
Android (Google) Code Review
014ada2162 Merge change 25177 into eclair
* changes:
  Fix for #2092883: Allow manual sync even when background data is disabled
2009-09-15 21:17:44 -04:00
Android (Google) Code Review
ecda253aed Merge change 25168 into eclair
* changes:
  Preload Resources$DefaultTimeZones.
2009-09-15 21:15:38 -04:00
Nick Pelly
1ce7d04155 am e74050a9: Merge change 25175 into eclair
Merge commit 'e74050a9ca248eb6a8d3d8fc2d7712b340afddcc' into eclair-plus-aosp

* commit 'e74050a9ca248eb6a8d3d8fc2d7712b340afddcc':
  Allow only System Service to send most Bluetooth intents.
2009-09-15 18:15:24 -07:00
Dirk Dougherty
cdc4328c36 am 5d55edc9: am 3dc0f94c: Misc. updates for 1.6 release notes and requirements docs.
Merge commit '5d55edc9401c3240570b4cdc46eda7c4f4eac841' into eclair-plus-aosp

* commit '5d55edc9401c3240570b4cdc46eda7c4f4eac841':
  Misc. updates for 1.6 release notes and requirements docs.
2009-09-15 18:12:44 -07:00
Android (Google) Code Review
a0f59bb4d5 Merge change 25175 into eclair
* changes:
  Allow only System Service to send most Bluetooth intents.
2009-09-15 21:08:37 -04:00
Dirk Dougherty
6594a02f27 am 3dc0f94c: Misc. updates for 1.6 release notes and requirements docs.
Merge commit '3dc0f94cd44df2f9310946b0a0a1c7f8c6d95af5' into eclair

* commit '3dc0f94cd44df2f9310946b0a0a1c7f8c6d95af5':
  Misc. updates for 1.6 release notes and requirements docs.
2009-09-15 18:05:49 -07:00
Mathias Agopian
34f34cfa28 am 5446ea77: Merge change 25176 into eclair
Merge commit '5446ea77bcd7cf3d234f7198d073c99f6519662f' into eclair-plus-aosp

* commit '5446ea77bcd7cf3d234f7198d073c99f6519662f':
  fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
2009-09-15 17:41:49 -07:00
Mike Reed
d4fe2679d5 am 4e54f330: update for new plugin api
Merge commit '4e54f3309ec9dac3cf69ffa73ec7c5378f19dffb' into eclair-plus-aosp

* commit '4e54f3309ec9dac3cf69ffa73ec7c5378f19dffb':
  update for new plugin api
2009-09-15 17:37:16 -07:00
Android (Google) Code Review
8fb8663669 Merge change 25176 into eclair
* changes:
  fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
2009-09-15 20:35:15 -04:00