ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,351 Commits 2 Branches 0 Tags 54 MiB
4acba107d4
Commit Graph

18351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
989ce29b44 am aba4bf19: am e068b464: am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo 
Merge commit 'aba4bf19fbdedb2f4f438895e8165a3b34a15633'

* commit 'aba4bf19fbdedb2f4f438895e8165a3b34a15633':
  docs: editorial revisions to Search guide
 2010-07-16 16:25:03 -07:00
Jeff Brown
0f63ddb175 am ace999b0: Ignore attempts to finish events on unregistered channels. 
Merge commit 'ace999b096739d376d4845c0ba94599197ff8477' into gingerbread-plus-aosp

* commit 'ace999b096739d376d4845c0ba94599197ff8477':
  Ignore attempts to finish events on unregistered channels.
 2010-07-16 16:03:07 -07:00
Jean-Baptiste Queru
b387d9de47 Merge "Fix build." 2010-07-16 15:25:26 -07:00
Hung Dang
e5b63e4acd am b6761e73: am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo 
Merge commit 'b6761e73ce6b255cfe96bfa1fa6ac611abcfc067' into gingerbread-plus-aosp

* commit 'b6761e73ce6b255cfe96bfa1fa6ac611abcfc067':
  Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
 2010-07-16 15:18:03 -07:00
Jamie Gennis
4760482810 am c8c79a65: Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread 
Merge commit 'c8c79a654d4ae8e3a883854e19cc2df757f72d82' into gingerbread-plus-aosp

* commit 'c8c79a654d4ae8e3a883854e19cc2df757f72d82':
  Re-use existing Surface objects when reading them from parcels.
 2010-07-16 15:17:59 -07:00
Hung Dang
9b242faf8b am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo 
Merge commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2' into gingerbread

* commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2':
  Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
 2010-07-16 15:15:44 -07:00
Jamie Gennis
874da6e438 Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread 2010-07-16 15:14:44 -07:00
Jeff Brown
cd423c4239 am 00ba8844: Fix individual pointer id up/down reporting. 
Merge commit '00ba884436dc8b222ad850c73c936d87bf4e84de' into gingerbread-plus-aosp

* commit '00ba884436dc8b222ad850c73c936d87bf4e84de':
  Fix individual pointer id up/down reporting.
 2010-07-16 15:14:35 -07:00
Hung Dang
fb9b2483c9 Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo 2010-07-16 15:13:12 -07:00
Jeff Brown
3cf1c9b844 Fix individual pointer id up/down reporting. 
Fix a minor threading bug in InputManager dump.

Change-Id: Ic2eecf7df5a8dc9f40561fcb03ebe58a2c073778
 2010-07-16 15:11:24 -07:00
Romain Guy
0187e14da4 Merge "Optimize textures binding." 2010-07-16 15:09:07 -07:00
Scott Main
99762e5168 am e068b464: am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo 
Merge commit 'e068b46408f3ff390b47dc78ccf10fab76883051' into gingerbread-plus-aosp

* commit 'e068b46408f3ff390b47dc78ccf10fab76883051':
  docs: editorial revisions to Search guide
 2010-07-16 15:02:30 -07:00
Scott Main
127c21f74a am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo 
Merge commit '2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1' into gingerbread

* commit '2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1':
  docs: editorial revisions to Search guide
 2010-07-16 14:59:48 -07:00
Scott Main
f044328d09 Merge "docs: editorial revisions to Search guide" into froyo 2010-07-16 14:52:03 -07:00
Romain Guy
b75a776378 Merge "Improve clip support (add intersect, union and replace.)" 2010-07-16 14:13:48 -07:00
The Android Open Source Project
54da4fa244 am 5adfe6c5: merge from open-source master 
Merge commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f'

* commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f':
  Fix the problem that color drawable cache key conflicts another drawable one.
 2010-07-16 14:06:06 -07:00
The Android Open Source Project
352a7b59ed am c9ecd445: merge from open-source master 
Merge commit 'c9ecd445b86552265b4adb90e5df2fbe5f71cb8e'

* commit 'c9ecd445b86552265b4adb90e5df2fbe5f71cb8e':
  Added method getPreferredHttpHost
 2010-07-16 14:01:43 -07:00
The Android Open Source Project
7fd8fbb0c1 merge from open-source master 
Change-Id: Iacd42b06fa01fa6dfd18b81f07ce4b6da922dfff
 2010-07-16 14:01:37 -07:00
The Android Open Source Project
3923714fcb merge from open-source master 
Change-Id: I6bdeeff30be1fdb0901aec9bcdd67176c29eaf7b
 2010-07-16 13:58:43 -07:00
The Android Open Source Project
813e868231 am 3a94ab02: merge from open-source master 
Merge commit '3a94ab026f0434624f233e99b1a0aadb9152a09a'

* commit '3a94ab026f0434624f233e99b1a0aadb9152a09a':
  Allow ListPreference summary to use entry
 2010-07-16 13:56:16 -07:00
The Android Open Source Project
c54346aa63 am 3b97e5a6: merge from open-source master 
Merge commit '3b97e5a6270f40111117c4d3f1e964154ddea0fe'

* commit '3b97e5a6270f40111117c4d3f1e964154ddea0fe':
  Make HTTP Header class handle multiple cache-control fields.
 2010-07-16 13:52:45 -07:00
The Android Open Source Project
edce003d99 am 0637db6c: merge from open-source master 
Merge commit '0637db6c8d91df04cf51f114774f377215718ecd'

* commit '0637db6c8d91df04cf51f114774f377215718ecd':
 2010-07-16 13:50:35 -07:00
The Android Open Source Project
3fa4e58341 merge from open-source master 
Change-Id: Ib00a02e90d5c2c0b4cc1919258b858930967198b
 2010-07-16 13:50:12 -07:00
The Android Open Source Project
d92e54be2d merge from open-source master 
Change-Id: Ic91d205e7fd6a71320d9a4498643d384397dfb00
 2010-07-16 13:48:39 -07:00
The Android Open Source Project
189f3d790d merge from open-source master 
Change-Id: I526915e374c6a6c34503f2b289b7b76ccceccbeb
 2010-07-16 13:47:19 -07:00
The Android Open Source Project
62968775c6 am 4248d588: merge from open-source master 
Merge commit '4248d5887bf9d7d65b649a9ca0c7ba623135eed5'

* commit '4248d5887bf9d7d65b649a9ca0c7ba623135eed5':
  Makes PhoneNumberUtils support international numbers after a CLIR command.
 2010-07-16 13:46:08 -07:00
The Android Open Source Project
ea0f37b52c merge from open-source master 
Change-Id: I87dc9cac9d5bf8543de8273e8b0bf72ec22e2d5f
 2010-07-16 13:42:31 -07:00
Jamie Gennis
aca4e22879 Re-use existing Surface objects when reading them from parcels. 
This change adds a process-global cache of previously deserialized Surface
objects so that if a Surface object wrapping the same ISurface gets received
again the same Surface can be used.  This is important because the 'tail'
pointer in the SharedBufferClient is stored only on the client side, and needs
to be the same for all the Surface objects wrapping an ISurface instance.  This
solves the problem by making there only be one Surface object wrapping an
ISurface per process.

Change-Id: I4bf0b8787885c56277622fca053022d2bb638902
 2010-07-16 13:03:15 -07:00
Adam Powell
ce654611a6 Merge "Overflow menu for action bars." 2010-07-16 11:52:55 -07:00
Dmitri Plotnikov
365fb13fa3 Merge "Resolving a field naming conflict caused by the table join." 2010-07-16 11:21:00 -07:00
Dmitri Plotnikov
615679f97f Merge "Hiding new API" 2010-07-16 10:46:40 -07:00
Dmitri Plotnikov
28bf32d50f Merge "Adding more feature declarations to Directory API." 2010-07-16 10:45:18 -07:00
Jeff Brown
cfa6d98278 resolved conflicts for merge of f7adbe10 to master 
Change-Id: I898a5e53b180adaee2337c0c0b9896c799d056e7
 2010-07-16 10:06:33 -07:00
Gilles Debunne
348d63c4c5 Merge "Fixed bug in BitmapFactory.decodeStream" 2010-07-16 09:54:30 -07:00
Eric Laurent
5058ff4746 am f16b3f10: am b0374a0e: Merge "Several improvements in audio effects volume control." into gingerbread 
Merge commit 'f16b3f104f60738447db60bcf2c44c7610e17199'

* commit 'f16b3f104f60738447db60bcf2c44c7610e17199':
  Several improvements in audio effects volume control.
 2010-07-16 09:12:40 -07:00
Kenny Root
bda9bedf28 am f97b21b5: am bd623daf: Undo IMediaContainerService changes 
Merge commit 'f97b21b54e2e35fdfcc8614dedd8692d5a535a5e'

* commit 'f97b21b54e2e35fdfcc8614dedd8692d5a535a5e':
  Undo IMediaContainerService changes
 2010-07-16 09:12:36 -07:00
Dianne Hackborn
a2c4654c2f am 9c37e5ad: am 75a91389: Merge "Implement native key pre-dispatching to IMEs." into gingerbread 
Merge commit '9c37e5add9d7678a29b4e0d1e178fe78a13db961'

* commit '9c37e5add9d7678a29b4e0d1e178fe78a13db961':
  Implement native key pre-dispatching to IMEs.
 2010-07-16 09:12:29 -07:00
Kenny Root
d400fe7dc9 resolved conflicts for merge of 181bb0ab to master 
Change-Id: I2284e7c671d127da0d124fbabae8d887727fd5bf
 2010-07-16 09:04:09 -07:00
Daniel Sandler
29e92c02b7 Merge "Move more of the system bar to the layout." 2010-07-16 07:38:52 -07:00
Jeff Brown
e2cefe54f4 am eec69d29: Merge "Fix bug with phantom input windows." into gingerbread 
Merge commit 'eec69d2923636b2aaa51df93bacc2b3bbb742736' into gingerbread-plus-aosp

* commit 'eec69d2923636b2aaa51df93bacc2b3bbb742736':
  Fix bug with phantom input windows.
 2010-07-16 00:16:09 -07:00
Jeff Brown
9e2d6e976b Merge "Fix bug with phantom input windows." into gingerbread 2010-07-16 00:14:38 -07:00
Eric Laurent
1716d82d50 am b0374a0e: Merge "Several improvements in audio effects volume control." into gingerbread 
Merge commit 'b0374a0e22756d956f8ebf2b19b1139e9e5e3384' into gingerbread-plus-aosp

* commit 'b0374a0e22756d956f8ebf2b19b1139e9e5e3384':
  Several improvements in audio effects volume control.
 2010-07-16 00:12:02 -07:00
Eric Laurent
8849c6f648 Merge "Several improvements in audio effects volume control." into gingerbread 2010-07-16 00:08:50 -07:00
Jeff Brown
0a128e3cbe Fix bug with phantom input windows. 
Add dumpsys integration for the native input dispatcher.
Add some InputDevice API stubs.
Add an appendFormat helper method to String8 for printf style
string formatting mainly for debugging purposes.
Use generic ArrayList<WindowState> everywhere in WindowManagerService
to eliminate unnecessary casts all over.

Change-Id: I9d1e3bd90eb7222d10620200477f11b7bfd25e44
 2010-07-16 00:02:48 -07:00
Jeff Brown
1a15c6eaff resolved conflicts for merge of aca672ba to master 
Change-Id: I7ae11fca0acdbf513a4870226d0d3e3cafbe9a08
 2010-07-15 23:47:29 -07:00
Shih-wei Liao
8bbeeaa331 Merge "Fix include path problem." 2010-07-15 23:40:05 -07:00
Christopher Tate
cc2781b5ed am 2c43b6ce: am d9452ecd: Merge "Fix jni registration typo" into gingerbread 
Merge commit '2c43b6cee14cde6721689239e47d32319dbbf6ee'

* commit '2c43b6cee14cde6721689239e47d32319dbbf6ee':
  Fix jni registration typo
 2010-07-15 23:27:47 -07:00
Scott Main
969573159e am 7ccdfbee: am 4cb8293b: am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo 
Merge commit '7ccdfbee63ee482f294becbc5b5e5e1807fbda43'

* commit '7ccdfbee63ee482f294becbc5b5e5e1807fbda43':
  docs: update notepad tutorial to change EditNote activity title and update codelab zip
 2010-07-15 23:27:40 -07:00
Scott Main
0cccee3b6c am c9659424: am b8f4a84a: am 80fa5c86: docs: dashboard update 
Merge commit 'c9659424cfa971f202f1bee44f7acb6873b0954b'

* commit 'c9659424cfa971f202f1bee44f7acb6873b0954b':
  docs: dashboard update
 2010-07-15 23:27:36 -07:00
Katie McCormick
76014b2fe6 am 3f50035c: am a6a134d4: am 28da8e5e: Merge "Doc change: Update AVD create instructions." into froyo 
Merge commit '3f50035c3db3cd38653d8e212c8caf77c4c3200e'

* commit '3f50035c3db3cd38653d8e212c8caf77c4c3200e':
  Doc change: Update AVD create instructions.
 2010-07-15 23:24:16 -07:00