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
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
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
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
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
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
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
2594c71c1c
Merge change 1152 into donut
...
* changes:
location: Remove two unnecessary variables.
2009-05-07 08:51:33 -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
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
9ee6805503
Merge change 1065 into donut
...
* changes:
Add a contact placeholder picture.
2009-05-07 01:05:41 -07:00
Michael Chan
d42b9b7ca4
Merge branch 'readonly-p4-donut' into donut
2009-05-06 17:39:50 -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
8d976746bb
Merge change 1063 into donut
...
* changes:
Refactor SearchableInfo.
2009-05-06 14:20:53 -07:00
Android (Google) Code Review
2b5154f4c3
Merge change 1099 into donut
...
* changes:
Fix Phone-based locale selection to never choose a lang-only locale.
2009-05-06 14:06:08 -07:00
Android (Google) Code Review
ca4ae36063
Merge change 1086 into donut
...
* changes:
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 12:45:16 -07:00
Android (Google) Code Review
865ebd2926
Merge change 1089 into donut
...
* changes:
Add a Backup Manager interface to request a full backup
2009-05-06 12:18:21 -07:00
Android (Google) Code Review
5cd6b2f8cf
Merge change 1095 into donut
...
* changes:
gps: Move GPS scheduling from libgps to GpsLocationProvider.
2009-05-06 11:58:27 -07:00
Android (Google) Code Review
7e6c468a20
Merge change 1069 into donut
...
* changes:
GpsStatus: Increase NUM_SATELLITES to 255 for future compatibility.
2009-05-06 08:06:35 -07:00
Android (Google) Code Review
9a4f01b6b0
Merge change 1040 into donut
...
* changes:
Add a test app for the backup
2009-05-05 18:58:05 -07:00
Android (Google) Code Review
63f0227872
Merge change 1039 into donut
...
* changes:
Add some C++ code to do raw files for backup
2009-05-05 18:58:01 -07:00
Android (Google) Code Review
186af05304
Merge change 1017 into donut
...
* changes:
Changes in mediaframework test for the OpenCore 2.0 integration. Changes included: 1) The default value for the metatData 2) Add the videoSizedChange callback to get the video dimension Added the test cases for the async reset callback test case for the Qualcomm new realease.
2009-05-05 18:46:51 -07:00
Android (Google) Code Review
759c92ff14
Merge change 777 into donut
...
* changes:
Rewrite SyncStorageEngine to use flat files and in-memory data structures.
2009-05-05 16:17:25 -07:00
Android (Google) Code Review
40e18a1a53
Merge change 1018 into donut
...
* changes:
If no battery stats are found, return status_unknown
2009-05-05 16:15:53 -07:00
Joe Onorato
0c4863b266
Add some C++ code to do raw files for backup
2009-05-05 13:45:25 -07:00
Android (Google) Code Review
512ec5aae1
Merge change 1000 into donut
...
* changes:
Ignore layout bin directories in git.
2009-05-05 13:45:05 -07:00
Scott Main
951089d881
am 0c11b99: AI 148308: revise aidl support documentation -- now the same
...
Merge commit '0c11b990908df26aca7f017d330535b9bf21a903' into donut
* commit '0c11b990908df26aca7f017d330535b9bf21a903':
AI 148308: revise aidl support documentation -- now the same in all environments;
2009-05-05 11:25:38 -07:00
Android (Google) Code Review
87fe31b422
Merge change 972 into donut
...
* changes:
Back-merge all changes done in master to DumpRenderTree to donut.
2009-05-05 11:16:17 -07:00
Android (Google) Code Review
79bd5b9f5c
Merge change 966 into donut
...
* changes:
Fixes 1830181. Tapping disabled items in a ListView would cause the framework to take a code path that wasn't resetting the mMotionCorrection variable if it had been previously set. This would force ListView to apply a scroll to its children even though it was unnecessary. This simple fix prevents the issue by resetting mMotionCorrection appropriately.
2009-05-04 17:54:39 -07:00
Android (Google) Code Review
b802c553c3
Merge change 909 into donut
...
* changes:
Let screenOrientation="behind" works as expected
2009-05-04 17:19:06 -07:00
Android (Google) Code Review
6583b308f9
Merge change 962 into donut
...
* changes:
Fixes #1603191 . GridView could provoke NPEs during layout passes initiated from key events.
2009-05-04 16:59:12 -07:00
Android (Google) Code Review
8718df8e16
Merge change 952 into donut
...
* changes:
Debug: Minor cleanup
2009-05-04 16:20:14 -07:00
Android (Google) Code Review
aed79d7d58
Merge change 949 into donut
...
* changes:
Fixes external #2575 (http://code.google.com/p/android/issues/detail?id=2575 ). HorizontalScrollView was comparing the measured height of its child to its width.
2009-05-04 15:30:35 -07:00
Android (Google) Code Review
be5491ea65
Merge change 956 into donut
...
* changes:
Fixes #1827988 . Prevent marquee text from constantly rescaling itself in Market
2009-05-04 15:09:47 -07:00
Android (Google) Code Review
3122bddc3c
Merge change 911 into donut
...
* changes:
Debug: Add setPropertiesOn(), and @hide it for now
2009-05-04 14:03:40 -07:00
Scott Main
160ec24064
am eb086d6: AI 148270: remove references to AbsoluteLayout because it\'s
...
Merge commit 'eb086d60b2b3425dec37d41b059d9e9cadfbbd18' into donut
* commit 'eb086d60b2b3425dec37d41b059d9e9cadfbbd18':
AI 148270: remove references to AbsoluteLayout because it's been deprecated
2009-05-04 13:22:36 -07:00
Android (Google) Code Review
e146b65728
Merge change 917 into donut
...
* changes:
Fix HTML formatting in android.os.AsyncTask
2009-05-02 22:42:00 -07:00
Android (Google) Code Review
b657639a27
Merge change 847 into donut
...
* changes:
Config: Deprecate most fields, and hook into ConfigBuildFlags
2009-05-01 18:32:46 -07:00
Android (Google) Code Review
e826baf613
Merge change 845 into donut
...
* changes:
Config: Add ConfigBuildFlags, and change it based on TARGET_BUILD_TYPE
2009-05-01 18:32:37 -07:00
Android (Google) Code Review
eb14aeb370
Merge change 896 into donut
...
* changes:
make AutoCompleteTextView take the alternate anchor view into account when computing the max available space on screen.
2009-05-01 16:32:21 -07:00
Android (Google) Code Review
6cb60e5077
Merge change 844 into donut
...
* changes:
clean up cdma sms creation and parsing
2009-05-01 14:22:20 -07:00
Android (Google) Code Review
5b08702e06
Merge change 860 into donut
...
* changes:
Change 79 in git master branch
2009-05-01 14:09:03 -07:00
Dirk Dougherty
ebe256437f
am a417ee5: AI 148197: Add a link in "Community" page to the android mar
...
Merge commit 'a417ee5afa8133d42d76691d6501741dc6c7178d' into donut
* commit 'a417ee5afa8133d42d76691d6501741dc6c7178d':
AI 148197: Add a link in "Community" page to the android market discussion forum.
2009-05-01 13:40:01 -07:00
Dirk Dougherty
d973852074
am 392d29a: AI 148193: More misc fixes in format, links, content for And
...
Merge commit '392d29ab0d02dc4040436ccc9638b7498b2eb1de' into donut
* commit '392d29ab0d02dc4040436ccc9638b7498b2eb1de':
AI 148193: More misc fixes in format, links, content for Android 1.5 SDK docs.
2009-05-01 13:03:34 -07:00