54917 Commits

Author SHA1 Message Date
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
Narayan Kamath
f1cf82f65d Merge "Return the play stayed locked." 2011-07-19 10:00:58 -07:00
Philip Milne
f51d91c3ab Gather View's hierarchy notifications into methods that can easily be overidden.
Also:

. Remove backward compatibility Group class now that AppsCustomizePagedView has been updated.

Change-Id: Ie3eabbdf57a539b28cdc3fd6d48cd984a4014960
2011-07-19 09:51:56 -07:00
James Dong
d2a9852c13 Remove PV AVC decoder
Change-Id: Icf056c852f95b5d6a07473728ddbf5b641990381
2011-07-19 09:42:42 -07:00
Narayan Kamath
06e0333c7e Return the play stayed locked.
I believe the the synchronized block is required to allow
other threads to observe changes to mPlayState in a timely
manner.

Change-Id: I502b7401196c42932c9667ef73eb4cae16c3da16
2011-07-19 15:43:52 +01:00
Chet Haase
7dde1c8ccc Merge "Don't recreate view's display list when size hasn't changed" 2011-07-19 07:21:03 -07:00
Narayan Kamath
a36cce06a6 Fix a threading issue in AudioPlaybackHandler
Never allow the AudioTrack to be observed in a state where
it is release()d but non null.

Change-Id: I1e5b61355f30c2aafcd55ecdf83077d7a9d99c66
2011-07-19 12:43:17 +01:00
satok
35be3dee17 Merge "Hide "Configure input method" button when the screen is locked." 2011-07-18 20:43:24 -07:00
satok
4273ed652a Merge "Enable IMEs to set additional subtypes in background" 2011-07-18 20:42:54 -07:00
satok
f90a33e92a Hide "Configure input method" button when the screen is locked.
Bug: 5022109

Change-Id: I5c6b59044d03b3f0335de1f602d1c3749b038c75
2011-07-19 12:21:39 +09:00
Jeff Brown
d61752d7e6 Merge "Fix drag and drop regression. Bug: 5032496" 2011-07-18 20:08:48 -07:00
Jeff Brown
13589b2f17 Merge "Remove an unnecessary finalizer." 2011-07-18 19:47:10 -07:00
Bart Sears
07229314af Merge "Revert "Add in i18n TLDs and new TLDs to the URL RegEx matcher."" 2011-07-18 19:45:33 -07:00
Bart Sears
89006fa55c Revert "Add in i18n TLDs and new TLDs to the URL RegEx matcher."
This reverts commit 6050cf65dbdf52f52325dc4513156f9404ffe9d8
2011-07-18 19:43:07 -07:00
Adam Powell
32910e722b Merge "Fix bug 5031652 - offer a way to associate metadata with an ActionMode" 2011-07-18 19:40:17 -07:00
Todor Kalaydjiev
2d6080df99 Merge "Manually bring change Ie8fb8162 to master ("Add images to ERI icon list"). Fixes b/4604593." 2011-07-18 18:45:36 -07:00
Wink Saville
865e684652 am 6e8c7dd2: am cd4636ec: Add LteOnCdmaDevice system property.
* commit '6e8c7dd2128b2a46f5d56ed46d4d530af6ad38f5':
  Add LteOnCdmaDevice system property.
2011-07-18 18:42:41 -07:00
Wink Saville
6e8c7dd212 am cd4636ec: Add LteOnCdmaDevice system property.
* commit 'cd4636ec08a50ab890acab0cf0c3c3f07f91896a':
  Add LteOnCdmaDevice system property.
2011-07-18 18:39:41 -07:00
Jeff Brown
ea4265512c Fix drag and drop regression.
Bug: 5032496

Change-Id: I6504df1261f563092dadc84155d413f43e921ab8
2011-07-18 18:09:15 -07:00
Shimeng (Simon) Wang
35ca86d8a4 Merge "Add in i18n TLDs and new TLDs to the URL RegEx matcher." 2011-07-18 18:04:51 -07:00