Commit Graph

24510 Commits

Author SHA1 Message Date
Ashish Sharma
47925232ec Merge "Setup idletimer for network interface." 2012-08-06 16:22:04 -07:00
Scott Main
819ca9768b am 09ec6aba: am 1398102c: am bd24f5cc: am 53b0fda5: misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about
* commit '09ec6aba00d15bc19a92303d0ed181d0eef4bfc6':
  misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc  code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
2012-08-06 16:01:51 -07:00
Scott Main
1398102c35 am bd24f5cc: am 53b0fda5: misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
* commit 'bd24f5cca5e51ba0e819f943b981cf2e9f64ec46':
  misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc  code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
2012-08-06 15:57:53 -07:00
Scott Main
bd24f5cca5 am 53b0fda5: misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
* commit '53b0fda5fd7c532fc1d93abd5f8a85276821cc6d':
  misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc  code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
2012-08-06 15:48:08 -07:00
Scott Main
53b0fda5fd misc doc bugs.
Fix sdk samples path
Fix method signature in fragment doc code snippet
Fix typo in a11y javadoc  code snippet
Fix markup error in brands page
Fix markup error on content providers doc
Fix typo on about>start page

Change-Id: Ie2a528dd4fbd19e5cb1c0844f6fc6272669c8ab9
2012-08-06 15:43:01 -07:00
Romain Guy
ec40b29ca0 am 3dfb4a1a: am 8c654e09: Merge "Add new debug tool to track hardware layers updates" into jb-mr1-dev
* commit '3dfb4a1a7977eb61acf28d64bdca9659e786c774':
  Add new debug tool to track hardware layers updates
2012-08-06 14:56:05 -07:00
Romain Guy
8c654e0934 Merge "Add new debug tool to track hardware layers updates" into jb-mr1-dev 2012-08-06 14:52:41 -07:00
Romain Guy
4ff0cf4b83 Add new debug tool to track hardware layers updates
You can setprop debug.hwui.show_layers_updates true to flash
hw layers in green when they update. This is also a setting
in the Dev. section of the settings app.

Change-Id: Ibe1d63a4f81567dc1d590c9b088d2e7505df8abf
2012-08-06 14:51:10 -07:00
Haoyu Bai
f71ca8a572 Setup idletimer for network interface.
Change-Id: I1251b60f4c3c31c75c2acd531495ca75bbb35ff5
2012-08-06 14:27:55 -07:00
Jeff Sharkey
3d403aacd4 am a51e444e: am 4e4306ab: Merge "Include network type that caused broadcast." into jb-mr1-dev
* commit 'a51e444ed44baa39564d066e78a0650bfd57ccea':
  Include network type that caused broadcast.
2012-08-06 13:44:53 -07:00
Jeff Sharkey
4e4306ab14 Merge "Include network type that caused broadcast." into jb-mr1-dev 2012-08-06 13:40:44 -07:00
Jeff Sharkey
75fbb4bdfd Include network type that caused broadcast.
Network type can be obtained through EXTRA_NETWORK_INFO, but offer
it as first-class extra since the returned NetworkInfo is deprecated.

Bug: 6936247
Change-Id: Ief59577afd2bd930f0f4c5650b413feef86bfbc3
2012-08-06 11:45:01 -07:00
Elliott Hughes
db9d339d4b Merge "Use ICU's CLDR data for "AM" and "PM" strings." 2012-08-06 09:40:32 -07:00
Jeff Sharkey
cbc1a8c40f am 5d945958: am 9c5c6595: Merge "Make LocalSocket Closeable." into jb-mr1-dev
* commit '5d94595889071d84b6d0b6517656f298a4153a09':
  Make LocalSocket Closeable.
2012-08-05 14:59:41 -07:00
Jeff Sharkey
9c5c659597 Merge "Make LocalSocket Closeable." into jb-mr1-dev 2012-08-05 14:55:28 -07:00
Jeff Sharkey
065b299df4 Make LocalSocket Closeable.
Enables usage of IoUtils.closeQuietly().

Change-Id: I91126297c1f235ae9da09f82d8f4f22db46558eb
2012-08-05 14:21:07 -07:00
Raph Levien
9d5bcfe69b am d7306c05: am b79413e9: Merge "Fix bug 6930875: ArrayIndexOutOfBoundsException on Battery details" into jb-mr1-dev
* commit 'd7306c05b28438f78478049d7c44d96e278eced4':
  Fix bug 6930875: ArrayIndexOutOfBoundsException on Battery details
2012-08-03 18:05:41 -07:00
Raph Levien
b79413e92d Merge "Fix bug 6930875: ArrayIndexOutOfBoundsException on Battery details" into jb-mr1-dev 2012-08-03 18:00:53 -07:00
Dianne Hackborn
c5f61b7325 am e1fdc79b: am 2e5746a7: Merge "We can now (kind-of) change screen density on the fly." into jb-mr1-dev
* commit 'e1fdc79ba2ab32bb084b193d187df1fa8b769e86':
  We can now (kind-of) change screen density on the fly.
2012-08-03 17:50:57 -07:00
Dianne Hackborn
2e5746a7a8 Merge "We can now (kind-of) change screen density on the fly." into jb-mr1-dev 2012-08-03 17:45:52 -07:00
Dianne Hackborn
dde331cebd We can now (kind-of) change screen density on the fly.
Preloaded drawables now have a density associated with them, so we
can load the correct drawable if we are using a different density.

Window manager now formally keeps track of the density for each
screen, allowing it to be overridden like you can already do with
size, and relies on this density to drive itself internally and
the configurations it reports.

There are a new set of Bitmap constructors where you provide a
DisplayMetrics so they can be constructed with the correct density.
(This will be for when you can have different windows in the same
app running at different densities.)

ActivityThread now watches for density changes, and pushes them
to the DENSITY_DEVICE and Bitmap global density values for that
process.

A new am command allows you to change the density.
2012-08-03 17:27:29 -07:00
Raph Levien
4c7a4a7767 Fix bug 6930875: ArrayIndexOutOfBoundsException on Battery details
The wrong constant was used to count the number of user activity types.
The number of types changed recently, so before then nothing bad
happened. Now we get an AIOOB.

This is the change to NUM_USER_ACTIVITY_TYPES:

Change-Id: I05045180129b30fa09fe5f5e1e3b0ac25fee23b4
https://googleplex-android-review.googlesource.com/#/c/211982/
2012-08-03 14:37:15 -07:00
Martijn Coenen
6ea6fa0fd3 am 64f949e3: am 1094b7d7: Merge "Bluetooth: fix enableNoAutoConnect() call." into jb-mr1-dev
* commit '64f949e309b70508b2a2b86fd9c891f93263e5c7':
  Bluetooth: fix enableNoAutoConnect() call.
2012-08-03 12:17:08 -07:00
Martijn Coenen
1094b7d769 Merge "Bluetooth: fix enableNoAutoConnect() call." into jb-mr1-dev 2012-08-03 12:12:11 -07:00
John Spurlock
7a868afac1 am 50c242fa: am 3185b376: Merge "Re-enable dreams: frameworks/base" into jb-mr1-dev
* commit '50c242fa034f8b8f24126084dd8fd14b5ae30536':
  Re-enable dreams: frameworks/base
2012-08-03 08:42:37 -07:00
John Spurlock
8d8785c14f am 93e4e5e9: am 72c30e2c: Merge "Fix typos in android.widget package docs." into jb-mr1-dev
* commit '93e4e5e9ba98a3579d8e8874dc691ca95e20d4b3':
  Fix typos in android.widget package docs.
2012-08-03 08:38:38 -07:00
John Spurlock
3185b376b0 Merge "Re-enable dreams: frameworks/base" into jb-mr1-dev 2012-08-03 08:36:41 -07:00
Martijn Coenen
10d7e8afb2 Bluetooth: fix enableNoAutoConnect() call.
For now, just do a regular connect.

Change-Id: Ibc43098d45c82177298cb17d72a32c7904924021
2012-08-03 08:36:02 -07:00
John Spurlock
72c30e2cec Merge "Fix typos in android.widget package docs." into jb-mr1-dev 2012-08-03 08:34:43 -07:00
Craig Mautner
b068163406 am af59e0e3: am 7de53949: Merge "Add features to DisplayManager." into jb-mr1-dev
* commit 'af59e0e30cac2209654cc9e16deb3cd32279a3d4':
  Add features to DisplayManager.
2012-08-03 08:30:23 -07:00
Craig Mautner
7de53949bc Merge "Add features to DisplayManager." into jb-mr1-dev 2012-08-03 08:25:42 -07:00
John Spurlock
aca7a741cb Fix typos in android.widget package docs.
Fixed spelling errors and cleaned up markup.

Change-Id: I3573087d40bbeb3906a8361abb02de4cb4325a92
2012-08-03 09:14:32 -04:00
John Spurlock
bc632a28e4 Re-enable dreams: frameworks/base
Enable feature in config. Expose Dream in public api for unbundled apps.
Unhide package.  Add isDreaming() method to service.

Re-arrange the Dream api a bit.  (use onStart as hook for subclasses).
Coordinate properly with power manager.

Replace old dock mode (don't fire old intent).

Change-Id: I1318d20cc1613e5d862f2913f2fcdc9719302cf7
Bug: 6921930
2012-08-03 08:51:17 -04:00
Jeff Brown
4bc8e2a345 am 6da0299d: am fbe963f4: Merge "Remove unnecessary code." into jb-mr1-dev
* commit '6da0299d02a20b7cefa203f2036fb766247cc2e9':
  Remove unnecessary code.
2012-08-02 21:40:31 -07:00
Jeff Brown
fbe963f4ad Merge "Remove unnecessary code." into jb-mr1-dev 2012-08-02 21:36:33 -07:00
Jeff Brown
5098fd8a0e Remove unnecessary code.
Bug: 6926595
Change-Id: Ice3138675c024e9efe9c7922e1e0a05f19cdde54
2012-08-02 21:34:46 -07:00
Dianne Hackborn
dcf48becce am 87f83418: am 329465c6: Merge "Add APIs for interacting across users." into jb-mr1-dev
* commit '87f83418e823625069ccbd60d4799414eb434eca':
  Add APIs for interacting across users.
2012-08-02 19:19:29 -07:00
Dianne Hackborn
329465c6b2 Merge "Add APIs for interacting across users." into jb-mr1-dev 2012-08-02 19:14:39 -07:00
Dianne Hackborn
b4163a6e12 Add APIs for interacting across users.
- Expose the existing Context.sendBroadcast() as
  Context.sendBroadcastAsUser().
- Add new android:singleUser attribute for services.
- Add new INTERACT_ACROSS_USERS_FULL permission for full
  system-level access to cross-user interface (allows
  sendBroadcastAsUser() to send to any receiver).
- Add new INTERACT_ACROSS_USERS_FULL permission for
  more restricted cross-user interaction: this is required
  for android:singleUser, and allows you to use
  sendBroadcastAsUser() but only to send to your own
  receivers.

Change-Id: I0de88f6718e9505f4de72e3f45d29c0f503b76e9
2012-08-02 19:07:57 -07:00
Adam Powell
e1dcf88c60 am 0cc969a7: am 47892388: Make AutoCompleteTextView#setText(CharSequence, boolean) public
* commit '0cc969a7ab86f6e2700c907c8f595baf55d8df9b':
  Make AutoCompleteTextView#setText(CharSequence, boolean) public
2012-08-02 18:28:30 -07:00
Adam Powell
478923885d Make AutoCompleteTextView#setText(CharSequence, boolean) public
Bug 6807326

Public bug http://code.google.com/p/android/issues/detail?id=34690

Make this available for use by applications that wish to make
programmatic changes to the AutoCompleteTextView without filtering.

Change-Id: I889452d3b19b378258ad9247f3d254afee1e8408
2012-08-02 17:30:32 -07:00
George Mount
ed85b04ebd am 8502ab91: am daceb30b: Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev
* commit '8502ab91bdd8ed34eeebed2daac90dea7b3da0ea':
  Cancel handler for JS unload handler prevents hang.
2012-08-02 16:33:30 -07:00
George Mount
daceb30bf5 Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev 2012-08-02 16:28:03 -07:00
George Mount
df9cae4de3 Cancel handler for JS unload handler prevents hang.
Bug 6803309
 When the alert dialog raised by the JS unload handler was pressed
 outside the alert region, it was canceled and no response was
 sent back to WebViewCore. This captures the cancel event so that
 WebViewCore doesn't hang.

Change-Id: I0c125e759a252a803c2c77aa9533adef7fa82d3d
2012-08-02 15:14:39 -07:00
Craig Mautner
c3edff71bf am d844e4f2: am 2a642a45: Merge "Refactor DisplayManagerService to be functional." into jb-mr1-dev
* commit 'd844e4f285348ede6e4f40e71d727e2fe4866c3e':
  Refactor DisplayManagerService to be functional.
2012-08-02 15:10:46 -07:00
rich cannings
3cfe6d5cef am 8c968174: am 9866d60e: Merge "Pass URLs to package verifiers" into jb-mr1-dev
* commit '8c96817480863aff8554f95da4f2151b0e9ee5e9':
  Pass URLs to package verifiers
2012-08-02 15:10:40 -07:00
Adam Powell
446b54565a am 0f5a749c: am b1758cf8: Merge "Make MediaRouteButton focusable by default" into jb-mr1-dev
* commit '0f5a749c60d489683112fe6cf5220d1a576582ca':
  Make MediaRouteButton focusable by default
2012-08-02 15:10:32 -07:00
George Mount
12b7b7fea8 am be38cccd: am ed9960ff: Merge "Don\'t restart input in the middle of a batch." into jb-mr1-dev
* commit 'be38cccd91e12576ed994719b6b83371c5749bb9':
  Don't restart input in the middle of a batch.
2012-08-02 15:10:28 -07:00
Craig Mautner
7f24ce696a am ccafb1ad: am 437a0fbd: Merge "Introduce multiple displays with DisplayContent." into jb-mr1-dev
* commit 'ccafb1ad5d60d70baa7f4fbf155e906261e42953':
  Introduce multiple displays with DisplayContent.
2012-08-02 15:08:51 -07:00
Craig Mautner
9de4936c99 Add features to DisplayManager.
Added Surface.setDisplayId().
Added callbacks to DisplayManagerService.

Change-Id: Idd3f85f8ca1f1208962f1196efd6a3ab51c8c259
2012-08-02 14:30:30 -07:00