Romain Guy
f2cc48fe8b
Merge "Let HardwareRenderer support multiple threads."
2011-07-19 14:14:35 -07:00
Philip Milne
ee4a6478e2
Merge "Expose to the platform the ability to pick up changes in child visibility."
2011-07-19 14:14:34 -07:00
Dianne Hackborn
2af9e1f7b5
Merge "Fix issue #4869092 : ResolverActivity occasionally fails to display"
2011-07-19 14:07:54 -07:00
Mathias Agopian
a73f9beeb1
Merge changes I4d50e985,Iaa2baa66
...
* changes:
use SurfaceTexture new scaling mode in SF
Add set_scaling_mode() to ANativeWindow.
2011-07-19 14:05:45 -07:00
Fabrice Di Meglio
c679e6e7ff
Merge "Code cleaning"
2011-07-19 14:04:28 -07:00
Philip Milne
350f0a63c9
Expose to the platform the ability to pick up changes in child visibility.
...
Also:
. use above, to flsuh GridLayout state when child's GONE state changes.
Change-Id: I8567c24b51b807f0625918d42b6847a5a350311d
2011-07-19 14:00:56 -07:00
Dianne Hackborn
2c1c4aa69f
Fix issue #4869092 : ResolverActivity occasionally fails to display
...
Change-Id: Ic632d08fcfa9138caeacb45fa4a00cbd4a943988
2011-07-19 13:52:02 -07:00
Gilles Debunne
8358498aee
Merge "Layout changes in Settings"
2011-07-19 13:42:54 -07:00
Colin Cross
9397bb9499
Merge "Allow BoardConfig.mk to define an extension to dumpstate"
2011-07-19 13:26:30 -07:00
Fabrice Di Meglio
f66fdadefb
Code cleaning
...
- follow member name code style
Change-Id: I7a3540ee511aa600c71d2e4b9b7e7f94e47618a9
2011-07-19 13:08:47 -07:00
Russell Brenner
464b431a76
Merge "Include DroidSansEthiopic-Regular as fallback font"
2011-07-19 13:08:14 -07:00
Mathias Agopian
ff86f37b95
use SurfaceTexture new scaling mode in SF
...
SF now obeys SurfaceTexture's scaling mode instead
of inferring it from the buffer's size
Change-Id: I4d50e9851abedd7e64bfcfc8af9eefb9fb668529
2011-07-19 13:05:12 -07:00
Mathias Agopian
09d7ed7b39
Add set_scaling_mode() to ANativeWindow.
...
This allows to specify the scaling mode independently from
the buffer size.
Change-Id: Iaa2baa660445531a97d3fac192e580f4929c5d3b
2011-07-19 13:05:11 -07:00
Doug Zongker
9d29d155c5
Merge "add rebootWipeCache call to RecoverySystem API"
2011-07-19 13:00:30 -07:00
Chris Craik
9c14256b57
Merge "Added TileBenchmark"
2011-07-19 12:47:35 -07:00
Doug Zongker
3365120137
add rebootWipeCache call to RecoverySystem API
...
Also remove the never-used encrypted-filesystem-via-recovery stuff
that was stripped out of recovery a while ago.
Change-Id: I3349cba83daa9bc4765bd9b3f96d15000a801824
2011-07-19 12:45:09 -07:00
Wink Saville
782ed09f2f
am 57aebc61: am f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE
...
* commit '57aebc6109f2059ba335a02bf95928a494cff4ba':
Fix FeatureUser leak in ConnectivityService
2011-07-19 12:42:01 -07:00
Kazuhiro Ondo
aed294985c
am 5abddc73: am bf361b59: Return IMEI SV if CDMA-LTE mode is used
...
* commit '5abddc73a57da304029b6034b13f69079dcbd83a':
Return IMEI SV if CDMA-LTE mode is used
2011-07-19 12:41:58 -07:00
Wink Saville
57aebc6109
am f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE
...
* commit 'f679d4cb92b6d1c193a154abb5ae8fb3a786fc43':
Fix FeatureUser leak in ConnectivityService
2011-07-19 12:39:42 -07:00
Kazuhiro Ondo
5abddc73a5
am bf361b59: Return IMEI SV if CDMA-LTE mode is used
...
* commit 'bf361b59e4e6c1c7c710e73260a77e9937f1fb59':
Return IMEI SV if CDMA-LTE mode is used
2011-07-19 12:39:39 -07:00
Wink Saville
f679d4cb92
Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE
2011-07-19 12:37:18 -07:00
Kazuhiro Ondo
bf361b59e4
Return IMEI SV if CDMA-LTE mode is used
...
IMEI and IMEI SV should be available in CDMA-LTE hybrid system.
IMS SV value is not yet returned.
Bug: 5042972
Change-Id: I733825e95f802605e06887951e226d26baea8ff2
2011-07-19 12:06:12 -07:00
Kazuhiro Ondo
3bed4c9f50
Fix FeatureUser leak in ConnectivityService
...
In case infinite restoral timer is used for a network feature,
FeatureUser could be keep added but never released if a user
is keep calling "startUsingNetworkFeature".
This patch will add duplication check when adding a FeatureUser
into the list in case infinite restoral timer is used.
Bug: 5043513
Change-Id: I47e7076e217f201454fae33ce596ecdc63cf7908
2011-07-19 12:02:01 -07:00
Chet Haase
db94b0a5b0
Merge "Don't constrain invalidation rect when not clipping children"
2011-07-19 11:40:34 -07:00
Romain Guy
566b3efb25
Let HardwareRenderer support multiple threads.
...
This change will be useful to create multiples instances of
HardwareRenderer outside of ViewRootImpl. This will allow
the use of hardware accelerated canvas on TextureView or
for live wallpapers.
Change-Id: I877e43a31ba83d98a1a30556813c7e8a8a920eb5
2011-07-19 11:38:36 -07:00
Jesse Wilson
378c368f20
Remove accidental spaces from expected failure message.
...
Change-Id: I6c004ff09ba12851f57716801d72e9027db00944
2011-07-19 11:29:49 -07:00
Wu-cheng Li
f55df0e26a
Merge "Add camera new picture and new video broadcast intents."
2011-07-19 11:16:20 -07:00
Shimeng (Simon) Wang
50c5d2be63
Merge "Change log msg since viewport can be changed before first layout."
2011-07-19 11:15:49 -07:00
Shimeng (Simon) Wang
a6c5d383a8
Change log msg since viewport can be changed before first layout.
...
Change-Id: I137a897844953bf6b8510b6ee5d6eb89b4b78a6a
2011-07-19 11:07:47 -07:00
James Dong
8a08b0c5a1
Merge "Remove PV AVC decoder"
2011-07-19 11:00:50 -07:00
Chet Haase
a3db866056
Don't constrain invalidation rect when not clipping children
...
View.setClipChidlren(false) allows children to draw outside of their containers.
But logic in ViewGroup.invalidateChildInParent() constrains the invalidation
rectangle to the bounds of the parent, making the flag useless in some situations.
Avoid intersecting the dirty rect with the parent bounds when the parent
is set to not clip its children.
Change-Id: Icc485b539758c96da0bd62ef57974a1bcb94f866
2011-07-19 10:53:36 -07:00
Russell Brenner
359d052a9a
Include DroidSansEthiopic-Regular as fallback font
...
Font file was previously added to source tree with another CL:
https://android-git.corp.google.com/g/117734
Change-Id: I03d33d1f6af950c57093efaf78f36a12bcf82689
2011-07-19 10:42:46 -07:00
Philip Milne
9c79becb48
Merge "Fix build breakage."
2011-07-19 10:36:46 -07:00
Philip Milne
e7dda0bb3d
Fix build breakage.
...
Change-Id: Ifdc2c02c8c18d3d372e6d2043c4819a0a7384c97
2011-07-19 10:35:56 -07:00
Todd Kennedy
783123f79d
Add getBlob() to MatrixCursor
...
Change-Id: I1abfd2fd117a2a31f99e77bd0b395c4ad0cfc6d2
2011-07-19 10:33:41 -07:00
Shimeng (Simon) Wang
ba6e855453
Merge "Add in i18n TLDs and new TLDs to the URL RegEx matcher."
2011-07-19 10:31:52 -07:00
Xavier Ducrohet
c810fffe1f
am 9139868b: am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java"
...
* commit '9139868b6c5cb29b3665984225dceb0193fec31d':
Add dependency generation to Aapt for R.java
2011-07-19 10:23:19 -07:00
Xavier Ducrohet
e242042b81
am bf31250b: am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects"
...
* commit 'bf31250ba0858a2e72a3906a1f0216846683bc2e':
Copy once-created R.java into library projects
2011-07-19 10:23:16 -07:00
Shimeng (Simon) Wang
52fc810f73
Add in i18n TLDs and new TLDs to the URL RegEx matcher.
...
also update APIs.
issue: 4384739
Change-Id: I946323d80f85fe43338fdc19c5858356faefa6cc
2011-07-19 10:20:49 -07:00
Xavier Ducrohet
9139868b6c
am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java"
...
* commit 'ba6c98db8f21016f81ecac35bb0ea3c433044bb7':
Add dependency generation to Aapt for R.java
2011-07-19 10:18:28 -07:00
Xavier Ducrohet
bf31250ba0
am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects"
...
* commit 'd5431ed5505a42e5e33c8bf7cc2ff72792979be9':
Copy once-created R.java into library projects
2011-07-19 10:18:25 -07:00
Fabrice Di Meglio
5f9fa88268
Merge "Test Gallery layout direction."
2011-07-19 10:16:04 -07:00
Xavier Ducrohet
ba6c98db8f
am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java"
...
* commit '82943ecfe2c4266cf3db50326240825fefcaa38f':
Add dependency generation to Aapt for R.java
2011-07-19 10:15:11 -07:00
Xavier Ducrohet
d5431ed550
am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects"
...
* commit '2e659ae59c17a0c0584d35b8c400a294c9d49e12':
Copy once-created R.java into library projects
2011-07-19 10:15:09 -07:00
Xavier Ducrohet
82943ecfe2
am d40c93f6: Merge "Add dependency generation to Aapt for R.java"
...
* commit 'd40c93f61ca5b3f2351b8db716f67b58f1625e85':
Add dependency generation to Aapt for R.java
2011-07-19 10:10:17 -07:00
Xavier Ducrohet
2e659ae59c
am 42755155: Merge "Copy once-created R.java into library projects"
...
* commit '42755155d6e8ddc3201b08def2bf262a64fa25f2':
Copy once-created R.java into library projects
2011-07-19 10:10:15 -07:00
Philip Milne
2e29de7cab
Merge "Gather View's hierarchy notifications into methods that can easily be overidden."
2011-07-19 10:03:43 -07:00
Xavier Ducrohet
d40c93f61c
Merge "Add dependency generation to Aapt for R.java"
2011-07-19 10:03:16 -07:00
Xavier Ducrohet
42755155d6
Merge "Copy once-created R.java into library projects"
2011-07-19 10:03:05 -07:00
Narayan Kamath
d6df906052
Merge "Fix a threading issue in AudioPlaybackHandler"
2011-07-19 10:01:05 -07:00