ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
14,647 Commits 2 Branches 0 Tags 54 MiB
beca03b99c
Commit Graph

14647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
0c9d6432d5 Merge "docs: revise webview description and add info for targeting screen densities" into froyo 2010-05-17 17:59:37 -07:00
Dirk Dougherty
846ef80952 am 6750bb7f: Doc change: add link to source.android.com 
Merge commit '6750bb7f838b15ef25544d7aa66b17119fcd7227' into froyo-plus-aosp

* commit '6750bb7f838b15ef25544d7aa66b17119fcd7227':
  Doc change: add link to source.android.com
 2010-05-17 17:37:28 -07:00
Dirk Dougherty
1769eecb4a am 6bb6348f: Doc change: cherry pick from eclair ->docs: add dashboard for screens update platform dashboard 
Merge commit '6bb6348f2a542b05b9945f28566fb876cf6aee2e' into froyo-plus-aosp

* commit '6bb6348f2a542b05b9945f28566fb876cf6aee2e':
  Doc change: cherry pick from eclair ->docs: add dashboard for screens
 2010-05-17 17:04:48 -07:00
Mike Lockwood
a309fb7ae7 am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API. 
Merge commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f' into froyo-plus-aosp

* commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f':
  Resurrect flashlight support in obsolete IHardwareService Binder API.
 2010-05-17 14:56:53 -07:00
Kenny Root
b118f139f4 am cfa2de30: Import revised translations 
Merge commit 'cfa2de303e58b971e334363356d29601e61d11c8' into froyo-plus-aosp

* commit 'cfa2de303e58b971e334363356d29601e61d11c8':
  Import revised translations
 2010-05-17 11:37:35 -07:00
The Android Open Source Project
ba7718b979 merge from open-source master 
Change-Id: I139c349b80b2cecfbdc30bd697cba099740293d9
 2010-05-17 10:38:00 -07:00
Jean-Baptiste Queru
0e08624ad2 Merge "Updated RGB LED test cases" 2010-05-17 09:12:43 -07:00
The Android Open Source Project
5a64b6daec merge from open-source master 
Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
 2010-05-17 08:56:54 -07:00
Romain Guy
9100be5973 Merge "Fixing indeterminate progress bar animation state." 2010-05-15 12:34:05 -07:00
Chung-yih Wang
74368e0bb6 am 5f1beda1: Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo 
Merge commit '5f1beda18fc7709c2e61ace33607513770faf115' into froyo-plus-aosp

* commit '5f1beda18fc7709c2e61ace33607513770faf115':
  Make the SSID field of WifiConfiguration consistent with API description.
 2010-05-14 23:16:31 -07:00
Chung-yih Wang
41613ed3bf Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo 2010-05-14 23:15:04 -07:00
Dianne Hackborn
fdcc3559ac am aa77de13: Fix issue #2686193: Can\'t move apps to SD card 
Merge commit 'aa77de1348cbda3d5348b15734ab141cb9c7759c' into froyo-plus-aosp

* commit 'aa77de1348cbda3d5348b15734ab141cb9c7759c':
  Fix issue #2686193: Can't move apps to SD card
 2010-05-14 23:11:33 -07:00
Jeff Hamilton
e7dd3adaf9 Merge "Modified libdrm to support SuperH platform" 2010-05-14 19:36:40 -07:00
Dirk Dougherty
42e980e1a0 am d1e9d590: Doc change: add sizes/sums for sdk/ndk/adt packages. 
Merge commit 'd1e9d590941303c004459f3d798b26f1bf091535' into froyo-plus-aosp

* commit 'd1e9d590941303c004459f3d798b26f1bf091535':
  Doc change: add sizes/sums for sdk/ndk/adt packages.
 2010-05-14 18:42:11 -07:00
Andreas Huber
2188a17156 am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking. 
Merge commit 'eb9128f9b0ee660504621381fd96f82d5bf8a3fd' into froyo-plus-aosp

* commit 'eb9128f9b0ee660504621381fd96f82d5bf8a3fd':
  Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
 2010-05-14 16:28:09 -07:00
The Android Open Source Project
4c53558835 merge from open-source master 
Change-Id: I0249c6d796b35af9ba08cbccd463a1f5cf779ecd
 2010-05-14 15:04:52 -07:00
Scott Main
cf6dd9bdef am 826c9f77: docs: fix broken link, reduce API info about backup and point to dev guide 
Merge commit '826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49' into froyo-plus-aosp

* commit '826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49':
  docs: fix broken link, reduce API info about backup and point to dev guide
 2010-05-14 14:24:44 -07:00
Dirk Dougherty
d1ad52a21f am 60026c3a: Merge "Doc change: adjust compatibility doc." into froyo 
Merge commit '60026c3ab0093e6d4cd464061ab9f36d4d041532' into froyo-plus-aosp

* commit '60026c3ab0093e6d4cd464061ab9f36d4d041532':
  Doc change: adjust compatibility doc.
 2010-05-14 14:00:12 -07:00
Dirk Dougherty
9b0f549757 Merge "Doc change: adjust compatibility doc." into froyo 2010-05-14 13:58:12 -07:00
The Android Open Source Project
4dd72e10ee merge from open-source master 
Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38
 2010-05-14 13:52:52 -07:00
Dirk Dougherty
1e588cfedc am 59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo 
Merge commit '59cfe7137ca411bdbb5ffcdf418eecc55d65d09e' into froyo-plus-aosp

* commit '59cfe7137ca411bdbb5ffcdf418eecc55d65d09e':
  Doc change: adjustments to the api changes description
 2010-05-14 13:48:04 -07:00
Dirk Dougherty
2363a9d496 Merge "Doc change: adjustments to the api changes description" into froyo 2010-05-14 13:46:42 -07:00
Dirk Dougherty
b7a9cbc7e1 am bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo 
Merge commit 'bba70cdba284c3d76cab9843e44097d664882938' into froyo-plus-aosp

* commit 'bba70cdba284c3d76cab9843e44097d664882938':
  Doc change: add note about future instruction set support.
 2010-05-14 13:45:17 -07:00
Dirk Dougherty
c04d390b92 Merge "Doc change: add note about future instruction set support." into froyo 2010-05-14 13:43:19 -07:00
Dirk Dougherty
4d8158737f am 89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo 
Merge commit '89969d4cdaf7abbbf6d3fce86c274e7b79113e8d' into froyo-plus-aosp

* commit '89969d4cdaf7abbbf6d3fce86c274e7b79113e8d':
  Doc change: documentation for library projects in sdk.
 2010-05-14 13:40:19 -07:00
Jean-Baptiste Queru
6b4a87862e Merge "Only hold a weak pointer on SurfaceComposerClients" 2010-05-14 13:39:48 -07:00
Dirk Dougherty
a3f10c57af Merge "Doc change: documentation for library projects in sdk." into froyo 2010-05-14 13:38:20 -07:00
Scott Main
62cabab267 am b83a283a: docs: add dev guide for backup 
Merge commit 'b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp

* commit 'b83a283ac178ab0a72f1d811189d79b26097835e':
  docs: add dev guide for backup
 2010-05-14 11:53:44 -07:00
Jean-Baptiste Queru
d181206cab Merge "SetLocaleByCarrier, only if its not an unknown carrier." 2010-05-14 11:39:06 -07:00
The Android Open Source Project
f614ba9a79 merge from open-source master 
Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
 2010-05-14 09:44:36 -07:00
The Android Open Source Project
d69ec09f47 merge from open-source master 
Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226
 2010-05-14 09:11:31 -07:00
Jean-Baptiste Queru
a7b36de932 Merge "Accept media files by file extension in case insensitive manner." 2010-05-14 09:06:43 -07:00
Dirk Dougherty
dee7dcb4c3 am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo 
Merge commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60' into froyo-plus-aosp

* commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60':
  Doc change: adjustments for ndk feature description
 2010-05-13 21:32:21 -07:00
Dirk Dougherty
32374efa5f Merge "Doc change: adjustments for ndk feature description" into froyo 2010-05-13 21:31:10 -07:00
Dirk Dougherty
706ca4bcea am a0711e7b: Doc change: Add compatibility article. 
Merge commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99' into froyo-plus-aosp

* commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99':
  Doc change: Add compatibility article.
 2010-05-13 21:26:22 -07:00
Joe Onorato
0edd269995 Merge "Put the wifi status icon in the right place." 2010-05-13 16:33:22 -07:00
Suchi Amalapurapu
ad89c7dd02 am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 
Merge commit 'c928a11e34678296511d5ea34582292be7368618' into froyo-plus-aosp

* commit 'c928a11e34678296511d5ea34582292be7368618':
  Fix 2672155
 2010-05-13 16:04:24 -07:00
Suchi Amalapurapu
60ef6d786f Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 2010-05-13 16:02:20 -07:00
The Android Open Source Project
7541e1e1d6 merge from open-source master 
Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
 2010-05-13 14:50:16 -07:00
Mike Lockwood
a5cdbc86b3 am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 
Merge commit '098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp

* commit '098e58da93f304d7d7791f193c6237870b94989d':
  Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
 2010-05-13 14:04:30 -07:00
Dianne Hackborn
f0f0539b04 Merge "Corrected debug message in WindowManager" 2010-05-13 13:25:16 -07:00
Jean-Baptiste Queru
27ed27860c Merge "New test in FrameworkTest for the VelocityTracker class" 2010-05-13 11:39:51 -07:00
Andreas Huber
6e8d3ab4da am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config. 
Merge commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b' into froyo-plus-aosp

* commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b':
  Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
 2010-05-13 11:16:43 -07:00
Jean-Baptiste Queru
4232019338 Merge "Preserve '+' in phone numbers imported from SIM." 2010-05-13 11:06:28 -07:00
The Android Open Source Project
e154bdd19d merge from open-source master 
Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101
 2010-05-13 09:04:45 -07:00
Costin Manolache
58ed31eafe am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo 
Merge commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp

* commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e':
  Bug 2680071: Rename the Cloud to Device
 2010-05-12 19:06:39 -07:00
Costin Manolache
c7e64a8e4b Merge "Bug 2680071: Rename the Cloud to Device" into froyo 2010-05-12 19:04:27 -07:00
Costin Manolache
b4490ffd58 Bug 2680071: Rename the Cloud to Device 
Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
 2010-05-12 16:16:34 -07:00
Scott Main
a4d5d705ae am 38b523af: Merge "docs: add missing path-permissions document" into froyo 
Merge commit '38b523af5c233dd5f8631ada2cd80b2d75b0efde' into froyo-plus-aosp

* commit '38b523af5c233dd5f8631ada2cd80b2d75b0efde':
  docs: add missing path-permissions document
 2010-05-12 15:33:38 -07:00
Scott Main
d9cb81c4d1 am f0e4ae56: Merge "docs: fix broken links" into froyo 
Merge commit 'f0e4ae563228db584041d517672aeadacecba61f' into froyo-plus-aosp

* commit 'f0e4ae563228db584041d517672aeadacecba61f':
  docs: fix broken links
 2010-05-12 15:33:35 -07:00