OSDN Git Service
Naveen Kalla [Mon, 29 Mar 2010 18:39:01 +0000 (11:39 -0700)]
Support to display message when operation is blocked due to FDN being enabled
The terminal disallows USSD, SMS, Voice Call and Supplementary services
operations for numbers not in the Fixed Dialing Number (FDN) list when the
FDN service is enabled. FDN_CHECK_FAILURE error is sent from the RIL and the
message needs to be displayed to indicate the failure.
Change-Id: I49bd63f69a3f0201125b17cd16db2e8fcf93ddc3
Mathias Agopian [Tue, 11 May 2010 03:28:02 +0000 (20:28 -0700)]
Merge "Build software AGL library with correct get_tls() macro for ARMv7 based platforms"
Mathias Agopian [Tue, 11 May 2010 03:26:24 +0000 (20:26 -0700)]
Merge "Fix glReadPixels() to verify that both x and y are non-negative."
Jean-Baptiste Queru [Mon, 10 May 2010 18:14:01 +0000 (11:14 -0700)]
Merge "Include the API level 4 fields in the Parcel."
Jean-Baptiste Queru [Mon, 10 May 2010 15:55:17 +0000 (08:55 -0700)]
Merge "long modifier was on the wrong argument."
Jean-Baptiste Queru [Fri, 7 May 2010 19:57:02 +0000 (12:57 -0700)]
Merge "Added WEB_URL_PATTERN for Montenegro ".me""
Brad Larson [Tue, 29 Dec 2009 17:47:55 +0000 (11:47 -0600)]
Use isLocationProviderEnabled to test for enabled providers
LocationManagerService was just checking if the string of (comma-separated)
Location Providers contained the provider we were interested in. This works
fine in normal cases, but breaks if we add a provider such as test_network.
Enabling test_network causes LocationManagerService to think that the network
provider is also enabled.
The code in Settings.Secure.isLocationProviderEnabled() checks for the commas
in the string as well, to make sure that a provider name which is a substring
of another provider name won't cause problems. It also centralizes the code
which reads the string.
Signed-off-by: Brad Larson <brad.larson@garmin.com>
Change-Id: I00dfe7c2b09739ed4c8ed07c6167e409b0bf7d13
Mike Lockwood [Thu, 6 May 2010 14:50:13 +0000 (07:50 -0700)]
Merge "GpsLocationProvider: Store new Location before onGpsStatusChanged is sent"
Simon Schoar [Wed, 10 Jun 2009 00:08:57 +0000 (02:08 +0200)]
Added WEB_URL_PATTERN for Montenegro ".me"
Change-Id: If725c5ee08ed840ae8323fa18b1d82ef2a42db87
Jean-Baptiste Queru [Wed, 5 May 2010 23:30:53 +0000 (16:30 -0700)]
Merge "Telephony: Add PUK MMI code support for CDMA RUIM phones"
Jean-Baptiste Queru [Wed, 5 May 2010 23:18:30 +0000 (16:18 -0700)]
Merge "Type Zero Sms should not be displayed/stored/notified."
Jean-Baptiste Queru [Wed, 5 May 2010 20:49:58 +0000 (13:49 -0700)]
Merge "Add new keycodes for the convenience of Japanese IMEs"
mogimo [Fri, 2 Oct 2009 18:13:56 +0000 (03:13 +0900)]
Add new keycodes for the convenience of Japanese IMEs
Change-Id: Ibd308cef11261147856258595f6ca0137e03e05c
Jean-Baptiste Queru [Wed, 5 May 2010 20:15:24 +0000 (13:15 -0700)]
Merge "telephony: Fix CID when CID is unknown"
Jean-Baptiste Queru [Wed, 5 May 2010 18:16:31 +0000 (11:16 -0700)]
Merge "Call register_localized_collators() with the current locale."
Daisuke Miyakawa [Mon, 15 Mar 2010 02:48:39 +0000 (11:48 +0900)]
Call register_localized_collators() with the current locale.
Make JNI function for setLocale() call register_localized_collators()
with the current locale, not previous one, every time it is possible.
This is a partial cherry-pick of
b945639d0c3fa1850c07a2b80f476c8d242a8bde
BUG:
2514026
Change-Id: I584f1f68814dc084e699714e9d14a034123b49da
Dianne Hackborn [Wed, 5 May 2010 06:58:26 +0000 (23:58 -0700)]
Merge "Set alpha value for newly created dim surface."
Jean-Baptiste Queru [Tue, 4 May 2010 22:16:32 +0000 (15:16 -0700)]
Merge "Fix for bug
2467152 files with spaces fail to open."
Nicholas Killewald [Mon, 3 May 2010 06:17:08 +0000 (02:17 -0400)]
Fixed deserialization problem in DatePicker.
During onRestoreInstanceState for DatePicker, the internal
state of the widget is restored properly (thus setting the
internal year, month, and day), but the spinners aren't
visually updated to that state immediately. That is to say,
the internal state of the widget doesn't match the spinners
in that case, which can cause confusion.
Change-Id: I96d1a299d0ee159d41450470acb30a3bf6006d44
Romain Guy [Mon, 3 May 2010 23:25:34 +0000 (16:25 -0700)]
Merge "Fix typo of <p> end tag in appwidgets.xml"
Jean-Baptiste Queru [Mon, 3 May 2010 16:50:38 +0000 (09:50 -0700)]
Adapt to new location of libcore
Change-Id: Ie4fb163fb9f04a96f8412a996d43321accb28cc8
Melanie Clements [Sun, 2 May 2010 02:48:20 +0000 (22:48 -0400)]
Fix for bug
2467152 files with spaces fail to open.
from http://code.google.com/p/android/issues/detail?id=4638
If you try to use a WebView to open an image (of any type)
that is stored in your project's assets/ directory the image
will be written to the screen as text (instead of drawn as
an image) if the filename contains a space.
The problem stems from MimeTypeMap, which determines the
file type from the url. Spaces, represented as '%20'
are not included in the list of acceptable characters for
an image file name, causing the image to be treated as plain
text. I am remedying this by adding '%' to the list.
Change-Id: I29e3da57f3cdaa63ed60b1e6977ba62a0dd108e5
Patrick Tsai [Fri, 30 Apr 2010 16:30:19 +0000 (00:30 +0800)]
Fix typo of <p> end tag in appwidgets.xml
Change-Id: Ic1f4d8ade0d32f3b74decbe557d4275dc2e19466
takuo [Thu, 29 Apr 2010 22:11:53 +0000 (07:11 +0900)]
Parse custom text header and ignore it.
Some MMS carrier append own custom header as text into PduData. We should parse it and ignore it at the moment.
Change-Id: I4d6cf20f5cf99172ebbe310ab18101316eb04c77
takuo [Thu, 29 Apr 2010 20:12:19 +0000 (05:12 +0900)]
Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
And take the first part of parsed as a parent part data.
Change-Id: I2752654f41d642524061802772e2a7eaa10a4e2d
Jean-Baptiste Queru [Thu, 29 Apr 2010 17:03:40 +0000 (10:03 -0700)]
Merge "Fix an NPE in InputMethodService when mExtractAction is null."
Jey [Thu, 19 Nov 2009 02:37:31 +0000 (18:37 -0800)]
'uses-library' was not working for persistent applications.
Fix by generating the applicationInfo, when asked for info.
Change-Id: I44686d5a306562c6649148dce8f709e682adcdf4
Steve Kondik [Tue, 8 Sep 2009 02:53:34 +0000 (22:53 -0400)]
Fix an NPE in InputMethodService when mExtractAction is null.
This happens with certain third-party IMEs.
Fixes: http://code.google.com/p/cyanogenmod/issues/detail?id=231
Change-Id: Idf4349ee9c7c8f73c255745bc65b49ba9b593874
hugh kennedy [Wed, 28 Apr 2010 19:04:10 +0000 (15:04 -0400)]
speling fix
Change-Id: Ia9db6e1c5d1cd31fd028d551cc357a76049ce137
Maciej Białka [Wed, 24 Mar 2010 09:25:40 +0000 (10:25 +0100)]
Set alpha value for newly created dim surface.
Newly created dim surface has alpha set to 1 (opaque),
but it is assumed in dim animation code that it is 0 (transparent).
When new dim surface is created and expected dim value is calculated to 0
then alpha is never set making screen black (dut to default aplha=1)
when dim surface is shown.
Kenny Root [Thu, 22 Apr 2010 03:06:51 +0000 (20:06 -0700)]
Merge "Fix broken logic in SettingsProvider.parseProviderList."
Mike Lockwood [Wed, 21 Apr 2010 22:24:57 +0000 (18:24 -0400)]
Fix broken logic in SettingsProvider.parseProviderList.
We were accidentally stripping both leading and trailing commas
when removing a provider from the enabled provider list.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Michael Richardson [Tue, 3 Nov 2009 22:01:28 +0000 (17:01 -0500)]
Allow META* macros outside of the framework
The META* macros are useful outside of the framework
for other systems implementing Binder interfaces, but
they depend upon the android namespace. This includes
the appropriate namespace operations, which should be
sane even in that android namespace.
Change-Id: If600156c65191f51f487d0ee301d9f9f532b263d
Alex Yakavenka [Tue, 20 Apr 2010 02:44:09 +0000 (19:44 -0700)]
Fix printing order of phone objects creation
Hakan Gustavsson [Tue, 23 Feb 2010 08:12:38 +0000 (09:12 +0100)]
GpsLocationProvider: Store new Location before onGpsStatusChanged is sent
In reportLocation() the new location is now stored before the callback
onGpsStatusChanged(GPS_EVENT_FIRST_FIX) is sent. This will prevent users
from getting a faulty location from LocationManager.getLastKnownLocation()
after receiving onGpsStatusChanged(GPS_EVENT_FIRST_FIX).
Change-Id: I6c654b2acbf2e216c99058a20f068bf4721a1c7a
Jean-Baptiste Queru [Fri, 16 Apr 2010 19:52:47 +0000 (12:52 -0700)]
Unify am startservice commands.
This replaces the implementation with an equivalent one.
Change-Id: I1343ddee9414a67906cd426b8381ddbace873894
Anthony Newnam [Wed, 14 Apr 2010 19:34:41 +0000 (14:34 -0500)]
Allow Am to start services
Change-Id: I31d066ae2c980cc293e55034446a63a0f42088ad
Naveen Kalla [Wed, 17 Mar 2010 16:17:56 +0000 (09:17 -0700)]
Telephony: Add PUK MMI code support for CDMA RUIM phones
Add support to unlock RUIM using PUK. PUK is entered using MMI codes.
Naveen Kalla [Thu, 8 Apr 2010 00:54:33 +0000 (17:54 -0700)]
telephony: Fix CID when CID is unknown
Unknown CID is indicated as 0xFFFFFFFF by ril. When telephony receives that
value, set CID to UNKNOWN.
Dianne Hackborn [Sat, 3 Apr 2010 22:31:54 +0000 (15:31 -0700)]
Merge "Fix reporting of window visibility in WindowManagerService."
Chih-Wei Huang [Wed, 27 May 2009 07:52:50 +0000 (15:52 +0800)]
Add keycodes PageUp and PageDown
This is useful for applications like web browser.
Change-Id: Ie9262d5b75de87ecd0971407a7c3ce9aa6e4998e
David Turner [Tue, 30 Mar 2010 21:50:44 +0000 (14:50 -0700)]
Merge "gl_code : add end of line."
The Android Open Source Project [Tue, 30 Mar 2010 18:13:47 +0000 (11:13 -0700)]
merge from open-source master
Change-Id: Iad50c5ab4915d0868b3f79ea6ba0d657a6f98525
Romain Guy [Tue, 30 Mar 2010 17:54:40 +0000 (10:54 -0700)]
Merge "Fix last character of password field being visible after rotation"
David Hoover [Sun, 28 Mar 2010 15:48:55 +0000 (08:48 -0700)]
Fix typos in comment.
Change-Id: Ia2a9ea0802bcc5773bb4fd52d7e07f9492242bfd
Tatsuo Nagamatsu [Sun, 28 Mar 2010 05:23:51 +0000 (14:23 +0900)]
CursorToBulkCursorAdapter.close must call mCursor.close instead of mCursor.deactivate. This prevent us to call Cursor.close on cross process ContentProvider and may cause a database leak problem.
Change-Id: I126457c1b709e853727f460095b518b0420aa34f
Devin Taylor [Thu, 18 Mar 2010 20:35:11 +0000 (15:35 -0500)]
Fix last character of password field being visible after rotation
This is a fix for http://code.google.com/p/android/issues/detail?id=907. Note that
that issue was declined without comment, but the bug (while incredibly minor)
does exist. This can be seen on the facebook app, as well as many third party apps.
Change-Id: I8f1449c47228f5f757a5baf389656e51c817b150
Naveen Kalla [Wed, 24 Mar 2010 13:46:14 +0000 (06:46 -0700)]
Type Zero Sms should not be displayed/stored/notified.
Type Zero messages indicated by TP_PID field set to value 0x40,
should not be displayed/stored/notified. They should only be
acknowledged.
Dianne Hackborn [Fri, 26 Mar 2010 02:23:09 +0000 (19:23 -0700)]
Merge "Fix Memory Leak When Switching Input Methods"
viral.vkm [Thu, 25 Mar 2010 12:20:57 +0000 (17:50 +0530)]
setCornerRadii should be called when either of corners radius is specified
as 0dp and thus while checking for condition, it should be ORed and not ANDed.
It solves Android Issue: 939
http://code.google.com/p/android/issues/detail?id=939
Change-Id: Ic18fae769480972f763f634e7462c6ed3853220b
Jae-Hyung Ahn [Mon, 30 Nov 2009 08:30:21 +0000 (17:30 +0900)]
gl_code : add end of line.
Signed-off-by: Jae-Hyung Ahn <jerry.ahn@windriver.com>
Maciej Białka [Wed, 24 Mar 2010 09:20:52 +0000 (10:20 +0100)]
Fix reporting of window visibility in WindowManagerService.
WindowManagerService (WMS) can wrongly report windows visibility due
to wrong handling of "starting windows".
"Starting windows" are special temporary windows that are displayed
while the application is starting.
Sometimes "starting windows" are considered when checking visibility
what leads to not reported or wrongly reported visibility status.
If visibility is not reported correctly some internal flows are
not executed and WMS internal state can be wrong.
The Android Open Source Project [Mon, 22 Mar 2010 23:13:27 +0000 (16:13 -0700)]
merge from open-source master
Change-Id: I6d111015c27324b9ae94ac4701ba1a7187f97ee8
Mathias Agopian [Mon, 22 Mar 2010 20:17:50 +0000 (13:17 -0700)]
Merge "Updated to WMM2010"
Nick Pelly [Mon, 22 Mar 2010 14:07:15 +0000 (07:07 -0700)]
Merge "Everytime Bluetooth was turned off two file descriptors were not closed"
The Android Open Source Project [Fri, 19 Mar 2010 23:36:32 +0000 (16:36 -0700)]
merge from open-source master
Change-Id: I23af6296f0867bea2a2da72d4eb3dda93025b1ac
Wink Saville [Thu, 18 Mar 2010 19:01:07 +0000 (12:01 -0700)]
Merge "Retry pending memory status update to modem when radio is ON."
Johannes Carlsson [Mon, 8 Mar 2010 09:19:31 +0000 (10:19 +0100)]
Everytime Bluetooth was turned off two file descriptors were not closed
Using close instead of shutdown on the file descriptors and only clear the file
descriptor that was closed. If both file descriptors are cleared the thread
will not be able to close it.
Rodrigo Damazio Bovendorp [Tue, 16 Mar 2010 00:19:59 +0000 (21:19 -0300)]
Updated to WMM2010
Change-Id: I5937eed4a8775eae044500552ec81030b93acb18
Josh Bartel [Thu, 25 Feb 2010 16:55:48 +0000 (10:55 -0600)]
Synchronize access to *Locked() functions
Several places were calling *Locked() functions without properly
synchronizing.
Change-Id: Ie39b6592da8bb5f4a5a1e738c45f228256116ec4
Josh Bartel [Thu, 25 Feb 2010 17:01:44 +0000 (11:01 -0600)]
Rename functions which ought to be named *Locked()
Several functions operate on variables to which access needs to be
synchronized. However, it happens that the functions in question
are only ever called from places which have already synchronized.
Therefore, nothing is really wrong, but the functions ought to
have 'Locked' appended to their names, to indicate that it is the
caller's responsibility to synchronize before calling them.
Change-Id: I44e7dc0dff6da9436677cb10908dce41ffeba195
The Android Open Source Project [Tue, 9 Mar 2010 00:43:28 +0000 (16:43 -0800)]
merge from open-source master
Change-Id: Ib18c1121d51bd176e0de1666cad19ef10261825a
Kenneth Andersson [Fri, 5 Mar 2010 08:16:24 +0000 (09:16 +0100)]
Title in DatePickerDialog used in Settings application not updated correctly
The DatePickerDialog in the Settings application is not updated correctly if you follow
the following step-by-step:
1. Enter Date option in settings application
2. Modify the values of the date, then cancel the changes
3. Once again enter the date option
and you can see that the title in the dialog has not been updated correctly. This is
due to a missing call to onDateChanged callback in the DatePicker class. Solution was
to add the notify call when updateTime has been called.
Naveen Kalla [Thu, 4 Mar 2010 02:54:36 +0000 (18:54 -0800)]
Retry pending memory status update to modem when radio is ON.
When radio is powered off / airplane mode, memory status updates are
ignored by RIL. With this fix, pending memory status updates are sent
again when radio is powered back on.
The Android Open Source Project [Mon, 1 Mar 2010 17:30:21 +0000 (09:30 -0800)]
merge from open-source master
Magnus Edlund [Wed, 24 Feb 2010 14:45:06 +0000 (15:45 +0100)]
Fix problem with restarting an application process that recently has died.
There exists a race condition when starting a process that recently has died.
If the ActivityManager receives the death notification for the died process
after the new process has been started but before an application thread has
been attached to the new process will the newly created process be removed
during the cleanup of the died process. If this happens when sending a broadcast
could it result in an ANR.
This is solved by doing the clean up before starting a new process that uses
the same process record.
The Android Open Source Project [Thu, 25 Feb 2010 22:54:51 +0000 (14:54 -0800)]
merge from open-source master
Mike Lockwood [Wed, 24 Feb 2010 18:25:40 +0000 (13:25 -0500)]
Move LocationTracker test app from vendor/google to frameworks/base/tests
Change-Id: I49f1bfe2081f2c48fcb22b74aa2377857c2bae6d
Signed-off-by: Mike Lockwood <lockwood@android.com>
The Android Open Source Project [Wed, 24 Feb 2010 18:02:55 +0000 (10:02 -0800)]
merge from open-source master
The Android Open Source Project [Wed, 24 Feb 2010 17:11:10 +0000 (09:11 -0800)]
merge from open-source master
Devin Taylor [Tue, 23 Feb 2010 19:26:46 +0000 (13:26 -0600)]
Fix Memory Leak When Switching Input Methods
Fixes a memory leak when input methods are switched. Uses a variety of methods
to avoid holding a reference to the InputMethodService which created the binders,
which was leaking those InputMethodServices.
See http://code.google.com/p/android/issues/detail?id=6661 for reproduction steps.
Romain Guy [Wed, 24 Feb 2010 06:23:21 +0000 (22:23 -0800)]
Merge "These changes add access to some status values in widgets listed below:"
Steve Zeigler [Wed, 24 Feb 2010 00:39:08 +0000 (16:39 -0800)]
These changes add access to some status values in widgets listed below:
widget/CheckedTextView.java: report if the item is checked or not.
widget/CompoundButton.java: report if the item is checked or not.
widget/ProgressBar.java: isIndeterminate(), getProgress(), getSecondaryProgress(), and getMax() report what
sliders and progress bars are showing
widget/TextView.java: report the current selection: getSelectionStart() and getSelectionEnd()
Eric Laurent [Mon, 22 Feb 2010 19:13:08 +0000 (11:13 -0800)]
Eric Laurent [Mon, 22 Feb 2010 09:37:19 +0000 (01:37 -0800)]
Fix issue
2459650.
This change fixes a problem where an unwanted tone is generated by audio policy manager when a MT call is answered.
This is because of a policy that replaces high visibility system sounds (ringtones, alarms...) by a beep when in call.
There is a transitory phase while the call is being answered where the phone state is changed to IN_CALL but the
ringtone is still playing. The audio policy manager then mutes the end of the ringtone and starts playing a beep
in replacement because the ringtone is categorized as high visibility.
The fix consists in changing the ringtone stream type from high visibility to low visibility. This is not a problem as
the only actual use case where a ringtone would be generated while in call is if another call is received.
But in this case, the phone system does not generate a ringtone but a call waiting tone instead.
It is therefore not required to handle a ringtone as a high visibiltiy tone that must be somehow signaled to the user
while in call.
Magnus Landqvist [Fri, 19 Feb 2010 11:06:59 +0000 (12:06 +0100)]
Build software AGL library with correct get_tls() macro for ARMv7 based platforms
This prevents crashes on snapdragon processors.
Joe Onorato [Thu, 18 Feb 2010 12:52:46 +0000 (04:52 -0800)]
am
ee3bbefd: Merge "Don\'t crash the system process when apps give us a bad foreground service notification." into eclair
Merge commit '
ee3bbefd34fd5330ebbc59175a328197ab7526af' into eclair-plus-aosp
* commit '
ee3bbefd34fd5330ebbc59175a328197ab7526af':
Don't crash the system process when apps give us a bad foreground service notification.
Joe Onorato [Thu, 18 Feb 2010 12:46:32 +0000 (04:46 -0800)]
Merge "Don't crash the system process when apps give us a bad foreground service notification." into eclair
Joe Onorato [Thu, 18 Feb 2010 12:45:17 +0000 (07:45 -0500)]
Don't crash the system process when apps give us a bad foreground service notification.
Romain Guy [Thu, 18 Feb 2010 05:22:52 +0000 (21:22 -0800)]
Romain Guy [Thu, 18 Feb 2010 05:17:48 +0000 (21:17 -0800)]
Romain Guy [Wed, 10 Feb 2010 19:29:22 +0000 (11:29 -0800)]
Manual merge of 40245 (
ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
Prevent infinite loop in the Phone UI.
Romain Guy [Wed, 10 Feb 2010 02:50:08 +0000 (18:50 -0800)]
Manual merge of 40170 (
b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE
Fix the lock screen.
Romain Guy [Thu, 18 Feb 2010 05:10:34 +0000 (21:10 -0800)]
am
8368ef0b: Manual merge of 40080 DO NOT MERGE Properly notifies listener when an animation is cancelled. Bug: #
2428005.
Merge commit '
8368ef0b670f8193f3161671b119e78b1fb659a1' into eclair-plus-aosp
* commit '
8368ef0b670f8193f3161671b119e78b1fb659a1':
Manual merge of 40080 DO NOT MERGE
Romain Guy [Tue, 9 Feb 2010 19:30:44 +0000 (11:30 -0800)]
Manual merge of 40080 DO NOT MERGE
Properly notifies listener when an animation is cancelled.
Bug: #
2428005.
android-build SharedAccount [Tue, 16 Feb 2010 20:53:04 +0000 (12:53 -0800)]
android-build SharedAccount [Fri, 12 Feb 2010 01:09:16 +0000 (17:09 -0800)]
cherry pick
d60e29009c1049a9776e6630e9489e1ef3f83491
Revert "Add null checks when scanning a package."
This reverts commit
9e7ac3ba8405f22c11629091449ff35a06b72055.
Wink Saville [Sat, 13 Feb 2010 17:42:07 +0000 (09:42 -0800)]
am
6b178e47: Merge "Always assume evdoXxxx signal strength values are correct." into eclair
Merge commit '
6b178e472266052b4a9b28b1e4a5cef07f1ebf8b' into eclair-plus-aosp
* commit '
6b178e472266052b4a9b28b1e4a5cef07f1ebf8b':
Always assume evdoXxxx signal strength values are correct.
Wink Saville [Sat, 13 Feb 2010 17:36:17 +0000 (09:36 -0800)]
Merge "Always assume evdoXxxx signal strength values are correct." into eclair
Wink Saville [Sat, 13 Feb 2010 15:56:20 +0000 (07:56 -0800)]
Always assume evdoXxxx signal strength values are correct.
This solves a race condition between the network type changing and
a signal strength changing. This could cause StatusBarPolicy to see
the -1 values for the evdo strength parameters and hence 0 bars would
be displayed.
Bug:
2419251
Change-Id: Iba0bdbd2023b6a5e49fc1f82c997ec3219158286
Xavier Ducrohet [Sat, 13 Feb 2010 01:52:28 +0000 (17:52 -0800)]
am
2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair
Merge commit '
2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a' into eclair-plus-aosp
* commit '
2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a':
Add --auto-add-overlay option to aapt. DO NOT MERGE
Xavier Ducrohet [Sat, 13 Feb 2010 01:48:36 +0000 (17:48 -0800)]
Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair
Xavier Ducrohet [Fri, 5 Feb 2010 02:45:31 +0000 (18:45 -0800)]
Add --auto-add-overlay option to aapt. DO NOT MERGE
This option allows resources only present in overlays to be
added automatically instead of being declared through <add-resource>
(merge from master)
Change-Id: I5f402a1fa7213d18724d91f84bc05ef39ace2ed9
Scott Main [Fri, 12 Feb 2010 23:29:27 +0000 (15:29 -0800)]
am
19bc31c3: Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair
Merge commit '
19bc31c32d75ebebacd85cac2cf4c31108329613' into eclair-plus-aosp
* commit '
19bc31c32d75ebebacd85cac2cf4c31108329613':
docs: remove old tutorial and sample pages from the sitemap
Scott Main [Fri, 12 Feb 2010 23:25:44 +0000 (15:25 -0800)]
Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair
Scott Main [Fri, 12 Feb 2010 23:24:13 +0000 (15:24 -0800)]
docs: remove old tutorial and sample pages from the sitemap
Jason Sams [Fri, 12 Feb 2010 19:27:01 +0000 (11:27 -0800)]
am
0b9bbb6d: DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
Merge commit '
0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8' into eclair-plus-aosp
* commit '
0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8':
DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
Jason Sams [Fri, 12 Feb 2010 02:16:21 +0000 (18:16 -0800)]
DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
Committer: Jason Sams <rjsams@android.com>
On branch droid
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: libs/rs/rsAllocation.cpp
modified: libs/rs/rsAllocation.h
modified: libs/rs/rsContext.cpp
modified: libs/rs/rsContext.h
modified: libs/rs/rsProgram.cpp
modified: libs/rs/rsProgram.h
Delete the old rollo sample which is obsolete.
Fix film init
Begin gl2 support. Renderscript still uses GL1.1 by default. However, 2.0 can be enabled and will render most tests correctly.
Fix film
Beging GL2 user shaders. Switch master to using GL2 by default.
Implement RS tracked defered texture and buffer object uploads.
Committer: Jason Sams <rjsams@android.com>
On branch droid
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: libs/rs/rsAllocation.cpp
modified: libs/rs/rsAllocation.h
modified: libs/rs/rsContext.h
modified: libs/rs/rsProgramFragment.cpp
modified: libs/rs/rsSimpleMesh.cpp
Remove check for surface valid that is no longer valid.
Continue development of es2.0 user shader support for renderscript. This change cleans up ProgramVertex creation and adds support for passing input, output, and constant type info.
Continue es2 shader dev
Conflicts:
graphics/java/android/renderscript/Program.java
graphics/java/android/renderscript/ProgramVertex.java
Place shader logging behind prop to declutter logs.
Fix emulated glColor in es2 mode.
Fix live wallpaper many. Z coordinate was being ignored for draw quad call.
Add argument checking to sampler builder to disallow illegal modes.
Move texture bindings to base program object. Change ProgramFragment creation to require a texture format in 1.0 mode.
Element restructuring. Add support for new basic Element types including the RS objects and vectors(2-4). In theory this paves the way for maintaining type info for RS objects, passing elements for GLSL uiforms/attribs/varyings, and supporting nested structures.
This will break some apps, checkings for other projects will follow to unbreak them.
Disable excessive RS logging.
Add RS support for generic attribs as input to vertex programs.
More complete support for named attribs. Adds user typed attribs as available to programVertex. Non user attribs are not treated like user for GL2 for simplicity.
Support npot on es 2.0 HW.
Change user attribs to look for empty slot rather than using them in order. Prevents conflict with numbered legacy slots.
Fix npot but where mipmap level sizes were rounding in the wrong direction. Should always be floor.
Implement type generation for user uniforms in vertex shader.
Remove excessive logging, fix error in GLSL uniform generation.
Fix RS mipmap generation for 8 bit alpha textures.
Cleanup seperation of Legacy and user attribs. All user programs now use the new names. Legacy vertex attribs are given default names.
Fix some minor bugs with GL state setup that were exposed by Droids driver.
Implement drawSpriteCropped on es2.0
The Android Open Source Project [Thu, 11 Feb 2010 18:03:02 +0000 (10:03 -0800)]
merge from open-source master
Eric Laurent [Thu, 11 Feb 2010 17:34:59 +0000 (09:34 -0800)]
am
c1eba82b: Merge "Fix issue:
2413494: Add TTY support." into eclair
Merge commit '
c1eba82ba479006045c1d7a4c8ceba116a9602d1' into eclair-plus-aosp
* commit '
c1eba82ba479006045c1d7a4c8ceba116a9602d1':
Fix issue:
2413494: Add TTY support.