ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
11,901 Commits 2 Branches 0 Tags 54 MiB
6506626c48
Commit Graph

11901 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
6506626c48 am 7cc57ff2: am 0409b1ba: Merge "docs: remove dev guide link from download confirmation content so we only link to the install guide and re-affirm the system reqs bug: 2374363,2374334" into eclair 
Merge commit '7cc57ff22d23daa62e07e0f3d28010d75ed19eea'

* commit '7cc57ff22d23daa62e07e0f3d28010d75ed19eea':
  docs: remove dev guide link from download confirmation content
 2010-01-19 16:35:10 -08:00
Xavier Ducrohet
295df3eb5a Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2010-01-19 16:35:00 -08:00
Joe Onorato
a4d81b947b Merge "Make the space between the time and the AM/PM smaller by putting preceding whitespace inside the span." 2010-01-19 16:34:58 -08:00
Xavier Ducrohet
5e4cc6541d am f95e3dd2: am 5e083024: ADT/Layoutlib: shader clean-up. 
Merge commit 'f95e3dd23cb6cbd7a86dece3c4bafff71307721a'

* commit 'f95e3dd23cb6cbd7a86dece3c4bafff71307721a':
  ADT/Layoutlib: shader clean-up.
 2010-01-19 16:34:48 -08:00
Xavier Ducrohet
28b9e8dc98 am e1a99147: am d3026e16: Merge "ADT/Layoutlib: 2 color, linear gradient support." into eclair 
Merge commit 'e1a991476365cf1a8249c842e2b936db6940b0a7'

* commit 'e1a991476365cf1a8249c842e2b936db6940b0a7':
  ADT/Layoutlib: 2 color, linear gradient support.
 2010-01-19 16:34:32 -08:00
Grace Kloba
9b352fe319 am 181963a0: (-s ours) am 196926b9: Merge "DO NOT MERGE" into eclair 
Merge commit '181963a0200e7c442d66f9f893da41e2b52a4d8c'

* commit '181963a0200e7c442d66f9f893da41e2b52a4d8c':
  DO NOT MERGE
 2010-01-19 16:34:11 -08:00
Suchi Amalapurapu
fbf4202c89 Merge "Mount/Unmount secure containers Persist flags in PackageSetting. Flags are relevant to ApplicationInfo.FLAG_SYSTEM, Application.FLAG_ON_SDCARD, ApplicationInfo.FLAG_FORWARD_LOCK. New pm command to simulate mount/unmount in Pm. This will be removed when MountService/vold event generation gets fixed. Calls from MountService into PackageManager when media gets mounted/unmounted. Scan the packages and grant permissions when the sdcard gets mounted. This api might change again." 2010-01-19 14:11:43 -08:00
Andreas Huber
e9bcc2d714 Merge "Fix trailing garbage after UCS-2 encoded strings in ID3 V2." 2010-01-19 14:05:46 -08:00
Andreas Huber
8109b50a99 Merge "Support for ID3 version 1 (and 1.1) tags in .mp3 files." 2010-01-19 14:05:40 -08:00
Tom O'Neill
3c07d53599 Merge "Find out whether we should mention behavior specific to our own provider" 2010-01-19 13:54:00 -08:00
Romain Guy
eb3854cb76 Merge "Make sure the drawing cache is invalidated when reattaching a view. Bug #2373677" 2010-01-19 13:29:03 -08:00
Andreas Huber
083becb715 Merge "Avoid unnecessary buffer copying if at all possible, detect if running in the mediaserver process." 2010-01-19 11:43:12 -08:00
Doug Kwan
8f5d80e263 Merge "Add missing libjpeg in linker option. Currently this library is used by the main executable but is included implicitly via inter-library dependency." 2010-01-19 11:42:15 -08:00
James Dong
488b3ced7f Merge "Media server death nodification" 2010-01-19 11:37:55 -08:00
San Mehat
b3125d8468 Merge "framework: Introduce INetworkManagementService for communicating with netd" 2010-01-19 11:21:44 -08:00
Mike Lockwood
084e7c4ee8 Merge "LocationManagerService: Fix bug removing proximity alerts." 2010-01-19 11:03:19 -08:00
Andreas Huber
e0d029dfe5 Merge "Squashed commit of the following:" 2010-01-19 10:51:33 -08:00
Andreas Huber
b928563093 Merge "Remove totally unused code from OMX.cpp" 2010-01-19 10:50:54 -08:00
Bjorn Bringert
65316a1901 Merge "Fix WEB_SEARCH handler whitelist" 2010-01-19 10:47:30 -08:00
Andreas Huber
5a05fa1575 Merge "Upgrade for the stagefright commandline tool to support extracting thumbnails and to optionally prefer software codecs." 2010-01-19 10:25:13 -08:00
Andreas Huber
577fa59f00 Merge "Make sure the seek test attempts to seek on the very first iteration, as this appears to be a special case that decoders frequently get wrong." 2010-01-19 10:24:58 -08:00
Bjorn Bringert
46b6bc7c21 Merge "Make SearchManager.getGlobalSearchActivity() public but hidden" 2010-01-19 00:58:39 -08:00
Xavier Ducrohet
2a5636e3fc am 1da2735c: am f73bd14a: Merge "ADT/Layoutlib: implement Canvas.concat(Matrix)" into eclair 
Merge commit '1da2735c5862d48712706c2052a34e10e3dea43b'

* commit '1da2735c5862d48712706c2052a34e10e3dea43b':
  ADT/Layoutlib: implement Canvas.concat(Matrix)
 2010-01-19 00:02:15 -08:00
Adam Powell
a0a7b07365 am b5a5a397: am 56a17690: Merge "TransformGestureDetector is now ScaleGestureDetector - scope reduced. N1 screen can\'t reliably handle translation and scaling at the same time." into eclair 
Merge commit 'b5a5a39716502be2cd325a6f9b393e155c0636ee'

* commit 'b5a5a39716502be2cd325a6f9b393e155c0636ee':
  TransformGestureDetector is now ScaleGestureDetector - scope reduced.
 2010-01-19 00:02:00 -08:00
Xavier Ducrohet
fd1a7126a8 am cff6c845: am ae4bd059: ADT/Layoutlib: Reimplement parts of BitmapFactory 
Merge commit 'cff6c8459ca05f3fee2d2999989d07a7176f955c'

* commit 'cff6c8459ca05f3fee2d2999989d07a7176f955c':
  ADT/Layoutlib: Reimplement parts of BitmapFactory
 2010-01-19 00:01:32 -08:00
San Mehat
49ef2b6c98 Merge "MountService: Add new 'unmountSecureContainer' API call" 2010-01-18 07:14:02 -08:00
Daisuke Miyakawa
00fe42ba50 Merge "Make vCard importer support lower case params." 2010-01-17 15:32:02 -08:00
Oscar Montemayor
a507b8d27e Merge "Apps on SD card. Added support for retrieving and generating keys as Hex Strings. Using keys to mount encrypted FS." 2010-01-15 19:03:32 -08:00
Romain Guy
26d048678b Merge "Added a method for spatial sampling." 2010-01-15 16:44:49 -08:00
San Mehat
ca696e0841 Merge "sdutil: Use new MountService api method names" 2010-01-15 16:30:05 -08:00
Oscar Montemayor
fa8756149a Merge "Apps on SD card. Added support for retrieving and generating keys as Hex Strings. Using keys to mount encrypted FS." 2010-01-15 16:20:23 -08:00
Kenny Root
5408f1409b Merge "Update Time.parse3339() unit tests" 2010-01-15 14:44:58 -08:00
Romain Guy
f450dc86a4 Merge "Added clone to these three classes and added more comments." 2010-01-15 14:40:48 -08:00
Romain Guy
6b0221b52b Merge "Added non-uniform scaling for spatial sampling." 2010-01-15 14:31:34 -08:00
Colin Cross
1410dff104 Merge "Use correct TLS codepath in graphics libraries" 2010-01-15 14:07:32 -08:00
Oscar Montemayor
d43a216f76 Merge "Apps on SD card. Added support for retrieving and generating keys as Hex Strings." 2010-01-15 13:52:39 -08:00
Eric Fischer
fcebabb49f Merge "Make the "AM" or "PM" in the status bar clock be in a smaller font size." 2010-01-15 11:23:00 -08:00
Vasu Nori
2ecee422a8 Merge "Change Log.wtf() call to Log.w()" 2010-01-15 10:51:25 -08:00
Niko Catania
db2c8a7b61 Merge "New method to return the last dialed number Bug:2227429" 2010-01-15 10:47:48 -08:00
Robert Greenwalt
bc9cde22d6 resolved conflicts for merge of 90528645 to master 2010-01-15 10:45:11 -08:00
Robert Greenwalt
01389e2945 Merge "Set net.hostname sys property to our unique ID." 2010-01-15 10:20:18 -08:00
Niko Catania
10cdb3417f Merge "New method to return the last dialed number Bug:2227429" 2010-01-15 09:18:05 -08:00
Tom O'Neill
6f30a0f40e Merge "Improve ContractsContract.RawContacts documentation" 2010-01-15 08:15:20 -08:00
Romain Guy
ae6d574c61 Merge "Added non-uniform scaling for spatial sampling and converted double to float." 2010-01-14 18:43:51 -08:00
Andreas Huber
39a759eb4d Merge "Squashed commit of the following:" 2010-01-14 15:12:36 -08:00
Andreas Huber
6d69b6bc19 Merge "Fix a few issues with determining the closest sample to a given time in the MPEG4 sampletable implementation." 2010-01-14 15:12:29 -08:00
Ficus Kirkpatrick
ed82ee7bf2 Merge "Remove some settings we are no longer using." 2010-01-14 15:08:55 -08:00
Andreas Huber
0579c22dd5 Merge "Squashed commit of the following:" 2010-01-14 15:01:22 -08:00
Fred Quintana
b1eb51cebf Merge "allow + in usernames" 2010-01-14 14:58:39 -08:00
Fred Quintana
ca99444c98 allow + in usernames 2010-01-14 14:57:20 -08:00