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

11788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
San Mehat
c11d7a6a07 Merge "framework: MountService: Add initial support for Android Secure External Caches" 2010-01-06 14:30:56 -08:00
Dan Egnor
eb9685ef47 Merge "Fix SDK build problem until EventLog is published." 2010-01-06 14:15:53 -08:00
Joe Onorato
9df1115e5e Merge "Stop spamming the log." 2010-01-06 14:10:33 -08:00
Cary Clark
7c127abd27 am 9e5f3ec9: am e3bbaf6c: Merge "set nine patch padding initially to an empty rectangle" into eclair-mr2 
Merge commit '9e5f3ec97d468702aa3f3a59e94009e807715189'

* commit '9e5f3ec97d468702aa3f3a59e94009e807715189':
  set nine patch padding initially to an empty rectangle
 2010-01-06 14:05:58 -08:00
Leon Scroggins
59909e8789 am fbd3afb1: am e38fc189: Show label information as hint text 
Merge commit 'fbd3afb1801ed69a5c948241e68b997be3d84f4e'

* commit 'fbd3afb1801ed69a5c948241e68b997be3d84f4e':
  Show label information as hint text
 2010-01-06 14:05:46 -08:00
Jaikumar Ganesh
ed371412fe am 0b6c6f2c: Merge "Fix media option settings for A2DP." into eclair 
Merge commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b' into eclair-plus-aosp

* commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b':
  Fix media option settings for A2DP.
 2010-01-06 13:46:59 -08:00
Dianne Hackborn
4dcc8cb91b am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configuation:" 
Merge commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8' into eclair-plus-aosp

* commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8':
  Fix issue #2357259: aapt tool prints "uses-configuation:"
 2010-01-06 13:46:50 -08:00
Ying Wang
ea915a14f2 am 42c98ada: Still use ro.monkey 
Merge commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534' into eclair-plus-aosp

* commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534':
  Still use ro.monkey
 2010-01-06 13:46:36 -08:00
Cary Clark
1500de3ffc am e3bbaf6c: Merge "set nine patch padding initially to an empty rectangle" into eclair-mr2 
Merge commit 'e3bbaf6c4f51f8201922cae29daa7e46f6c43bda' into eclair-mr2-plus-aosp

* commit 'e3bbaf6c4f51f8201922cae29daa7e46f6c43bda':
  set nine patch padding initially to an empty rectangle
 2010-01-06 13:45:59 -08:00
Leon Scroggins
beb38fd618 am e38fc189: Show label information as hint text 
Merge commit 'e38fc1898183a6bf8b0542a1d2627cdbcbd63198' into eclair-mr2-plus-aosp

* commit 'e38fc1898183a6bf8b0542a1d2627cdbcbd63198':
  Show label information as hint text
 2010-01-06 13:45:46 -08:00
Jaikumar Ganesh
d83e098bf9 Merge "Fix media option settings for A2DP." into eclair 2010-01-06 13:38:27 -08:00
Maryam Garrett
7f5f0f1311 Merge "Enable onepointfivetap-and-swipe to select." 2010-01-06 12:51:48 -08:00
Dan Egnor
29fd34dc8b Merge "Simplify EventLog interface -- remove supported for nested sequences (which nobody used) and streamline the API, adding documentation in preparation for inclusion in the SDK." 2010-01-06 12:49:43 -08:00
Bjorn Bringert
c3d8372456 Merge "Add RemoteViews.setBundle() method." 2010-01-06 12:48:02 -08:00
Cary Clark
54258c5b8b Merge "set nine patch padding initially to an empty rectangle" into eclair-mr2 2010-01-06 09:52:54 -08:00
Jean-Baptiste Queru
837edec5e3 Do not use a user tag on apps, as it is ignored. 
The build system does not honor user tags on apps,
and setting it is misleading.

This removes the confusion by making the makefiles
behave like they read.

Change-Id: I7c5feba1c7d07f915b97dd098584f29938a4c885
 2010-01-06 08:53:44 -08:00
Marco Nelissen
4b059669c0 Merge "Remove the drawables for the VerticalTextSpinner, since they're no longer needed here." 2010-01-06 07:39:48 -08:00
Mike Lockwood
b55cf3c793 Merge "Cleanup and add public wrapper for IGeocodeProvider interface to prepare for network location unbundling." 2010-01-06 07:08:56 -08:00
Adam Powell
209f92fc54 Merge "Don't perform ListView click events for INVALID_POSITION. Addresses bug 2329294" 2010-01-05 17:38:20 -08:00
Elliott Hughes
3afd73929b Merge "Stop preloading a class I'm about to remove." 2010-01-05 15:08:10 -08:00
Marco Nelissen
ffa17f0ea2 Merge "VerticalTextSpinner has been moved in to the music app, and is no longer needed here." 2010-01-05 14:43:47 -08:00
Amith Yamasani
e5ce85e981 Merge "Fix for 2345922: Press and hold space in ?123 mode will give ....." 2010-01-05 14:17:47 -08:00
Andreas Huber
7f7587b183 Merge "Quick and dirty implementation to follow http redirects in stagefright." 2010-01-05 13:46:20 -08:00
Scott Main
361fb12ad8 am 95eeedfe: am c20467f9: docs: update the device dashboard 
Merge commit '95eeedfe8dc24db7a981ef69f94d307548d020fa'

* commit '95eeedfe8dc24db7a981ef69f94d307548d020fa':
  docs: update the device dashboard
 2010-01-05 12:34:14 -08:00
Scott Main
030910f5d5 am c20467f9: docs: update the device dashboard 
Merge commit 'c20467f94afd2ac173dcb1d27f2a8fb91816edb0' into eclair-plus-aosp

* commit 'c20467f94afd2ac173dcb1d27f2a8fb91816edb0':
  docs: update the device dashboard
 2010-01-05 12:31:06 -08:00
Jean-Baptiste Queru
c782c271e3 Merge "explicit set an "optional" tag" 2010-01-05 12:06:43 -08:00
Wink Saville
e0ccaf2717 Merge "Fix data connection support on emulator." 2010-01-05 11:47:44 -08:00
Grace Kloba
0d026a97bb am 552346a7: am 106f9b24: Patch from Huahui Wu. 
Merge commit '552346a743be7c8b10893f817238e92938866999'

* commit '552346a743be7c8b10893f817238e92938866999':
  Patch from Huahui Wu.
 2010-01-05 11:32:52 -08:00
Andreas Huber
b644577d93 Merge "Protect against possible temporary objects going away before we get at their data." 2010-01-05 11:28:58 -08:00
Grace Kloba
55a16867b0 am 106f9b24: Patch from Huahui Wu. 
Merge commit '106f9b244633171ab75dd98b9761b7137c1a4705' into eclair-mr2-plus-aosp

* commit '106f9b244633171ab75dd98b9761b7137c1a4705':
  Patch from Huahui Wu.
 2010-01-05 11:20:18 -08:00
Andreas Huber
13b0b6df36 Merge "I must have broken raw-audio decoding in the recent past, this fixes it." 2010-01-05 11:08:21 -08:00
Daisuke Miyakawa
ce83b789ac Merge "Fix test breakage in vCard exporter." 2010-01-04 20:51:08 -08:00
Erik Pasternak
62dc6f6691 Merge "b/2293263 Replaced busybit functionality with eventDay functionality." 2010-01-04 18:43:39 -08:00
Jason Sams
8a2dacf2e4 Merge "Add RS support for generic attribs as input to vertex programs." 2010-01-04 16:53:42 -08:00
Romain Guy
1678903259 Merge "Ignore key events when the widget is disabled. Bug: #2353635." 2010-01-04 15:40:27 -08:00
Android Git Automerger
222e480e6d Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2010-01-04 15:39:56 -08:00
Marco Nelissen
c99584dd4b Merge "MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING" 2010-01-04 15:10:33 -08:00
Andreas Huber
aefd4ce803 Merge "Make metadata support through stagefright property dependent until it's ready." 2010-01-04 15:08:32 -08:00
Andreas Huber
cad2ff0c05 Merge "Fix mpeg4/h.263 software decoder." 2010-01-04 15:07:36 -08:00
Suchi Amalapurapu
058e763e38 Merge "Add four way directional rotation to WindowOrientationListener" 2010-01-04 15:07:14 -08:00
Andreas Huber
24510520aa Merge "Fix avc software decoder to properly handle SEI nalType and access unit delimiter." 2010-01-04 15:04:08 -08:00
Romain Guy
ad87c87e81 Merge "Plug memory leak in Simple*Adapter, due to the misuse of a WeakHashMap. This removes an optimization but the benefit is not worth the memory leak. Bug: #2353474." 2010-01-04 14:54:02 -08:00
Romain Guy
a221f4cb7f Merge "Fix typo in ColorStateList documentation." 2010-01-04 14:46:28 -08:00
Romain Guy
aeb3bbb8e5 Merge "Do not start filtering if the first character is a space. Bug: #2347833." 2010-01-04 14:34:55 -08:00
Marco Nelissen
4dc2e8c110 Merge "Add the UNKNOWN_STRING definition to MediaStore. It will be removed from MediaFile once I've updated the code that uses it." 2010-01-04 14:02:49 -08:00
Ying Wang
e01504a55c am 5c529a0c: am 08fa1428: Rename ro.monkey to monkey.running 
Merge commit '5c529a0cb587d0dfa38e5642e268ca56285a356f'

* commit '5c529a0cb587d0dfa38e5642e268ca56285a356f':
  Rename ro.monkey to monkey.running
 2010-01-04 13:49:47 -08:00
Ying Wang
8a7567f32d am 08fa1428: Rename ro.monkey to monkey.running 
Merge commit '08fa1428eed52083789dc3b366aea4873199bd37' into eclair-plus-aosp

* commit '08fa1428eed52083789dc3b366aea4873199bd37':
  Rename ro.monkey to monkey.running
 2010-01-04 12:59:17 -08:00
Nicolas Roard
e4ae0266bc am 081798f9: am 38863336: layers support 
Merge commit '081798f91270adb2a68979e5f7867d2021b8eed3'

* commit '081798f91270adb2a68979e5f7867d2021b8eed3':
  layers support
 2010-01-04 12:49:50 -08:00
Nicolas Roard
c85e7090ea am 38863336: layers support 
Merge commit '3886333644467beeaf60c13fb94f242538067765' into eclair-mr2-plus-aosp

* commit '3886333644467beeaf60c13fb94f242538067765':
  layers support
 2010-01-04 11:42:41 -08:00
Romain Guy
f988157549 Merge "Fix obsolete advice in RelativeLayout's documentation." 2010-01-04 10:58:13 -08:00