Commit Graph

5670 Commits

Author SHA1 Message Date
Chung-yih Wang
9225dfa70c am f4692640: Add unit tests for netkeystore.
Merge commit 'f4692640a8c40b8bbba1f00841c2f8fbe7b28d7a'

* commit 'f4692640a8c40b8bbba1f00841c2f8fbe7b28d7a':
  Add unit tests for netkeystore.
2009-07-30 16:05:39 -07:00
Android (Google) Code Review
cb798bcf13 am 73139aea: Merge change 9075 into donut
Merge commit '73139aead7203c22f3a4abb5e9fd8abd5ef249b1'

* commit '73139aead7203c22f3a4abb5e9fd8abd5ef249b1':
  Change the resource path for fwd locked apps when scanning the fwd locked install
2009-07-30 16:05:33 -07:00
Android (Google) Code Review
afcf686cb0 am 25dff70f: Merge change 9039 into donut
Merge commit '25dff70f153529b87f5ad4a92f4de21e8950b1de'

* commit '25dff70f153529b87f5ad4a92f4de21e8950b1de':
  Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA
2009-07-30 16:05:27 -07:00
Android (Google) Code Review
8845ea0592 Merge change 9245
* changes:
  Remove android:multiprocess from ShutdownActivity to ensure it runs in the system process.
2009-07-30 15:29:21 -07:00
Mike Lockwood
49f746823e Remove android:multiprocess from ShutdownActivity to ensure it runs in the system process.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-30 15:27:00 -07:00
Android (Google) Code Review
a0afa2dc86 Merge change 9236
* changes:
  Implement bitmap resource loaders for utility.  cleanup rolloRS and checkin maps.png which was missing.
2009-07-30 14:58:14 -07:00
Jason Sams
dba3ba5b5b Implement bitmap resource loaders for utility. cleanup rolloRS and checkin maps.png which was missing. 2009-07-30 14:56:12 -07:00
Android (Google) Code Review
e7f03253f9 Merge change 9070
* changes:
  Adding resizeInput and setAttributes for overlay
2009-07-30 14:37:48 -07:00
Android (Google) Code Review
b995b21d67 Merge change 9198
* changes:
  Fix missed Aggregate->Contact name change.
2009-07-30 13:04:33 -07:00
Android (Google) Code Review
af3d2be76d Merge changes 9206,9207
* changes:
  Fix a debug statement in BufferMapper
  NPOT EGLimage without GL_ARB_texture_non_power_of_two would be improperly scalled
2009-07-30 12:31:47 -07:00
Mathias Agopian
5e631892fb Fix a debug statement in BufferMapper 2009-07-30 12:24:41 -07:00
Mathias Agopian
f293b2ff78 NPOT EGLimage without GL_ARB_texture_non_power_of_two would be improperly scalled
The current gralloc allocates buffer memory for render targets that will typically have NPOT dimensions. Assuming that the vendor driver supports converting the resulting NPOT android_native_buffer_t to a NPOT EGLImage, SurfaceFlinger calls glEGLImageTargetTexture2DOES(), and uses glGetError() to test whether the GL can support creating an EGL target texture with the specified NPOT EGLImage. If it is supported, the DIRECT_TEXTURE flag remains set, otherwise it is cleared.

Tangentially, if the driver advertises the GL_ARB_texture_non_power_of_two extension, the NPOT_EXTENSION flag is set, otherwise it is cleared.

If the driver supported creating an EGL target texture from a NPOT source EGLImage, it implicitly creates a NPOT texture. This does not need any glScalef() texture coordinate correction in LayerBase::drawWithOpenGL(). However, the same driver may not advertise the GL_ARB_texture_non_power_of_two extension nor generally support NPOT textures that were not derived from EGLImages. So SurfaceFlinger may flag only DIRECT_TEXTURE, not NPOT_EXTENSION.

Therefore, the test in LayerBase::drawWithOpenGL() should only perform the glScalef() if neither NPOT_EXTENSION or DIRECT_TEXTURE are flagged. Otherwise scaling is applied to NPOT EGL target textures when none is required.
2009-07-30 12:19:10 -07:00
Android (Google) Code Review
396dbf45e3 Merge change 9175
* changes:
  Fix 2016808. We used to send the new scale/scroll info to the UI thread after WebCore finish the first layout. As the picture in the UI thread is still the previous one, if there is a UI update happened before we generate the new picture, the new scale/scroll will be applied to the old picture.
2009-07-30 12:02:45 -07:00
Evan Millar
ac39b26b51 Fix missed Aggregate->Contact name change. 2009-07-30 11:46:13 -07:00
Android (Google) Code Review
5483c50688 Merge change 9193
* changes:
  Remove hardcoded maximum frame rate limit from the framework bug 1993400
2009-07-30 11:34:25 -07:00
Grace Kloba
ef347ef910 Fix 2016808. We used to send the new scale/scroll info to the UI thread after
WebCore finish the first layout. As the picture in the UI thread is still
the previous one, if there is a UI update happened before we generate the new
picture, the new scale/scroll will be applied to the old picture.

On the other hand, we do want to trigger the resize for the new page after
the first layout. e.g. The page was at nytimes.com. Now user types google.com.
google.com is first layout in the wide viewport where nytimes.com is. We dont
want to show that picture. We would like to show the fit to screen version of
google.com as the first picture.

Remove the SnapToAnchor code which is left over from previous zoom attempt.
2009-07-30 11:20:32 -07:00
James Dong
cbe7c5441c Remove hardcoded maximum frame rate limit from the framework
bug 1993400
2009-07-30 11:16:11 -07:00
Mike Lockwood
bad80e0dcc Add Activity Intent.ACTION_REQUEST_SHUTDOWN for requesting a system shutdown.
The Intent.EXTRA_KEY_CONFIRM extra can be set to require user confirmation before shutting down.
The ACTION_REQUEST_SHUTDOWN Intent is protected by android.permission.SHUTDOWN.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-30 10:16:28 -07:00
johnwang
d2fb980060 Represent SID/NID in decimal format.
Interpret SID/NID ad decimal and add try/catch block to prevent crashing in wrong format. Update SID/NID comments.

	modified:   java/com/android/internal/telephony/CommandsInterface.java
	modified:   java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
2009-07-30 10:10:19 -07:00
Android (Google) Code Review
dcfc5c2318 am b91e2b02: Merge change 9073 into donut
Merge commit 'b91e2b0292f9f4f76175a18e6e3cf392f3967ae8'

* commit 'b91e2b0292f9f4f76175a18e6e3cf392f3967ae8':
  Special-case search within the browser to not show the app icon
2009-07-30 09:57:42 -07:00
Android (Google) Code Review
cdc50d779b am c6eb5ac9: Merge change 9071 into donut
Merge commit 'c6eb5ac988518f41938c4f021003d6c202d84819'

* commit 'c6eb5ac988518f41938c4f021003d6c202d84819':
  Fix issue #2018454: NullPointerException in ImageSpan constructor
2009-07-30 09:57:32 -07:00
Android (Google) Code Review
0c05edf0c5 am 9c71716e: Merge change 9063 into donut
Merge commit '9c71716e3de9b6a7e1830cae13da35ebdeeaaa80'

* commit '9c71716e3de9b6a7e1830cae13da35ebdeeaaa80':
  Fixing bug #2023024 - there is an out of bounds exception that
2009-07-30 09:57:23 -07:00
Android (Google) Code Review
2a8c531bac am 65e5438d: Merge change 8966 into donut
Merge commit '65e5438df929ceb8c44fd930b2a363e021914bd0'

* commit '65e5438df929ceb8c44fd930b2a363e021914bd0':
  Add tests for android.net.vpn.
2009-07-30 09:57:02 -07:00
Robert Greenwalt
0cbdb39991 am 41c10433: Fix MulticastLock API to match WifiLock API.
Merge commit '41c104339951e0e5e78240e1f48455c21b3ba5fd'

* commit '41c104339951e0e5e78240e1f48455c21b3ba5fd':
  Fix MulticastLock API to match WifiLock API.
2009-07-30 09:56:45 -07:00
Android (Google) Code Review
ba272be725 Merge change 9097
* changes:
  Wifi: Add support for enabling Wifi while in airplane mode.
2009-07-30 08:35:03 -07:00
Android (Google) Code Review
c17ae711e9 am 0067057c: Merge change 9035 into donut
Merge commit '0067057c31720f64926d6ee3d841b15dc197d2df'

* commit '0067057c31720f64926d6ee3d841b15dc197d2df':
  Fix the TabWidget to display custom views for the tabs better when the tabs have different sizes.
2009-07-30 06:57:23 -07:00
Android (Google) Code Review
0d39ce852e am 3d716ed6: (-s ours) Merge change 9021 into donut
Merge commit '3d716ed6a3274cc49dc08029d7ace683b99200ac'

* commit '3d716ed6a3274cc49dc08029d7ace683b99200ac':
  DO NOT MERGE - Fix CNAP-related NullPointerException
2009-07-30 06:57:14 -07:00
Jean-Baptiste Queru
95528d4384 am f4dc9da3: Merge snapshot variant of donut back into the main tree
Merge commit 'f4dc9da3724c20837e3a361060acd139775541ac'

* commit 'f4dc9da3724c20837e3a361060acd139775541ac':
  donut snapshot
2009-07-30 06:57:04 -07:00
Android (Google) Code Review
cdc0d941e8 am 2bad713f: Merge change 8860 into donut
Merge commit '2bad713f31d642d5350949b90b3abe00fbd9ca55'

* commit '2bad713f31d642d5350949b90b3abe00fbd9ca55':
  Fix bug 2017664
2009-07-30 06:56:37 -07:00
Wink Saville
98ad09880b am b307c894: Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.
Merge commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0'

* commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0':
  Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.
2009-07-30 06:56:24 -07:00
Chung-yih Wang
f4692640a8 Add unit tests for netkeystore.
+ some boundary checks.
2009-07-30 16:37:48 +08:00
Android (Google) Code Review
1d359556d8 Merge change 9098
* changes:
  CDMA Message Waiting Indication support
2009-07-29 21:47:16 -07:00
Mike Lockwood
bd5ddf01e4 Wifi: Add support for enabling Wifi while in airplane mode.
If the new system settings value for AIRPLANE_MODE_TOGGLEABLE_RADIOS
contains RADIO_WIFI, then the user will be allowed to enable Wifi
while in airplane mode.
Turning on airplane mode will still disable Wifi, but the user will
be free to reenable it in the Settings app.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-29 21:37:14 -07:00
Android (Google) Code Review
73139aead7 Merge change 9075 into donut
* changes:
  Change the resource path for fwd locked apps when scanning the fwd locked install directory
2009-07-29 21:14:34 -07:00
Android (Google) Code Review
6502a380ad Merge change 9090
* changes:
  Simplify image loading.  Use common internal format.
2009-07-29 21:06:23 -07:00
Jason Sams
0ea8c8a7c0 Simplify image loading. Use common internal format. 2009-07-29 21:05:11 -07:00
Android (Google) Code Review
7518f16793 Merge change 9089
* changes:
  Filmstrip work and boxed bitmap load bugfixes.
2009-07-29 20:57:02 -07:00
Jason Sams
faf1520be7 Filmstrip work and boxed bitmap load bugfixes. 2009-07-29 20:55:44 -07:00
yong liu
c84401fb8b CDMA Message Waiting Indication support
Add support for Message Waiting Info Record defined in 3GPP2 C.S-0005
and used for voice mail count by some CDMA networks
2009-07-29 20:54:03 -07:00
Yong Zhang
96f2747dd6 Fix wrong Singal Strength interpretation.
The issue this change fixes is that phone status bar shows full
signal strength bar even when phone is in bad signal area. The
root cause is that the signal strenth  is incorrectly interpreted.
2009-07-29 20:39:52 -07:00
Android (Google) Code Review
25dff70f15 Merge change 9039 into donut
* changes:
  Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA
2009-07-29 19:44:48 -07:00
Dianne Hackborn
0d221012ff Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA
It turns out we were not returning the density for anything retrieved from a
TypedArray...  which basically means any bitmap references from a layout or style...!!!

This is now fixed.

Also fiddle with the density compatibility mode to turn on smoothing in certain situations,
helping the look of things when they need to scale and we couldn't do the scaling at
load time.
2009-07-29 19:44:01 -07:00
Suchi Amalapurapu
f2c1072a3b Change the resource path for fwd locked apps when scanning the fwd locked install
directory
2009-07-29 18:29:19 -07:00
Android (Google) Code Review
206b7b1709 Merge change 8974
* changes:
  Fix OOB in arraycopy.
2009-07-29 18:28:12 -07:00
Android (Google) Code Review
b91e2b0292 Merge change 9073 into donut
* changes:
  Special-case search within the browser to not show the app icon to the left of the search field. Also, because this removes context about whether you're in browser search or global search, we make sure to clear any entered text if you jump out to global search from within browser search.
2009-07-29 18:20:18 -07:00
Mike LeBeau
5a7d752b65 Special-case search within the browser to not show the app icon
to the left of the search field. Also, because this removes context
about whether you're in browser search or global search, we make
sure to clear any entered text if you jump out to global search from
within browser search.

This is a really ugly hack, but was required by the UI team. We will
find a better way to reconcile in Eclair.
2009-07-29 18:17:13 -07:00
Android (Google) Code Review
c6eb5ac988 Merge change 9071 into donut
* changes:
  Fix issue #2018454: NullPointerException in ImageSpan constructor
2009-07-29 18:09:28 -07:00
Dianne Hackborn
0cd6376fa1 Fix issue #2018454: NullPointerException in ImageSpan constructor 2009-07-29 17:55:58 -07:00
Benny Wong
4ccee716f8 Adding resizeInput and setAttributes for overlay 2009-07-29 17:53:38 -07:00
Android (Google) Code Review
9c71716e3d Merge change 9063 into donut
* changes:
  Fixing bug #2023024 - there is an out of bounds exception that can happen if services are going away as the AccessibilityManagerService is trying to dispatch notifications to these services. Catching this exception and bailing because having this exception means that there are no more services around that need to get this notification.
2009-07-29 17:48:56 -07:00