The Android Open Source Project
14a4c67dbb
am 8705a41: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
...
Merge commit '8705a41a778bd0561737fd9b6fb2e1cdca0532b5'
* commit '8705a41a778bd0561737fd9b6fb2e1cdca0532b5':
* update density correctly when the configuration is changed.
2009-05-08 07:22:44 -07:00
The Android Open Source Project
d55158b686
am c664d18: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
...
Merge commit 'c664d1837c34f3e7ab743f7fb96771b0c9d8df6e'
* commit 'c664d1837c34f3e7ab743f7fb96771b0c9d8df6e':
don't use modulo
2009-05-08 07:22:44 -07:00
The Android Open Source Project
490f45b8ec
am 572ae14: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
...
Merge commit '572ae14f6e38b9c3262937f2f4b57bd6779c3c5f'
* commit '572ae14f6e38b9c3262937f2f4b57bd6779c3c5f':
Fix automatically generated code for glGet
2009-05-08 07:22:41 -07:00
The Android Open Source Project
bc1b1cc401
manual merge of 7ec32cc
...
Merge commit '7ec32cc'
2009-05-08 07:21:43 -07:00
The Android Open Source Project
1963bba40a
am 5085ef6: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
...
Merge commit '5085ef64ac3e589b1674dddcb6dabe3600e347da'
* commit '5085ef64ac3e589b1674dddcb6dabe3600e347da':
2009-05-08 00:54:55 -07:00
Scott Main
6e85bdd536
am b6868d0: am 9b825aa: AI 148470: add documentation about aapt image op
...
Merge commit 'b6868d0048ec814e02ced35df6ad6e7b72389ca4'
* commit 'b6868d0048ec814e02ced35df6ad6e7b72389ca4':
AI 148470: add documentation about aapt image optimization
2009-05-08 00:54:53 -07:00
The Android Open Source Project
b4beae478a
Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut
2009-05-07 17:40:33 -07:00
Android (Google) Code Review
ba87f0836e
Merge change 1108 into donut
...
* changes:
* update density correctly when the configuration is changed. * Turns private sLcdDensity to public DEVICE_DENSITY to use it in ActivityThread
2009-05-07 17:39:57 -07:00
The Android Open Source Project
95a2af1c87
Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut
2009-05-07 17:25:17 -07:00
Android (Google) Code Review
144f2965c8
Merge change 760 into donut
...
* changes:
don't use modulo
2009-05-07 17:23:51 -07:00
The Android Open Source Project
7476ede9ac
Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut
2009-05-07 17:04:14 -07:00
Android (Google) Code Review
bc4a2d58e1
Merge change 1163 into donut
...
* changes:
Fix automatically generated code for glGet
2009-05-07 17:01:13 -07:00
The Android Open Source Project
f3f77c2b0f
Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut
2009-05-07 16:45:46 -07:00
Brandon Ballinger
375cfea26b
am fedf566: Merge branch \'readonly-p4-donut\' into donut
...
Merge commit 'fedf566b9e00f18588fc104caafd047af069844a'
* commit 'fedf566b9e00f18588fc104caafd047af069844a':
AI 148484: (1) Pass recognizer intent to RecognitionService when starting to listen.
2009-05-07 14:30:13 -07:00
The Android Open Source Project
6f6ca074ed
Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut
2009-05-07 14:28:57 -07:00
Brandon Ballinger
4636d459e8
Merge branch 'readonly-p4-donut' into donut
2009-05-07 14:26:17 -07:00
Scott Main
2665202dba
am 9b825aa: AI 148470: add documentation about aapt image optimization
...
Merge commit '9b825aa0eec5f143cec4c3cfeff97ba8d3d9d093' into donut
* commit '9b825aa0eec5f143cec4c3cfeff97ba8d3d9d093':
AI 148470: add documentation about aapt image optimization
2009-05-07 12:00:28 -07:00
Android (Google) Code Review
3c1a21bd42
am b85c374: Merge change 1155 into donut
...
Merge commit 'b85c37432b3836fd30c81191425d7e00dcf2082c'
* commit 'b85c37432b3836fd30c81191425d7e00dcf2082c':
Don't allow negative numbers in ToneGenerator toneType parameter
2009-05-07 11:54:50 -07:00
Android (Google) Code Review
c474615a51
Merge change 1155 into donut
...
* changes:
Don't allow negative numbers in ToneGenerator toneType parameter Bug 1836596
2009-05-07 11:52:06 -07:00
Dirk Dougherty
43caaff294
am e87bf13: am 1f8059f: AI 148461: Changes to support ADT 0.9.1. Update
...
Merge commit 'e87bf13924199225d2751ae7b4d0451954ee3711'
* commit 'e87bf13924199225d2751ae7b4d0451954ee3711':
AI 148461: Changes to support ADT 0.9.1. Update ADT version id, move older ADT versions to a separate table.
2009-05-07 11:20:43 -07:00
Dirk Dougherty
0bc0d2b628
am 1f8059f: AI 148461: Changes to support ADT 0.9.1. Update ADT version
...
Merge commit '1f8059f19f3345042121a55481d7f01dacc8d29e' into donut
* commit '1f8059f19f3345042121a55481d7f01dacc8d29e':
AI 148461: Changes to support ADT 0.9.1. Update ADT version id, move older ADT versions to a separate table.
2009-05-07 11:18:35 -07:00
Dirk Dougherty
94bc09cdfc
am 2a50606: am f096acd: AI 148460: Misc changes for dev site.
...
Merge commit '2a50606532cfc26d100d6b7a966c73f785e5b3b8'
* commit '2a50606532cfc26d100d6b7a966c73f785e5b3b8':
AI 148460: Misc changes for dev site.
2009-05-07 11:16:55 -07:00
Dirk Dougherty
76d550abd1
am f096acd: AI 148460: Misc changes for dev site.
...
Merge commit 'f096acd37994e47792552c2e53a6246dc8afb0d3' into donut
* commit 'f096acd37994e47792552c2e53a6246dc8afb0d3':
AI 148460: Misc changes for dev site.
2009-05-07 11:14:26 -07:00
Jack Palevich
593f203ba3
Fix automatically generated code for glGet
...
Remove include of an internal agl header file. We should not depend on any implementation details
of our software renderer, since they may not be correct if another renderer is used.
Fix glGet number-of-elements logic for GL_FOG_COLOR GL_LIGHT_MODEL_AMBIENT,
and GL_COMPRESSED_TEXTURE_FORMATS.
2009-05-07 10:52:18 -07:00
Android (Google) Code Review
aa2d9c139d
am 08d00b9: Merge change 1159 into donut
...
Merge commit '08d00b9ad794d9f627f1c2c4b282c3950806f4bd'
* commit '08d00b9ad794d9f627f1c2c4b282c3950806f4bd':
CoreTests: Fix LocationManagerProximityTest.
2009-05-07 10:35:09 -07:00
Android (Google) Code Review
0a20297dc5
am 39bfa72: Merge change 1158 into donut
...
Merge commit '39bfa72172560b479fc100bf165883b86f5b2f5d'
* commit '39bfa72172560b479fc100bf165883b86f5b2f5d':
location: Fix mock provider support
2009-05-07 10:35:08 -07:00
Android (Google) Code Review
7a3f858b70
Merge change 1159 into donut
...
* changes:
CoreTests: Fix LocationManagerProximityTest.
2009-05-07 10:33:25 -07:00
Android (Google) Code Review
9ee7741a88
Merge change 1158 into donut
...
* changes:
location: Fix mock provider support
2009-05-07 10:32:52 -07:00
Android (Google) Code Review
f0d16879b7
am 0efb086: Merge change 1120 into donut
...
Merge commit '0efb0868841cc1c2b5a669b39880d931f54f705a'
* commit '0efb0868841cc1c2b5a669b39880d931f54f705a':
Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTest
2009-05-07 09:34:39 -07:00
Android (Google) Code Review
b112d3af9c
Merge change 1120 into donut
...
* changes:
Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTest (Currently not supported by OpenCore 2.0)
2009-05-07 09:34:28 -07:00
Android (Google) Code Review
7b50d0b08b
am 5039606: Merge change 1152 into donut
...
Merge commit '50396063c2fbb1f427cf31e0b8a56567fb5a069c'
* commit '50396063c2fbb1f427cf31e0b8a56567fb5a069c':
location: Remove two unnecessary variables.
2009-05-07 08:51:42 -07:00
Android (Google) Code Review
2594c71c1c
Merge change 1152 into donut
...
* changes:
location: Remove two unnecessary variables.
2009-05-07 08:51:33 -07:00
Android (Google) Code Review
5f78c9ffcd
am f792fc5: Merge change 1150 into donut
...
Merge commit 'f792fc59c18aa470eb44cc596d5774115e2d9d02'
* commit 'f792fc59c18aa470eb44cc596d5774115e2d9d02':
location: Location Manager wakelock cleanup
2009-05-07 08:24:05 -07:00
Android (Google) Code Review
b1a26e28bf
Merge change 1150 into donut
...
* changes:
location: Location Manager wakelock cleanup
2009-05-07 08:23:40 -07:00
Android (Google) Code Review
57d7a54a75
am a6706b3: Merge change 1131 into donut
...
Merge commit 'a6706b3c8f7e8759d5165535c95f6cd7147ab5e2'
* commit 'a6706b3c8f7e8759d5165535c95f6cd7147ab5e2':
fix issue 1641535: SoundPool should use AudioTrack with shared memory buffer
2009-05-07 07:50:07 -07:00
Android (Google) Code Review
b3a72a9728
Merge change 1131 into donut
...
* changes:
fix issue 1641535: SoundPool should use AudioTrack with shared memory buffer
2009-05-07 07:46:42 -07:00
Android (Google) Code Review
5a312bf26b
am 90da134: Merge change 1065 into donut
...
Merge commit '90da134befec804852775be7fd4905a1a188ff00'
* commit '90da134befec804852775be7fd4905a1a188ff00':
Add a contact placeholder picture.
2009-05-07 01:07:37 -07:00
Android (Google) Code Review
9ee6805503
Merge change 1065 into donut
...
* changes:
Add a contact placeholder picture.
2009-05-07 01:05:41 -07:00
Michael Chan
837863eb93
am 05d24af: Merge branch \'readonly-p4-donut\' into donut
...
Merge commit '05d24afb61e2fbd137468a065fd58685e1a62d78'
* commit '05d24afb61e2fbd137468a065fd58685e1a62d78':
AI 148368: Decrease CPU usage by throttling touch events
2009-05-06 18:18:49 -07:00
The Android Open Source Project
d046de9cc4
manual merge d90a331 to avoid conflicts
...
Merge commit 'd90a331'
2009-05-06 18:16:52 -07:00
Michael Chan
d42b9b7ca4
Merge branch 'readonly-p4-donut' into donut
2009-05-06 17:39:50 -07:00
Android (Google) Code Review
eda9f6f455
Merge change 1109
...
* changes:
Another fix: look at db version to determine if there is a type column.
2009-05-06 17:21:57 -07:00
Android (Google) Code Review
857923db65
am 413cf5f: Merge change 1110 into donut
...
Merge commit '413cf5f4536b9c029d07f99b1c769c026313cd12'
* commit '413cf5f4536b9c029d07f99b1c769c026313cd12':
Track install/removal/update of packages that provide backup services
2009-05-06 16:18:45 -07:00
Android (Google) Code Review
89620a0ae1
Merge change 1110 into donut
...
* changes:
Track install/removal/update of packages that provide backup services
2009-05-06 16:15:21 -07:00
Android (Google) Code Review
1583e8b962
am f2331a6: Merge change 1063 into donut
...
Merge commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c'
* commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c':
Refactor SearchableInfo.
2009-05-06 15:49:01 -07:00
Android (Google) Code Review
b266791625
am 729a901: Merge change 1099 into donut
...
Merge commit '729a901b2a9ca163d6395983711cea1fdc7b5eb5'
* commit '729a901b2a9ca163d6395983711cea1fdc7b5eb5':
Fix Phone-based locale selection to never choose a lang-only locale.
2009-05-06 15:49:01 -07:00
Android (Google) Code Review
efad127cd3
am f759824: Merge change 1086 into donut
...
Merge commit 'f7598245489c6d28c2673acd269ada2e6e834065'
* commit 'f7598245489c6d28c2673acd269ada2e6e834065':
Fixes regression introduced in Cupcake: a couple of adapters were using setTag() to store their own data, which could interfere with the use of setTag() made by the applications. The fix is quite simple an rely on a WeakHashMap to store the holders within the adapters; using the Views as the keys of the map.
2009-05-06 15:49:00 -07:00
Christopher Tate
e97296c9e7
am b1d790b: Pass null as savedState to indicate a full backup is require
...
Merge commit 'b1d790b63e2115be558d451efbc914d1f8dfa846'
* commit 'b1d790b63e2115be558d451efbc914d1f8dfa846':
Pass null as savedState to indicate a full backup is required
2009-05-06 15:49:00 -07:00
Android (Google) Code Review
6518346f5e
am 9a6f250: Merge change 1089 into donut
...
Merge commit '9a6f25033c51390cbcc4eec38f27e0ac35e97f1c'
* commit '9a6f25033c51390cbcc4eec38f27e0ac35e97f1c':
Add a Backup Manager interface to request a full backup
2009-05-06 15:48:59 -07:00
Android (Google) Code Review
325a452960
am fd445d3: Merge change 1095 into donut
...
Merge commit 'fd445d3510cddc7a67cf7720935626684a2f3011'
* commit 'fd445d3510cddc7a67cf7720935626684a2f3011':
gps: Move GPS scheduling from libgps to GpsLocationProvider.
2009-05-06 15:48:58 -07:00