Commit Graph

1963 Commits

Author SHA1 Message Date
Android (Google) Code Review
8da70e8049 am c6a482e7: Merge change 5199 into donut
Merge commit 'c6a482e778e7b5fc5790edf22e554c93f53b1112'

* commit 'c6a482e778e7b5fc5790edf22e554c93f53b1112':
  Only remove client after the hardware is teared down, so a new client
2009-06-24 20:34:35 -07:00
Android (Google) Code Review
6007b6d7fa Merge change 5199 into donut
* changes:
  Only remove client after the hardware is teared down, so a new client is rejected before old client is done.
2009-06-24 20:33:11 -07:00
Android (Google) Code Review
d54efb52ac am 83b8678d: Merge change 5319 into donut
Merge commit '83b8678dd4cc78dc89fe853161bd470ef28561c8'

* commit '83b8678dd4cc78dc89fe853161bd470ef28561c8':
  Add new APIs to LauncherActivity to be used elsewhere.
2009-06-24 20:31:09 -07:00
Android (Google) Code Review
01fb8feae5 Merge change 5319 into donut
* changes:
  Add new APIs to LauncherActivity to be used elsewhere.
2009-06-24 20:29:21 -07:00
Chih-Chung Chang
d2d6bc7552 Only remove client after the hardware is teared down, so a new client
is rejected before old client is done.

Also check mUsers in all cases to make sure there are no existing client.
2009-06-25 11:03:55 +08:00
Android (Google) Code Review
2ff5c78161 Merge change 4292
* changes:
  Moved owning package and restricted flag to Contact.
2009-06-24 19:51:29 -07:00
Jack Palevich
df0be3d154 am c7410f6f: Add includes to enable host C++ tools to compile with GCC 4.4
Merge commit 'c7410f6f9f8f2aeb9368502a4a725b1a7abe1190'

* commit 'c7410f6f9f8f2aeb9368502a4a725b1a7abe1190':
  Add includes to enable host C++ tools to compile with GCC 4.4
2009-06-24 19:35:14 -07:00
Android (Google) Code Review
3d377e3468 am ad39eb0a: Merge change 5302 into donut
Merge commit 'ad39eb0a2555762a1d9157f8017097579d14f39d'

* commit 'ad39eb0a2555762a1d9157f8017097579d14f39d':
  Add includes to enable host C++ tools to compile with GCC 4.4
2009-06-24 19:15:57 -07:00
Android (Google) Code Review
d5b7ba2daf Merge change 5302 into donut
* changes:
  Add includes to enable host C++ tools to compile with GCC 4.4
2009-06-24 19:14:17 -07:00
Android (Google) Code Review
8e5a0e87fe am 5416d7c9: Merge change 5317 into donut
Merge commit '5416d7c905e723a978ac29ccaf22a91b76e9d5c2'

* commit '5416d7c905e723a978ac29ccaf22a91b76e9d5c2':
  Start backing up wallpaper
2009-06-24 18:48:39 -07:00
Android (Google) Code Review
1fe7737153 Merge change 5317 into donut
* changes:
  Start backing up wallpaper
2009-06-24 18:46:59 -07:00
Android (Google) Code Review
6ebed66004 am 7941e903: Merge change 5091 into donut
Merge commit '7941e903c973af66075bbd4fa4bcadf021a61ccc'

* commit '7941e903c973af66075bbd4fa4bcadf021a61ccc':
  * new screen resolution support impl.
2009-06-24 17:56:05 -07:00
Android (Google) Code Review
3e6438995b Merge change 5091 into donut
* changes:
  * new screen resolution support impl.   * use full window for activities, and shift & clip the content   * refactored the compatibility code, and introdcued Translator class to handle cooridnate translations.   * removed a workaround to handle an activity with configChagne=rotation in old implementation.   * I'll fix background issue on rotation in next CL.
2009-06-24 17:53:57 -07:00
Android (Google) Code Review
c571dc43c0 am 69e1f472: Merge change 5289 into donut
Merge commit '69e1f472c33e241f729c470285a5680866ede75c'

* commit '69e1f472c33e241f729c470285a5680866ede75c':
  Fix TextView's fading edge when compound drawables are setup.
2009-06-24 17:39:19 -07:00
Android (Google) Code Review
7feb4cb790 am 67669c9c: Merge change 5196 into donut
Merge commit '67669c9c1753b062fe2a71f89b589d01b32ba0f7'

* commit '67669c9c1753b062fe2a71f89b589d01b32ba0f7':
  Modify the IBackupTransport API to support bulk restore operations.
2009-06-24 17:39:15 -07:00
Android (Google) Code Review
d7a055a03f Merge change 5289 into donut
* changes:
  Fix TextView's fading edge when compound drawables are setup.
2009-06-24 17:18:48 -07:00
Charles Chen
46bc681cad resolved conflicts for merge of 5158cc55 to master 2009-06-24 16:54:35 -07:00
Android (Google) Code Review
0dc0e02445 Merge change 5196 into donut
* changes:
  Modify the IBackupTransport API to support bulk restore operations. Change the BackupManagerService and LocalTransport to support the new API.
2009-06-24 16:52:16 -07:00
Android (Google) Code Review
4d3273dcc0 Merge change 5259 into donut
* changes:
  Adding TTS_QUEUE_PROCESSING_COMPLETED action to the list of Intents
2009-06-24 16:25:29 -07:00
Dianne Hackborn
304adbffd4 am 9c8dd55a: Fix bug 1829561 ("am profile" with bad filename kills process).
Merge commit '9c8dd55a9d829c29a3feee9469d8c2f27a9f5516'

* commit '9c8dd55a9d829c29a3feee9469d8c2f27a9f5516':
  Fix bug 1829561 ("am profile" with bad filename kills process).
2009-06-24 16:25:26 -07:00
Android (Google) Code Review
66dfa24ffd am 0bc7b849: Merge change 5248 into donut
Merge commit '0bc7b8490b1575bb8266a3b0c6652d4f460fcda1'

* commit '0bc7b8490b1575bb8266a3b0c6652d4f460fcda1':
  Spell out the month names in the de_AT date format file.
2009-06-24 15:57:52 -07:00
Android (Google) Code Review
fd69c79a11 Merge change 5248 into donut
* changes:
  Spell out the month names in the de_AT date format file.
2009-06-24 15:55:48 -07:00
Android (Google) Code Review
a4392013c1 am 3e376a74: Merge change 5171 into donut
Merge commit '3e376a74b3edd8c311e8d69ca5baf986c9da4a06'

* commit '3e376a74b3edd8c311e8d69ca5baf986c9da4a06':
  Track native processes and airplane mode.
2009-06-24 15:45:49 -07:00
Romain Guy
f0568c7ae6 am 95607038: Reverse the order in which RelativeLayout measures and positions children.
Merge commit '956070383945db5f842ec05e507fd0233705738c'

* commit '956070383945db5f842ec05e507fd0233705738c':
  Reverse the order in which RelativeLayout measures and positions children.
2009-06-24 15:45:37 -07:00
Android (Google) Code Review
87a435aeb2 am ae7c980e: Merge change 4556 into donut
Merge commit 'ae7c980e8e5f5e8c78536f0b37fca50d1a7966ca'

* commit 'ae7c980e8e5f5e8c78536f0b37fca50d1a7966ca':
  Added info about mcc and mnc, plus other changes per http://b/1918247; rewrote "How Android find best match" section per rgreenwalt's comments and added flowchart.
2009-06-24 15:45:32 -07:00
Romain Guy
2d6be60fdd am a0fd1d74: Fix NPE in RelativeLayout.
Merge commit 'a0fd1d742d8edaf6c7e79bdd16a9b0c44fda4503'

* commit 'a0fd1d742d8edaf6c7e79bdd16a9b0c44fda4503':
  Fix NPE in RelativeLayout.
2009-06-24 15:45:27 -07:00
Android (Google) Code Review
714d24f2b1 am e181409c: Merge change 5240 into donut
Merge commit 'e181409ced966f2bea6128bf32b0334e34fcf58c'

* commit 'e181409ced966f2bea6128bf32b0334e34fcf58c':
  Fixing the synth function so that queue processing continues.
2009-06-24 15:45:23 -07:00
Android (Google) Code Review
6ef6895b03 am df65b60c: Merge change 5243 into donut
Merge commit 'df65b60ce33e5a56815864f8f0713e25378fa649'

* commit 'df65b60ce33e5a56815864f8f0713e25378fa649':
  Only report "unknown metadata" once per restore helper
2009-06-24 15:45:20 -07:00
Android (Google) Code Review
21c7d43004 am 2cf6f5df: Merge change 5238 into donut
Merge commit '2cf6f5df59d466a729cc10b7688e17cd548a2fda'

* commit '2cf6f5df59d466a729cc10b7688e17cd548a2fda':
  Fix the weird anchoring of the search dropdown when pivoting into an
2009-06-24 15:45:17 -07:00
Android (Google) Code Review
0dbed7d687 am b28bf241: Merge change 5226 into donut
Merge commit 'b28bf241c56264b915ec3ca0e81256bb1d009aa5'

* commit 'b28bf241c56264b915ec3ca0e81256bb1d009aa5':
  Fix bug in TTS service where the language setting was using the default language
2009-06-24 15:45:06 -07:00
Android (Google) Code Review
c52aaa9088 am 83f6b130: Merge change 5237 into donut
Merge commit '83f6b130181982eb653621c2c4028feae36f1ffb'

* commit '83f6b130181982eb653621c2c4028feae36f1ffb':
  Calling setItemChecked(p, true) twice would toggle the selection in ListView.
2009-06-24 15:45:03 -07:00
Android (Google) Code Review
7c8c554e2d am a4335ee8: Merge change 5236 into donut
Merge commit 'a4335ee8a7ce9e45b1d3b7a0eb7aefa16b7024b1'

* commit 'a4335ee8a7ce9e45b1d3b7a0eb7aefa16b7024b1':
  RelativeLayout was ignoring some dependencies.
2009-06-24 15:44:51 -07:00
Android (Google) Code Review
aa8d188de3 am a93466f5: Merge change 5220 into donut
Merge commit 'a93466f5ca41c2ba6c3524c8d1edc2138bf753e3'

* commit 'a93466f5ca41c2ba6c3524c8d1edc2138bf753e3':
  Cleanup header file. Disallow copy of Camera object by making copy
2009-06-24 15:44:45 -07:00
Christopher Tate
3fc010e74e am 54118adb: Put back LOGP -> printf in the backup helper code
Merge commit '54118adb3766fdf73a409102b88d7494bb6889a3'

* commit '54118adb3766fdf73a409102b88d7494bb6889a3':
  Put back LOGP -> printf in the backup helper code
2009-06-24 15:44:40 -07:00
Android (Google) Code Review
5a35e220c5 am 0e034e5a: Merge change 5162 into donut
Merge commit '0e034e5a9a71e5e196baff630dca796a0e3ed3e2'

* commit '0e034e5a9a71e5e196baff630dca796a0e3ed3e2':
  Preserve file access mode when backing up / restoring files
2009-06-24 15:44:37 -07:00
Mike LeBeau
fc486ea207 am 6f8e5923: Move to a single dropdown background for the search dialog. This one is full-screen width but has rounded corners on the bottom so it doesn\'t look crappy if the list is not full-screen height. This was already being used for in-app search, so I just got r
Merge commit '6f8e592347d463044b7dd8999588840cec6e956e'

* commit '6f8e592347d463044b7dd8999588840cec6e956e':
  Move to a single dropdown background for the search dialog. This one
2009-06-24 15:33:31 -07:00
Android (Google) Code Review
44f47876f3 am a2a60a21: Merge change 5142 into donut
Merge commit 'a2a60a215030ca2171bc59aaeeac4179816f0796'

* commit 'a2a60a215030ca2171bc59aaeeac4179816f0796':
  Fix NPE in GradientDrawable constructor
2009-06-24 15:33:29 -07:00
Android (Google) Code Review
abcdcd7bed Merge change 5171 into donut
* changes:
  Track native processes and airplane mode.
2009-06-24 15:21:16 -07:00
Android (Google) Code Review
b7655ae567 Merge change 4556 into donut
* changes:
  Added info about mcc and mnc, plus other changes per http://b/1918247; rewrote "How Android find best match" section per rgreenwalt's comments and added flowchart.
2009-06-24 14:32:40 -07:00
Android (Google) Code Review
50870119ea Merge change 5240 into donut
* changes:
  Fixing the synth function so that queue processing continues.
2009-06-24 14:03:33 -07:00
Android (Google) Code Review
b6ab1e9010 Merge change 5243 into donut
* changes:
  Only report "unknown metadata" once per restore helper
2009-06-24 13:58:52 -07:00
Christopher Tate
bd95c1d3af Only report "unknown metadata" once per restore helper
Also removes the auto-free object, replacing it with direct memory manipulation.
2009-06-24 13:57:29 -07:00
Android (Google) Code Review
56a183daf2 Merge change 5238 into donut
* changes:
  Fix the weird anchoring of the search dropdown when pivoting into an app for search. (This started when we moved to system process, not sure why then, but we should be getting the dropdown to update at this point regardless.)
2009-06-24 13:54:28 -07:00
Android (Google) Code Review
de5b60b062 am eaa89f74: Merge change 5172 into donut
Merge commit 'eaa89f74c04c0f10d5f3f8190b457087537bff2e'

* commit 'eaa89f74c04c0f10d5f3f8190b457087537bff2e':
  Remove deprecated callback function support.
2009-06-24 13:54:13 -07:00
Android (Google) Code Review
e193f7cd9e am 3d7b8d1a: Merge change 5158 into donut
Merge commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282'

* commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282':
  Use a ref-counted callback interface for Camera.
2009-06-24 13:54:09 -07:00
Bjorn Bringert
994c7d1fe2 am 544450b4: Fix NPE in SuggestionsAdapter when cursor is null.
Merge commit '544450b4eee175c78a1ca8647a3bfaca4aecf47a'

* commit '544450b4eee175c78a1ca8647a3bfaca4aecf47a':
  Fix NPE in SuggestionsAdapter when cursor is null.
2009-06-24 13:54:05 -07:00
Bjorn Bringert
db4643f358 am 5f80605a: Include user query in search intents
Merge commit '5f80605a0b866f34c74955e190909bd6ab5d992e'

* commit '5f80605a0b866f34c74955e190909bd6ab5d992e':
  Include user query in search intents
2009-06-24 13:53:55 -07:00
Android (Google) Code Review
327adb8fec am 82a32714: Merge change 5190 into donut
Merge commit '82a32714f07d25259b91163d383ccdb74a166d2d'

* commit '82a32714f07d25259b91163d383ccdb74a166d2d':
  Fix 1933269: startPreview failed.
2009-06-24 13:53:24 -07:00
Romain Guy
e786b1e9a2 resolved conflicts for merge of 5a42b083 to master 2009-06-24 13:51:26 -07:00
Android (Google) Code Review
b24aebb3f1 Merge change 5226 into donut
* changes:
  Fix bug in TTS service where the language setting was using the default language when the setting wasn't enforced, and vice-versa. Cleaning the log of the native TTS layer to use LOGV for verbose messages, rather than LOGI.
2009-06-24 13:15:05 -07:00