Commit Graph

12109 Commits

Author SHA1 Message Date
Jason Sams
8dcb4233fc am 4834887e: am 4dd6fee7: Merge change Ieb4b0318 into eclair
Merge commit '4834887e6cb7a69c7a63d939d6706bd52a0e5bfa' into eclair-mr2-plus-aosp

* commit '4834887e6cb7a69c7a63d939d6706bd52a0e5bfa':
  Make default vertex program correctly track surface size.
2009-11-13 09:26:51 -08:00
Jaikumar Ganesh
d96c94aa93 am ae29ac17: am 572e0087: Merge change Idfc116fe into eclair
Merge commit 'ae29ac179ee579234ecc6ed590e00d30831e02f8' into eclair-mr2-plus-aosp

* commit 'ae29ac179ee579234ecc6ed590e00d30831e02f8':
  Return null if SIM doesn't have the MSISDN Aplha tag.
2009-11-13 09:26:38 -08:00
Mathias Agopian
da5e90bee4 am 66b5d902: am 27407208: Merge change Icf335098 into eclair
Merge commit '66b5d902a29e08237f16be53a84f9c2472df8493' into eclair-mr2-plus-aosp

* commit '66b5d902a29e08237f16be53a84f9c2472df8493':
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number
2009-11-13 09:26:24 -08:00
Jason Sams
adf3893983 am da8bb292: am 59175ac2: Merge change I81b1421a into eclair
Merge commit 'da8bb292db289bdd0e02b672daec09e2a3f9f462' into eclair-mr2-plus-aosp

* commit 'da8bb292db289bdd0e02b672daec09e2a3f9f462':
  Defer EGL init until the surface changed call comes in.  Pass w,h along with surface for verification of driver state.
2009-11-13 09:26:09 -08:00
Wink Saville
126fee88d4 am db9f06d9: resolved conflicts for merge of 2a1e9641 to eclair-mr2
Merge commit 'db9f06d9c44cd640f282b1a631ae82d3652beeef' into eclair-mr2-plus-aosp

* commit 'db9f06d9c44cd640f282b1a631ae82d3652beeef':
  Add code to use Gservices provided values for throtting NITZ updates.
2009-11-12 23:08:56 -08:00
Jason Sams
4834887e6c am 4dd6fee7: Merge change Ieb4b0318 into eclair
Merge commit '4dd6fee7e444c65f3613b4126124622b32a5d4ff' into eclair-mr2

* commit '4dd6fee7e444c65f3613b4126124622b32a5d4ff':
  Make default vertex program correctly track surface size.
2009-11-12 23:06:44 -08:00
Jaikumar Ganesh
ae29ac179e am 572e0087: Merge change Idfc116fe into eclair
Merge commit '572e0087a86c6781e3334f8a6f901039a407138d' into eclair-mr2

* commit '572e0087a86c6781e3334f8a6f901039a407138d':
  Return null if SIM doesn't have the MSISDN Aplha tag.
2009-11-12 23:06:29 -08:00
Mathias Agopian
66b5d902a2 am 27407208: Merge change Icf335098 into eclair
Merge commit '274072089ceff6eacb9ccfb59290a18f43739c87' into eclair-mr2

* commit '274072089ceff6eacb9ccfb59290a18f43739c87':
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number
2009-11-12 23:06:15 -08:00
Jason Sams
da8bb292db am 59175ac2: Merge change I81b1421a into eclair
Merge commit '59175ac269df2a584241e9786dc70ac35cb973e3' into eclair-mr2

* commit '59175ac269df2a584241e9786dc70ac35cb973e3':
  Defer EGL init until the surface changed call comes in.  Pass w,h along with surface for verification of driver state.
2009-11-12 23:05:59 -08:00
Wink Saville
db9f06d9c4 resolved conflicts for merge of 2a1e9641 to eclair-mr2
Change-Id: Ie1e1e686a7ef26a8a3f583c9660930eb16ca2659
2009-11-12 22:44:11 -08:00
Daisuke Miyakawa
2a77d4633a am 592988d3: Add unit tests for Japanization and fix several bugs.
Merge commit '592988d307e8d305ca163c4e58da0fb350054194' into eclair-mr2-plus-aosp

* commit '592988d307e8d305ca163c4e58da0fb350054194':
  Add unit tests for Japanization and fix several bugs.
2009-11-12 19:08:23 -08:00
Android (Google) Code Review
4dd6fee7e4 Merge change Ieb4b0318 into eclair
* changes:
  Make default vertex program correctly track surface size.
2009-11-12 16:29:26 -08:00
Android (Google) Code Review
572e0087a8 Merge change Idfc116fe into eclair
* changes:
  Return null if SIM doesn't have the MSISDN Aplha tag.
2009-11-12 16:10:10 -08:00
Jason Sams
eb4b031804 Make default vertex program correctly track surface size. 2009-11-12 16:09:45 -08:00
Android (Google) Code Review
274072089c Merge change Icf335098 into eclair
* changes:
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number
2009-11-12 15:36:27 -08:00
Daisuke Miyakawa
592988d307 Add unit tests for Japanization and fix several bugs.
Internal issue number: 2195990
2009-11-13 08:33:11 +09:00
Android (Google) Code Review
59175ac269 Merge change I81b1421a into eclair
* changes:
  Defer EGL init until the surface changed call comes in.  Pass w,h along with surface for verification of driver state.
2009-11-12 15:27:28 -08:00
Mathias Agopian
cf3350982f fix [2236865] STOPSHIP: bump soft gl and egl minor version number 2009-11-12 15:19:42 -08:00
Android (Google) Code Review
2a1e96412c Merge change Ie122606f into eclair
* changes:
  Add code to use Gservices provided values for throtting NITZ updates.
2009-11-12 15:12:08 -08:00
Jason Sams
3bc47d4381 Defer EGL init until the surface changed call comes in. Pass w,h along with surface for verification of driver state. 2009-11-12 15:10:47 -08:00
Dan Egnor
00556831f7 am f18a01c7: Rename [I]DropBox[Service] to [I]DropBoxManager[Service].
Merge commit 'f18a01c77e78209b74e34d05cfb352fa4a92db5f' into eclair-mr2-plus-aosp

* commit 'f18a01c77e78209b74e34d05cfb352fa4a92db5f':
  Rename [I]DropBox[Service] to [I]DropBoxManager[Service].
2009-11-12 14:15:02 -08:00
Dan Egnor
f18a01c77e Rename [I]DropBox[Service] to [I]DropBoxManager[Service].
Un-hide the DropBoxManager interface, and update the public API accordingly.
2009-11-12 13:58:27 -08:00
Romain Guy
440110fbfe am 897a744b: am b602c328: Merge change I31c52bef into eclair
Merge commit '897a744bb7a95b2d3883004301b8e877cd5efc92' into eclair-mr2-plus-aosp

* commit '897a744bb7a95b2d3883004301b8e877cd5efc92':
  Revert change incorrectly submitted as part of change #32153.
2009-11-12 13:46:08 -08:00
Mathias Agopian
2c694f032c am daafd544: am dffa96f7: Merge change I90daccf3 into eclair
Merge commit 'daafd5441af5a180edd20d6edf74a9bd8117a287' into eclair-mr2-plus-aosp

* commit 'daafd5441af5a180edd20d6edf74a9bd8117a287':
  fix [2143798] Need to figure out how to do video on Passion w/ GPU
2009-11-12 13:45:56 -08:00
Romain Guy
897a744bb7 am b602c328: Merge change I31c52bef into eclair
Merge commit 'b602c328c24f82d61038ac1222bd40a3cc7bc900' into eclair-mr2

* commit 'b602c328c24f82d61038ac1222bd40a3cc7bc900':
  Revert change incorrectly submitted as part of change #32153.
2009-11-12 13:42:00 -08:00
Mathias Agopian
daafd5441a am dffa96f7: Merge change I90daccf3 into eclair
Merge commit 'dffa96f7349a44a5d587656fce5c55386d44b150' into eclair-mr2

* commit 'dffa96f7349a44a5d587656fce5c55386d44b150':
  fix [2143798] Need to figure out how to do video on Passion w/ GPU
2009-11-12 13:41:48 -08:00
Android (Google) Code Review
b602c328c2 Merge change I31c52bef into eclair
* changes:
  Revert change incorrectly submitted as part of change #32153.
2009-11-12 13:37:30 -08:00
Jaikumar Ganesh
de1fcd49e7 Return null if SIM doesn't have the MSISDN Aplha tag.
This makes both the GSM and CDMA version compatible.

Bug: 2247067
Dr No: jsh
2009-11-12 13:29:33 -08:00
Android (Google) Code Review
dffa96f734 Merge change I90daccf3 into eclair
* changes:
  fix [2143798] Need to figure out how to do video on Passion w/ GPU
2009-11-12 13:25:36 -08:00
Jim Miller
e6874f9df4 am 0b66ea65: am 2477fd69: Merge change Ic31c11ad into eclair
Merge commit '0b66ea65f7c43c7a39e91baf7a39945fc2ad6355' into eclair-mr2-plus-aosp

* commit '0b66ea65f7c43c7a39e91baf7a39945fc2ad6355':
  Fix 2209086: restore drawable states when drawables change.
2009-11-12 13:23:42 -08:00
Dan Egnor
f6f29eff64 am 4c414e51: am 58c603ef: Merge change Id301a47f into eclair
Merge commit '4c414e51b17a6c8ababb731fb5204404fd2a2c38' into eclair-mr2-plus-aosp

* commit '4c414e51b17a6c8ababb731fb5204404fd2a2c38':
  Fix bug 2253204: MapView resources for hdpi devices.
2009-11-12 13:23:31 -08:00
Jim Miller
0b66ea65f7 am 2477fd69: Merge change Ic31c11ad into eclair
Merge commit '2477fd69492055f3c6ee62ed9993e9fde8283144' into eclair-mr2

* commit '2477fd69492055f3c6ee62ed9993e9fde8283144':
  Fix 2209086: restore drawable states when drawables change.
2009-11-12 13:17:27 -08:00
Dan Egnor
4c414e51b1 am 58c603ef: Merge change Id301a47f into eclair
Merge commit '58c603eff0d0b13fe581119e1d9c228da99d77e7' into eclair-mr2

* commit '58c603eff0d0b13fe581119e1d9c228da99d77e7':
  Fix bug 2253204: MapView resources for hdpi devices.
2009-11-12 13:17:15 -08:00
Android (Google) Code Review
2477fd6949 Merge change Ic31c11ad into eclair
* changes:
  Fix 2209086: restore drawable states when drawables change.
2009-11-12 13:13:58 -08:00
Android (Google) Code Review
58c603eff0 Merge change Id301a47f into eclair
* changes:
  Fix bug 2253204: MapView resources for hdpi devices.
2009-11-12 12:54:43 -08:00
Dan Egnor
d301a47ff9 Fix bug 2253204: MapView resources for hdpi devices. 2009-11-12 12:24:33 -08:00
Evan Millar
09d33a54a6 am 3b8112ef: Merge change I280c753a into eclair-mr2
Merge commit '3b8112ef964eaafb3befa38d8b8ff767ea0f3751' into eclair-mr2-plus-aosp

* commit '3b8112ef964eaafb3befa38d8b8ff767ea0f3751':
  Modify text validation behavior.
2009-11-12 11:44:38 -08:00
Android (Google) Code Review
3b8112ef96 Merge change I280c753a into eclair-mr2
* changes:
  Modify text validation behavior.
2009-11-12 11:39:42 -08:00
Jim Miller
4df2c5433b Fix 2209086: restore drawable states when drawables change.
This fixes a bug where the right tab hightlight wasn't being seen.
The prooblem was that we weren't preserving the drawables' states when
the application requested a new drawable. We now track the drawable state
so we can updated it when the resources change.
2009-11-12 11:23:29 -08:00
Daniel Sandler
09904d84d1 am d1a3fc38: am 609bbf18: Merge change I54089080 into eclair
Merge commit 'd1a3fc38e99e0483402168529020e758ecd777ce' into eclair-mr2-plus-aosp

* commit 'd1a3fc38e99e0483402168529020e758ecd777ce':
  Update keyguard and pattern-lock layouts for new UX designs.
2009-11-12 10:43:52 -08:00
Guang Zhu
640b44a070 am 3b8a1b35: am ea48cd6d: Use a diff that ignores trailing whitespaces to get by some layout test failures.
Merge commit '3b8a1b3513bae8fc0846d52121d243bec7cb65b8' into eclair-mr2-plus-aosp

* commit '3b8a1b3513bae8fc0846d52121d243bec7cb65b8':
  Use a diff that ignores trailing whitespaces to get by some layout test failures.
2009-11-12 10:43:42 -08:00
Andreas Huber
bfdb1e88ef am d0f3228d: resolved conflicts for merge of c66d53f9 to eclair-mr2
Merge commit 'd0f3228daa9ea26ec959cb79451e6f150648bce8' into eclair-mr2-plus-aosp

* commit 'd0f3228daa9ea26ec959cb79451e6f150648bce8':
  Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
2009-11-12 10:43:31 -08:00
Daniel Sandler
d1a3fc38e9 am 609bbf18: Merge change I54089080 into eclair
Merge commit '609bbf182e4b4f39b6be7ed01331887ca70ea4c1' into eclair-mr2

* commit '609bbf182e4b4f39b6be7ed01331887ca70ea4c1':
  Update keyguard and pattern-lock layouts for new UX designs.
2009-11-12 10:38:36 -08:00
Guang Zhu
3b8a1b3513 am ea48cd6d: Use a diff that ignores trailing whitespaces to get by some layout test failures.
Merge commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c' into eclair-mr2

* commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c':
  Use a diff that ignores trailing whitespaces to get by some layout test failures.
2009-11-12 10:38:08 -08:00
Android (Google) Code Review
609bbf182e Merge change I54089080 into eclair
* changes:
  Update keyguard and pattern-lock layouts for new UX designs.
2009-11-12 10:34:32 -08:00
Andreas Huber
d0f3228daa resolved conflicts for merge of c66d53f9 to eclair-mr2 2009-11-12 10:32:26 -08:00
Evan Millar
280c753ae3 Modify text validation behavior.
-Only perform validation when the view is *losing* focus.
-Don't perform validation when the window focus changes. This causes odd
behavior like validation being peformed when menu is pressed, or long
press dialogs pop-up.
2009-11-12 10:31:07 -08:00
Guang Zhu
ea48cd6dd4 Use a diff that ignores trailing whitespaces to get by some layout test failures. 2009-11-12 10:18:14 -08:00
Dan Egnor
cd90b2773e am 17d176d8: am ddf157ca: Merge change I5ae73af7 into eclair
Merge commit '17d176d8570f7d76532afee43853339c60fc9850' into eclair-mr2-plus-aosp

* commit '17d176d8570f7d76532afee43853339c60fc9850':
  Don't back up system wallpapers.
2009-11-12 10:02:00 -08:00
Dan Egnor
17d176d857 am ddf157ca: Merge change I5ae73af7 into eclair
Merge commit 'ddf157cae48a17e72e740538a981a63394ec2274' into eclair-mr2

* commit 'ddf157cae48a17e72e740538a981a63394ec2274':
  Don't back up system wallpapers.
2009-11-12 09:58:17 -08:00