Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,047 Commits 3 Branches 0 Tags
d7bc5e9891c8515437533d940b602bc9b288dcc2
Commit Graph

14047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
d7bc5e9891 am 8dcb4233: am 4834887e: am 4dd6fee7: Merge change Ieb4b0318 into eclair 
Merge commit '8dcb4233fcb043f82774768d3e5bee86d867b852'

* commit '8dcb4233fcb043f82774768d3e5bee86d867b852':
  Make default vertex program correctly track surface size.
 2009-11-13 10:51:39 -08:00
Jaikumar Ganesh
ec76a23c98 am d96c94aa: am ae29ac17: am 572e0087: Merge change Idfc116fe into eclair 
Merge commit 'd96c94aa93b3331213d0ec781d0593bccfb61c03'

* commit 'd96c94aa93b3331213d0ec781d0593bccfb61c03':
  Return null if SIM doesn't have the MSISDN Aplha tag.
 2009-11-13 10:51:23 -08:00
Mathias Agopian
17c50b2427 am da5e90be: am 66b5d902: am 27407208: Merge change Icf335098 into eclair 
Merge commit 'da5e90bee443129511e231e9078a134626b87541'

* commit 'da5e90bee443129511e231e9078a134626b87541':
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number
 2009-11-13 10:51:07 -08:00
Jason Sams
bc4d75bc64 am adf38939: am da8bb292: am 59175ac2: Merge change I81b1421a into eclair 
Merge commit 'adf38939836ee1d1f5967fc45d02e07117f44009'

* commit 'adf38939836ee1d1f5967fc45d02e07117f44009':
  Defer EGL init until the surface changed call comes in.  Pass w,h along with surface for verification of driver state.
 2009-11-13 10:50:49 -08:00
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
b74ebcabe0 am 126fee88: am db9f06d9: resolved conflicts for merge of 2a1e9641 to eclair-mr2 
Merge commit '126fee88d480939d46b8ddd1e3a03cdd193fa040'

* commit '126fee88d480939d46b8ddd1e3a03cdd193fa040':
  Add code to use Gservices provided values for throtting NITZ updates.
 2009-11-12 23:13:17 -08:00
Daisuke Miyakawa
5b65ef4c95 am 2a77d463: am 592988d3: Add unit tests for Japanization and fix several bugs. 
Merge commit '2a77d4633aae1d04054fb09850d7939aa386b0a0'

* commit '2a77d4633aae1d04054fb09850d7939aa386b0a0':
  Add unit tests for Japanization and fix several bugs.
 2009-11-12 23:13:03 -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
67abf57846 am 00556831: am f18a01c7: Rename [I]DropBox[Service] to [I]DropBoxManager[Service]. 
Merge commit '00556831f7503a922a5402c525b4387ebdd1a4bb'

* commit '00556831f7503a922a5402c525b4387ebdd1a4bb':
  Rename [I]DropBox[Service] to [I]DropBoxManager[Service].
 2009-11-12 14:19:27 -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
b597e6b60c am 440110fb: am 897a744b: am b602c328: Merge change I31c52bef into eclair 
Merge commit '440110fbfe00fa8f16087b33f0f3057e0ca057a9'

* commit '440110fbfe00fa8f16087b33f0f3057e0ca057a9':
  Revert change incorrectly submitted as part of change #32153.
 2009-11-12 13:51:24 -08:00
Mathias Agopian
46b3f2fa40 am 2c694f03: am daafd544: am dffa96f7: Merge change I90daccf3 into eclair 
Merge commit '2c694f032c1bea7003098336b32861e7b97aa9c7'

* commit '2c694f032c1bea7003098336b32861e7b97aa9c7':
  fix [2143798] Need to figure out how to do video on Passion w/ GPU
 2009-11-12 13:51:11 -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
Jim Miller
10d6dd5ae1 am e6874f9d: am 0b66ea65: am 2477fd69: Merge change Ic31c11ad into eclair 
Merge commit 'e6874f9df43037b28bb5a8b315849db10d5d1a1e'

* commit 'e6874f9df43037b28bb5a8b315849db10d5d1a1e':
  Fix 2209086: restore drawable states when drawables change.
 2009-11-12 13:30:17 -08:00
Dan Egnor
f897543d27 am f6f29eff: am 4c414e51: am 58c603ef: Merge change Id301a47f into eclair 
Merge commit 'f6f29eff640b5354d36952a290fe02cb6e47d682'

* commit 'f6f29eff640b5354d36952a290fe02cb6e47d682':
  Fix bug 2253204: MapView resources for hdpi devices.
 2009-11-12 13:30:01 -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
cf079c9109 am 09d33a54: am 3b8112ef: Merge change I280c753a into eclair-mr2 
Merge commit '09d33a54a6b4244223f7d51f5c0764b6ad3f808f'

* commit '09d33a54a6b4244223f7d51f5c0764b6ad3f808f':
  Modify text validation behavior.
 2009-11-12 11:49:53 -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