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

427 Commits

Author SHA1 Message Date
Joe Onorato
43a17654cf Remove the deprecated things from Config.java. These haven't been working since before 1.0. 
Change-Id: Ic2e8fa68797ea9d486f4117f3d82c98233cdab1e
 2011-04-07 19:23:05 -07:00
Brian Carlstrom
08065b9f09 Tracking merge of dalvik-dev to master 
git cherry-pick --no-commit  a80febd83c8bf0b6717da2a7136179bdc906a5b7

git cherry-pick --no-commit  5e642b41cf44c5da7afdd95ab3d5e2bdbf7b31dd

git cherry-pick --no-commit  4886db14c9eee4b6fee69bd54c57c5af04709c4c

git cherry-pick --no-commit  560c685e448769904047507b9484ce8111967d7e

git cherry-pick --no-commit  63dde7a2fcfa53dc531558635b64cea613d3cdb4

git cherry-pick --no-commit  74e5cb91060a379d98dd3a333b5f231bfb4f502e

git cherry-pick --no-commit  1cc8c9708b555e2e338b7798d38887a2fefcfea6

git cherry-pick --no-commit  09625a21f5abe0c0db15757f58585d552d62c3d7

git cherry-pick --no-commit  fcb02dfe0f5a2bb7c07e6d6fc69f756a484b5458

git cherry-pick --no-commit  a68cb7fa3ab42854768b8145ff85231663770292

git cherry-pick --no-commit  716beb1c131dd2c6b805d4f681debaa20075010c

git cherry-pick --no-commit  8c29b1097a7afe3a77e27546a56e396f3620a4ec

git cherry-pick --no-commit  9c6a1a55d1c8086c1cc57464eea43725694ff70c

git cherry-pick --no-commit  b14f5ea5c57acdd009ba5b51f1bbe430f3d353b8

Change-Id: I8cc94175441b009e23549762d6baee1dbace4881
 2011-04-01 16:00:23 -07:00
Scott Main
4cead493fd am 02a7f8eb: am 5c35c059: am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1 
* commit '02a7f8eb3a5680a5b4c00b649b461bcb65c665e4':
  docs: update makefile to show javadocs diffs for api level 12
 2011-03-30 16:40:03 -07:00
Scott Main
5c35c05909 am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1 
* commit '5b68c655a1f56dce1ffd6f175e991dd542d415cf':
  docs: update makefile to show javadocs diffs for api level 12
 2011-03-30 12:12:15 -07:00
Scott Main
d3b62c961b docs: update makefile to show javadocs diffs for api level 12 
Change-Id: I1ac584db778ec14b18129785126159f692459158
 2011-03-29 16:25:16 -07:00
Brian Carlstrom
a9602db3d5 Tracking SamplingProfiler change in libcore 
Change-Id: Ic45a1570c01340a5406468a9d0f2a5357175fd80
 2011-03-24 17:06:41 -07:00
Nick Pelly
a64e2ad4da resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp 
Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42
 2011-03-14 10:28:11 -07:00
Nick Pelly
38d0d5628d am 367f41f8: Implement new NFC-EE API\'s as shared library (frameworks/base). 
* commit '367f41f8f61126c2ab34a34cc676756a9fc23ac2':
  Implement new NFC-EE API's as shared library (frameworks/base).
 2011-03-10 16:32:28 -08:00
Nick Pelly
367f41f8f6 Implement new NFC-EE API's as shared library (frameworks/base). 
Change-Id: I45c4eaf59ec78167fc236fdd59676465a5e1bcb7
 2011-03-10 16:03:46 -08:00
Mike Lockwood
7866be2b76 am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread 
* commit '40bbf9295d5245d3917629ce15f7b37670aef1ac':
  DO NOT MERGE: Backport USB accessory support to gingerbread
 2011-03-02 15:16:32 -08:00
Mike Lockwood
40bbf9295d DO NOT MERGE: Backport USB accessory support to gingerbread 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-01 23:09:12 -08:00
Mike Lockwood
c4308f01c9 Move USB framework support from android.hardware to android.hardware.usb package 
Change-Id: I00fd4f0caaa4aebe48f71c576bb211b5f38bf88d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-01 08:07:20 -08:00
Robert Ly
44b362c340 fixing resource browser for renderscript samples because the samples moved 
Change-Id: Ic63399f8f6ff0b33461a8e6c8ce1ce398bd8085f
 2011-02-28 15:53:15 -08:00
Xavier Ducrohet
7719436342 am b732b7b5: am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt." 
* commit 'b732b7b5e8192501360edc15fb8c6399d11fb97d':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
 2011-02-28 10:15:48 -08:00
Xavier Ducrohet
b732b7b5e8 am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt." 
* commit 'ce57a7f35344e76689d30f45964d1e37b78280cb':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
 2011-02-28 10:10:38 -08:00
Xavier Ducrohet
6504490cde am dff6b8e7: Merge "Add --non-constant-id to aapt." 
* commit 'dff6b8e71dda9f5d841fa26408714aec2aef1505':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
 2011-02-28 09:16:38 -08:00
Robert Ly
7a2222b260 am d2acfd6d: am a58f58da: Merge "Doc change: fixing renderscript samples" into honeycomb 
* commit 'd2acfd6d04545562fcacd266e175461f26b25da9':
  Doc change: fixing renderscript samples
 2011-02-17 20:23:49 -08:00
Robert Ly
6518f486a5 Doc change: fixing renderscript samples 
Change-Id: Ie5d17df121ec4bc5fd46448c1670d306322b92d8
 2011-02-17 18:44:31 -08:00
noda
7640caaf91 WAPPushManager, WAP Push over SMS message handler 
The WAPPushManager is a new, optional service for handling WAP Push
over SMS messages.  This service allows a carrier to designate a high
priority handler for specific WAP Push over SMS messages without
affecting other WAP Push over SMS, binary SMS, or SMS text messages.
It is also optional, so that it can be configured out of the target
image resulting in no change in the WAP Push over SMS handling
behavior compared to the current AOSP.

- This patch contains the WAPPushManager itself, the associated test
  code, and the modifications to telephony to use the WAPPushManager.

Change-Id: I4f7fb5b68fc666da9bdeeea525e8797ae317e4b5
 2011-02-18 00:31:24 +09:00
Scott Main
d3b6abc466 am 2b0c6fdf: am 97ef3b41: Merge "docs: revise a couple sample app names to match side nav" into honeycomb 
* commit '2b0c6fdfff0faf17163d126ac21c1651e4053968':
  docs: revise a couple sample app names to match side nav
 2011-02-15 11:38:50 -08:00
Scott Main
d873e660c5 docs: revise a couple sample app names to match side nav 
Change-Id: Ia45e78fe005c80934d70b585558cb4c6c0f52f30
 2011-02-15 10:58:34 -08:00
Adam Cohen
b9d3e5ec93 am c7f15f5c: am 5a1b6357: Merge "Adding StackWidget sample code" into honeycomb 
* commit 'c7f15f5cbb68e138e739f6e6d7e1605c48cad2a4':
  Adding StackWidget sample code
 2011-02-11 15:29:43 -08:00
Winson Chung
2fc779eaeb am 40683904: am 5f3cd3ea: Merge "Associated changes for \'Adding sample for collection widgets backed by content providers.\'" into honeycomb 
* commit '4068390434c366b814dc0885ae5ef5fc0cf50eff':
  Associated changes for 'Adding sample for collection widgets backed by content providers.'
 2011-02-11 15:29:35 -08:00
Adam Cohen
5a1b63572b Merge "Adding StackWidget sample code" into honeycomb 2011-02-11 15:19:38 -08:00
Winson Chung
06d2fa705b Associated changes for 'Adding sample for collection widgets backed by content providers.' 
Change-Id: Ic872675f4645497dd1478b6c7e3074b029ea66ad
 2011-02-11 11:27:23 -08:00
Adam Cohen
fca67c5525 Adding StackWidget sample code 
Change-Id: I4c469f25147f733a3a09cdea0db407cd4e9f62ca
 2011-02-10 19:12:41 -08:00
Roman Nurik
5d82abe586 am b8d74fd9: am 8635908d: Merge "Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery" into honeycomb 
* commit 'b8d74fd962e7a8595e5aeadb78b5e7eacea52e8a':
  Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery
 2011-02-07 17:27:58 -08:00
Roman Nurik
8635908da1 Merge "Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery" into honeycomb 2011-02-07 17:22:43 -08:00
Scott Main
5e2b123e48 am 236e9db9: am 62e97010: enable javadoc filtering for api level 11 and disable preview doc mode 
* commit '236e9db9f31f6b93f6f21cd3b09df7c19dde16dd':
  enable javadoc filtering for api level 11 and disable preview doc mode
 2011-02-07 16:41:21 -08:00
Scott Main
62e9701099 enable javadoc filtering for api level 11 and disable preview doc mode 
Change-Id: I12e5f295145ef037beda0e1a3ae0358cf5a2b590
 2011-02-07 16:35:46 -08:00
Roman Nurik
a35f65692d Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery 
Change-Id: I0a09517935dd330d0069bfb3e6382cdcbef8e99c
 2011-02-07 12:14:31 -08:00
Jean-Baptiste Queru
ef1cf4b416 Merge ba3dd323 from gingerbread 
Change-Id: I615bf5177abbc680292e0116491da58835c7396f
 2011-01-29 10:11:06 -08:00
Scott Main
66f3ca1c05 am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit '796f1af04567dab098f638c9166caebc2818efe4':
  enable preview mode for docs and add api level 10 flag for api level diffs
 2011-01-26 19:13:54 -08:00
Scott Main
2518895c50 resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp 
Change-Id: Ib40af8301e19b70c86161fc0a6cc061b118863ab
 2011-01-26 18:47:13 -08:00
Scott Main
ba3dd32357 enable preview mode for docs and add api level 10 flag for api level diffs 
Change-Id: Ief2adca0f7f5c37d9381bd69d39a27aa11ec85dc
 2011-01-26 18:29:50 -08:00
Mike Lockwood
e7d511e148 New APIs for USB host support: 
UsbManager:
- is now a service retrievable via Context.getSystemService(Context.USB_SERVICE).
- provides support for returning a list all connected USB devices
- broadcasts ACTION_USB_DEVICE_ATTACHED and USB_DEVICE_DETACHED when devices
  are added and removed from the USB host bus

UsbDevice:
- represents an attached USB device.

UsbInterface:
- represents an interface on a USB device
- devices may have multiple interfaces if they provide multiple
   sets of functionality (for example, android phones typically have interfaces
   for both USB mass storage and adb)

UsbEndpoint:
- represents an endpoint on a USB interface
- endpoints are used for sending or receiving data
  (only in one or the other direction)

UsbRequest:
- encapsulates a send or receive request to be sent over an endpoint

Change-Id: Ieef3e434c62760770ea839070cf5eba1a705967a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-22 15:56:09 -08:00
Robert Ly
3f9b6445cb Doc change: adding missing samples 
Change-Id: Id5f63a02b80f88b5cb0c4db18322554944b944c9
 2011-01-19 19:57:37 -08:00
Alexander Lucas
d84725401d Added Honeycomb-Gallery to docs. 
Change-Id: I3879ee553f761113b30f8ad82c0a226d0823dd2c
 2011-01-19 18:31:44 -08:00
Winson Chung
81f39eb6e7 Refactoring app widgets to address security/performance issues. 
- Moving the service binding to AppWidgetService to prevent arbitrary apps from binding to widget services
- Requiring RemoteViewsServices to require android.permission.BIND_REMOTEVIEWS permission

Change-Id: Id135bafba998299eb278067712b8a5d8487cfd04
 2011-01-18 22:57:09 -08:00
Scott Main
07226c29f3 set sdk version to "Android 3.0" and api level to "Honeycomb" 
Change-Id: I89a7149b32643d7e9c79bf2030b061bbff3bd8c4
 2011-01-17 16:53:10 -08:00
Brian Carlstrom
cf9a013774 Import libcore_to_document definition from libcore/Docs.mk 
Change-Id: I5f4ac355c6dadefce5762e0096dcc7379e5bf31d
 2011-01-05 17:52:36 -08:00
Nick Pelly
089c3c7c0b resolved conflicts for merge of 28e8c66d to master 
Change-Id: I9746fd7478d3954b491179ffbd241f481cc2fb6c
 2010-12-06 11:50:47 -08:00
Nick Pelly
16ec9c5bb5 Merge branch gingerbread-nfc into gingerbread. 
Change-Id: I37d657a16061fddfbb0993463f24d6d3945cddd1
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-12-05 14:45:29 -08:00
Dirk Dougherty
92f4d9db83 am f4c2eaf2: am 47ccfcb0: Doc change: add AccelerometerPlay to the generated samples. 
* commit 'f4c2eaf2628582abf6eb0cc335bc864d2c64f440':
  Doc change: add AccelerometerPlay to the generated samples.
 2010-11-29 18:19:38 -08:00
Dirk Dougherty
47ccfcb015 Doc change: add AccelerometerPlay to the generated samples. 
Change-Id: I95764f216455bbceef7fa95a1a819b906e4e7e7c
 2010-11-29 18:12:36 -08:00
Dirk Dougherty
e7d9ab0dcf am cb1af77f: am b1150edc: Remove HeavyWeight sample from generated html samples. 
* commit 'cb1af77f1fefddb78b4540db7d4a1df673caffe2':
  Remove HeavyWeight sample from generated html samples.
 2010-11-29 17:15:47 -08:00
Dirk Dougherty
b1150edc22 Remove HeavyWeight sample from generated html samples. 
Change-Id: Idafb3d225d8e6a694faa2d8679c4dad6198df466
 2010-11-29 17:03:15 -08:00
Scott Main
b402f11a6d docs: add preview sdk docs to provide an api overview and install steps, 
enable the 'preview' flag for the docs build
revise sdk side nav for preview

Change-Id: Ifc26cfb1f18e394e96853fd42f0e194d5f8552f3
 2010-11-29 14:28:13 -08:00
Trevor Johns
a4db01151e am d3f19b86: am 210e9c4a: Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread 
* commit 'd3f19b86b0f454b1bd2600d51d241b05fd5d9331':
  Revert "Disabling AccessibilityService sample from build system."
 2010-11-24 16:27:34 -08:00
Trevor Johns
e66593b47c Revert "Disabling AccessibilityService sample from build system." 
This re-enables the AccessibilityService sample.

This reverts commit ca9d51b15074163521b140dce431cc3a10cb56fe.
 2010-11-24 16:03:21 -08:00