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

26855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamie Gennis
691a9fcb2b am 04b95313: am c8c79a65: Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread 
Merge commit '04b953132edb5482f0aa6d992f89e7016961528c'

* commit '04b953132edb5482f0aa6d992f89e7016961528c':
  Re-use existing Surface objects when reading them from parcels.
 2010-07-16 16:25:23 -07:00
Jeff Brown
5b45b1c274 am 7b8df313: am 00ba8844: Fix individual pointer id up/down reporting. 
Merge commit '7b8df313f714d6e8d536e0f8bbe5496fe9a6c26d'

* commit '7b8df313f714d6e8d536e0f8bbe5496fe9a6c26d':
  Fix individual pointer id up/down reporting.
 2010-07-16 16:25:13 -07:00
Scott Main
955f1551b6 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
Jean-Baptiste Queru
1abcc805cc Merge "Fix build." 2010-07-16 15:25:26 -07:00
Jean-Baptiste Queru
cc0aad38f0 Fix build. 
Switch to using public APIs instead of private ones.

Change-Id: Ia3468d94b3dadeb6a000ce419ee08f7e7ba5dc67
 2010-07-16 15:18:56 -07:00
Jamie Gennis
04b953132e 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
Jamie Gennis
c8c79a654d Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread 2010-07-16 15:14:44 -07:00
Jeff Brown
7b8df313f7 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
Jeff Brown
00ba884436 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
dcb7a7062d Merge "Optimize textures binding." 2010-07-16 15:09:07 -07:00
Romain Guy
1e79386ba3 Optimize textures binding. 
The renderer is still changing textures' wrap modes every time, this will require
a latter optimization.

Change-Id: I3eb92cb8c886c4a692b7f0ca759911f9371d4d2c
 2010-07-16 15:07:42 -07:00
Scott Main
aba4bf19fb 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
e068b46408 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
2a8dd4e46f Merge "docs: editorial revisions to Search guide" into froyo 2010-07-16 14:52:03 -07:00
Scott Main
5e892d8183 docs: editorial revisions to Search guide 
Change-Id: I6a2065304d1d80c46f3bb3c658ab55f1fe58b211
 2010-07-16 14:33:14 -07:00
Romain Guy
9a89b0e1b9 Merge "Improve clip support (add intersect, union and replace.)" 2010-07-16 14:13:48 -07:00
Romain Guy
079ba2c85b Improve clip support (add intersect, union and replace.) 
This change also modifies the way the clip is stored. The clip is now
always stored in screen-space coordinates.

Change-Id: I96375784d82dfe975bc6477a159e6866e7052487
 2010-07-16 14:12:24 -07:00
The Android Open Source Project
bf4564f03d 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
a508668309 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
5adfe6c563 merge from open-source master 
Change-Id: Iacd42b06fa01fa6dfd18b81f07ce4b6da922dfff
 2010-07-16 14:01:37 -07:00
The Android Open Source Project
c9ecd445b8 merge from open-source master 
Change-Id: I6bdeeff30be1fdb0901aec9bcdd67176c29eaf7b
 2010-07-16 13:58:43 -07:00
The Android Open Source Project
506e6e0882 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
62dfcf38b5 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
9944c73a64 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
3a94ab026f merge from open-source master 
Change-Id: Ib00a02e90d5c2c0b4cc1919258b858930967198b
 2010-07-16 13:50:12 -07:00
The Android Open Source Project
3b97e5a627 merge from open-source master 
Change-Id: Ic91d205e7fd6a71320d9a4498643d384397dfb00
 2010-07-16 13:48:39 -07:00
The Android Open Source Project
0637db6c8d merge from open-source master 
Change-Id: I526915e374c6a6c34503f2b289b7b76ccceccbeb
 2010-07-16 13:47:19 -07:00
The Android Open Source Project
1b1f0bc1f8 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
4248d5887b merge from open-source master 
Change-Id: I87dc9cac9d5bf8543de8273e8b0bf72ec22e2d5f
 2010-07-16 13:42:31 -07:00
Jamie Gennis
5ee65f0d44 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
250fd97123 Merge "Overflow menu for action bars." 2010-07-16 11:52:55 -07:00
Dmitri Plotnikov
11811612e8 Merge "Resolving a field naming conflict caused by the table join." 2010-07-16 11:21:00 -07:00
Dmitri Plotnikov
86fe839284 Resolving a field naming conflict caused by the table join. 
Change-Id: I6f3293fb9aceebea7df9677eb1e6ebc199383e99
 2010-07-16 11:19:46 -07:00
Dmitri Plotnikov
6b477fe452 Merge "Hiding new API" 2010-07-16 10:46:40 -07:00
Dmitri Plotnikov
e270c51ea4 Hiding new API 
Change-Id: Ie6a108442416fdb27229ff274b631e6f4a6c2370
 2010-07-16 10:46:00 -07:00
Dmitri Plotnikov
393e4801d8 Merge "Adding more feature declarations to Directory API." 2010-07-16 10:45:18 -07:00
Dmitri Plotnikov
30b7be333f Adding more feature declarations to Directory API. 
Change-Id: Iabec8c4dcbd69212285a6eb9be9db7ebb1b712ed
 2010-07-16 10:43:40 -07:00
Adam Powell
8028dd32a4 Overflow menu for action bars. 
The overflow menu replaces the normal options menu panel for
activities with an action bar. It always appears as the rightmost
action button and is displayed as a dropdown menu. The menu key
summons and dismisses the overflow menu instead of the options panel
where applicable.

Change-Id: I0b4fa7e36f35ab12e2f0c1d12bec79ccab8cc4b1
 2010-07-16 10:22:31 -07:00
Jeff Brown
eb857f12d6 resolved conflicts for merge of f7adbe10 to master 
Change-Id: I898a5e53b180adaee2337c0c0b9896c799d056e7
 2010-07-16 10:06:33 -07:00
Gilles Debunne
c0eb6d6388 Merge "Fixed bug in BitmapFactory.decodeStream" 2010-07-16 09:54:30 -07:00
Eric Laurent
2469e40924 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
94919a170f 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
781d347479 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
fb4e1e24a9 resolved conflicts for merge of 181bb0ab to master 
Change-Id: I2284e7c671d127da0d124fbabae8d887727fd5bf
 2010-07-16 09:04:09 -07:00
Daniel Sandler
a2b78e21b0 Merge "Move more of the system bar to the layout." 2010-07-16 07:38:52 -07:00
Jeff Brown
f7adbe10c2 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
eec69d2923 Merge "Fix bug with phantom input windows." into gingerbread 2010-07-16 00:14:38 -07:00
Eric Laurent
f16b3f104f 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
b0374a0e22 Merge "Several improvements in audio effects volume control." into gingerbread 2010-07-16 00:08:50 -07:00
Jeff Brown
e33348ba54 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