Commit Graph

3249 Commits

Author SHA1 Message Date
Chung-yih Wang
c7ceaf245e 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
e2d245c287 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
ff1dcc2cf9 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
c76696a276 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
Android (Google) Code Review
9ba91fe794 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
Android (Google) Code Review
abcfe35781 Merge change 9070
* changes:
  Adding resizeInput and setAttributes for overlay
2009-07-30 14:37:48 -07:00
Android (Google) Code Review
391aac8181 Merge change 9198
* changes:
  Fix missed Aggregate->Contact name change.
2009-07-30 13:04:33 -07:00
Android (Google) Code Review
81358e7178 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
69bdcb9b7b Fix a debug statement in BufferMapper 2009-07-30 12:24:41 -07:00
Mathias Agopian
f9cd64bc6c 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
90771a0a57 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
Android (Google) Code Review
80dc4d263e Merge change 9193
* changes:
  Remove hardcoded maximum frame rate limit from the framework bug 1993400
2009-07-30 11:34:25 -07:00
Android (Google) Code Review
7cab489fc4 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
a028696995 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
575cd7e5da 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
51b955a380 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
d574f1b7f5 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
5b5a61de99 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
641b0d42a3 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
999b047cd7 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
c684cc45fd 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
30335775d3 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
4cffc44322 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
ccf407f7ac Add unit tests for netkeystore.
+ some boundary checks.
2009-07-30 16:37:48 +08:00
Android (Google) Code Review
6c8991186e Merge change 9098
* changes:
  CDMA Message Waiting Indication support
2009-07-29 21:47:16 -07:00
Android (Google) Code Review
e84bee9bbf 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
d909f62fd4 Merge change 9090
* changes:
  Simplify image loading.  Use common internal format.
2009-07-29 21:06:23 -07:00
Android (Google) Code Review
8dcdeda608 Merge change 9089
* changes:
  Filmstrip work and boxed bitmap load bugfixes.
2009-07-29 20:57:02 -07:00
Android (Google) Code Review
62cbdad401 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
3945ae5065 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
Android (Google) Code Review
b8bbb85bab Merge change 8974
* changes:
  Fix OOB in arraycopy.
2009-07-29 18:28:12 -07:00
Android (Google) Code Review
bbdde8293f 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
Android (Google) Code Review
d8475b75e6 Merge change 9071 into donut
* changes:
  Fix issue #2018454: NullPointerException in ImageSpan constructor
2009-07-29 18:09:28 -07:00
Benny Wong
e56271109f Adding resizeInput and setAttributes for overlay 2009-07-29 17:53:38 -07:00
Android (Google) Code Review
2ebfce26b3 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
Android (Google) Code Review
f73072310e Merge change 9065
* changes:
  Checkin art assets for film test app and change loading of icons to 8888.
2009-07-29 17:43:05 -07:00
Android (Google) Code Review
f147cea573 Merge change 8966 into donut
* changes:
  Add tests for android.net.vpn.
2009-07-29 17:16:13 -07:00
Android (Google) Code Review
1081e63c88 Merge change 9054
* changes:
  Increase waiting time for data disable action in setPowerStateToDesired().
2009-07-29 17:03:04 -07:00
Android (Google) Code Review
1b08ba865d am 0869f7ef: Merge change 8962 into donut
Merge commit '0869f7ef1efa9fe2e26b20e525952ad611d379aa'

* commit '0869f7ef1efa9fe2e26b20e525952ad611d379aa':
  Log uid and package name when launching intents from search
2009-07-29 16:48:40 -07:00
Android (Google) Code Review
6a3890332f Merge change 9040
* changes:
  Don't offer to add numbers to the dictionary.
2009-07-29 16:48:34 -07:00
Android (Google) Code Review
60627a2df2 am ad346278: Merge change 8208 into donut
Merge commit 'ad346278fe129a341543d4a75bf9cc08c50742f8'

* commit 'ad346278fe129a341543d4a75bf9cc08c50742f8':
  Removing MD2
2009-07-29 16:45:22 -07:00
Android (Google) Code Review
f20466a5cb am 9b91d78a: Merge change 8911 into donut
Merge commit '9b91d78a21f6e66f571169f2c6f2f94e638511e8'

* commit '9b91d78a21f6e66f571169f2c6f2f94e638511e8':
  Fix issue #1999179: search -> click result -> press home = search dialog is shown then hidden
2009-07-29 16:45:14 -07:00
Android (Google) Code Review
e5161be750 Merge change 9052
* changes:
  Less log spew.
2009-07-29 16:43:38 -07:00
Android Git Automerger
061877586c resolved conflicts for merge of 4d4229e4 to master 2009-07-29 16:42:09 -07:00
Android (Google) Code Review
e03785869a Merge change 9035 into donut
* changes:
  Fix the TabWidget to display custom views for the tabs better when the tabs have different sizes.
2009-07-29 15:27:55 -07:00
Android (Google) Code Review
c1c995628e Merge change 9021 into donut
* changes:
  DO NOT MERGE - Fix CNAP-related NullPointerException
2009-07-29 14:52:11 -07:00
Android (Google) Code Review
2b1a8b1390 am 67897b1a: (-s ours) Merge change 8884 into donut
Merge commit '67897b1af7ab7bea1dc3f9caf5f3ee5c026a179d'

* commit '67897b1af7ab7bea1dc3f9caf5f3ee5c026a179d':
  DO NOT MERGE. Already in master. Fix calendar test.
2009-07-29 14:47:50 -07:00
Android (Google) Code Review
e437ff8099 am 1521cd6e: Merge change 8015 into donut
Merge commit '1521cd6e657ba4efa9382ab73d3cbba3bdf50ead'

* commit '1521cd6e657ba4efa9382ab73d3cbba3bdf50ead':
  Reset the mDpiX and mDpiY values when qemu.sf.lcd_density is defined.
2009-07-29 14:47:41 -07:00
Jean-Baptiste Queru
4a26addf74 Merge snapshot variant of donut back into the main tree 2009-07-29 14:31:38 -07:00
Jean-Baptiste Queru
02f54246f5 donut snapshot 2009-07-29 14:25:07 -07:00