Daisuke Miyakawa
b178edb4d7
am 3e3324ba: Merge the change in cupcake_dcm so that Contacts app is able to use it.
...
Merge commit '3e3324bae45ff21615c07507e6918ad21681a6a2'
* commit '3e3324bae45ff21615c07507e6918ad21681a6a2':
Merge the change in cupcake_dcm so that Contacts app is able to use it.
2009-06-21 21:44:01 -07:00
Daisuke Miyakawa
3e3324bae4
Merge the change in cupcake_dcm so that Contacts app is able to use it.
2009-06-22 13:37:03 +09:00
Android (Google) Code Review
17c848a27c
am 9e71b07c: Merge change 4829 into donut
...
Merge commit '9e71b07cfe88cdb1abf4a01077ca263d7f957c94'
* commit '9e71b07cfe88cdb1abf4a01077ca263d7f957c94':
Fixes #1926784 . Setting android:ellipsize on an EditText now ellipsizes the hint.
2009-06-19 18:20:16 -07:00
Android (Google) Code Review
9e71b07cfe
Merge change 4829 into donut
...
* changes:
Fixes #1926784 . Setting android:ellipsize on an EditText now ellipsizes the hint.
2009-06-19 18:18:42 -07:00
Jaikumar Ganesh
395d102366
Send the name of the device in the DeviceFound signal.
...
When name resolution is done, we get a DeviceFound signal.
Settings app was not updating the cache.
2009-06-19 17:43:36 -07:00
Grace Kloba
b0774438ea
am 3af8e938: Change addCertificate to take byte[] instead of String as we don\'t know the encoding.
...
Merge commit '3af8e9389e008c0076b86cc6b3c6f005e7473d10'
* commit '3af8e9389e008c0076b86cc6b3c6f005e7473d10':
Change addCertificate to take byte[] instead of String as we don't know the encoding.
2009-06-19 16:43:59 -07:00
Android (Google) Code Review
f1891f4b79
am 52546575: Merge change 4818 into donut
...
Merge commit '5254657540b0a6ad54be6229b68fa5626e4ef9e5'
* commit '5254657540b0a6ad54be6229b68fa5626e4ef9e5':
Added in Settings.Secure default country and variant for the default TTS language.
2009-06-19 16:43:46 -07:00
Android (Google) Code Review
47e4d45cb6
am b4e456bf: Merge change 4785 into donut
...
Merge commit 'b4e456bf1823e2dd8c975ae02451b7b72541c236'
* commit 'b4e456bf1823e2dd8c975ae02451b7b72541c236':
Fix issue #1753079 : running instrumentation in shared processes.
2009-06-19 16:43:39 -07:00
Romain Guy
4dc4f73cab
Fixes #1926784 . Setting android:ellipsize on an EditText now ellipsizes the hint.
...
It doesn't make much sense to ellipsize the text entered by the user, so we
just ellipsize the hint. This avoids introducing a new XML attribute/Java API
just for the particular case of ellipsizing the hint.
2009-06-19 16:39:35 -07:00
Grace Kloba
3af8e9389e
Change addCertificate to take byte[] instead of String as we don't know the encoding.
...
In WebView, if we run into the certificate, we will save it to the Keystore instead of sending it to the WebKit.
2009-06-19 15:09:34 -07:00
Android (Google) Code Review
b77490d935
Merge change 4688
...
* changes:
Copies the Contacts.Intents class to ContactsContract.
2009-06-19 14:56:13 -07:00
Evan Millar
dc2da5fd92
Copies the Contacts.Intents class to ContactsContract.
...
ContactsContract now contains all the useful constants that are
contained in Contacts.Intents. Because we have to continue to
support the Contacts interface, the constants are kept there,
but now simply reference the real versions in Contacts.Intents.
Contacts.Intents will be deprecated and developers are encouraged
to move to Contacts.Intents.
2009-06-19 14:51:04 -07:00
Android (Google) Code Review
9c07cab32d
am 4d1b5bd1: Merge change 4808 into donut
...
Merge commit '4d1b5bd148d0830d2acc03bafbe58dfd17e5b3f8'
* commit '4d1b5bd148d0830d2acc03bafbe58dfd17e5b3f8':
Fixes #1928566 . Prevents runtime restart upon configuration change.
2009-06-19 14:49:49 -07:00
The Android Open Source Project
f418214af3
merge 9ebd737e w/conflicts
2009-06-19 14:47:58 -07:00
Android (Google) Code Review
5254657540
Merge change 4818 into donut
...
* changes:
Added in Settings.Secure default country and variant for the default TTS language.
2009-06-19 14:43:37 -07:00
Android (Google) Code Review
b4e456bf18
Merge change 4785 into donut
...
* changes:
Fix issue #1753079 : running instrumentation in shared processes.
2009-06-19 14:24:39 -07:00
Jean-Michel Trivi
a6fcc95411
Added in Settings.Secure default country and variant for the default TTS language.
2009-06-19 14:18:41 -07:00
Ye Wen
44c6e3e785
Fix bug1435331: add a gservices setting for the retry threshold of auth expired failure.
2009-06-19 13:45:47 -07:00
Android (Google) Code Review
4d1b5bd148
Merge change 4808 into donut
...
* changes:
Fixes #1928566 . Prevents runtime restart upon configuration change.
2009-06-19 13:31:14 -07:00
Android (Google) Code Review
9ebd737e12
Merge change 4793 into donut
...
* changes:
dpi changes for webview
2009-06-19 13:24:44 -07:00
Romain Guy
e35c235145
Fixes #1928566 . Prevents runtime restart upon configuration change.
...
Managed dialogs could cause dispatchOnCreate() to be called twice, which
would cause an exception.
2009-06-19 13:18:12 -07:00
Android (Google) Code Review
350feeb836
am b00518d8: Merge change 4796 into donut
...
Merge commit 'b00518d81550c638728b53346a2a25f0a80a1049'
* commit 'b00518d81550c638728b53346a2a25f0a80a1049':
Move USE_LOCATION_FOR_SERVICES to Secure.
2009-06-19 12:57:22 -07:00
Grace Kloba
2573791620
dpi changes for webview
2009-06-19 12:42:47 -07:00
Android (Google) Code Review
d0b47a1740
am ba6409f1: Merge change 4706 into donut
...
Merge commit 'ba6409f1f69db7dfa16d5b914d2bc41a3aa43caf'
* commit 'ba6409f1f69db7dfa16d5b914d2bc41a3aa43caf':
Add a new checkin server flag for Vending Machine heartbeats.
2009-06-19 12:12:15 -07:00
Amith Yamasani
630cd06414
Move USE_LOCATION_FOR_SERVICES to Secure.
...
Since SetupWizard needs to be able to write the setting, it
couldn't live in Gservices. Moved it to Secure.
2009-06-19 12:08:20 -07:00
Android (Google) Code Review
ba6409f1f6
Merge change 4706 into donut
...
* changes:
Add a new checkin server flag for Vending Machine heartbeats.
2009-06-19 11:50:22 -07:00
Dianne Hackborn
c13713519d
am 3d74bb4a: Add "why?" button to low battery dialog.
...
Merge commit '3d74bb4ab27ae9601f5c9c3706fad287845fb672'
* commit '3d74bb4ab27ae9601f5c9c3706fad287845fb672':
Add "why?" button to low battery dialog.
2009-06-19 11:49:27 -07:00
Dianne Hackborn
3d74bb4ab2
Add "why?" button to low battery dialog.
...
This takes the user to the power usage activity.
2009-06-19 11:46:58 -07:00
Android (Google) Code Review
36adccf74f
Merge change 4550
...
* changes:
add a checkin eventlog tag for reporting GTalk heartbeat timeout; remove unused adaptive heartbeat settings.
2009-06-19 11:40:46 -07:00
Dianne Hackborn
d97c7adfc2
Fix issue #1753079 : running instrumentation in shared processes.
...
The check for allowing the start of an activity was broken, it was
comparing the process of that activity's application vs. the current
instrumentation target package name. Okay it was utterly insane.
Now this check is that the target activity will be running in the
same process as the instrumentation, which is really what we want.
2009-06-19 11:37:35 -07:00
Android (Google) Code Review
530b7125fa
am 03255de3: Merge change 4757 into donut
...
Merge commit '03255de32d127d17504b6d475e6e79190dd637f8'
* commit '03255de32d127d17504b6d475e6e79190dd637f8':
Add getBatteryUsageHint() to BluetoothHeadset for power monitoring.
2009-06-19 11:31:37 -07:00
Android (Google) Code Review
03255de32d
Merge change 4757 into donut
...
* changes:
Add getBatteryUsageHint() to BluetoothHeadset for power monitoring.
2009-06-19 11:29:57 -07:00
Suchi Amalapurapu
c73e9ad55a
am bc806f65: Remove deprecated api. Aptly rename freeStorageWithIntent to freeStorage.
...
Merge commit 'bc806f65edc33f6eda0f475ac84e5e037a013a90'
* commit 'bc806f65edc33f6eda0f475ac84e5e037a013a90':
Remove deprecated api. Aptly rename freeStorageWithIntent to freeStorage.
2009-06-19 10:38:45 -07:00
Suchi Amalapurapu
bc806f65ed
Remove deprecated api. Aptly rename freeStorageWithIntent to freeStorage.
2009-06-19 10:25:37 -07:00
Nick Pelly
6c901db72d
Add getBatteryUsageHint() to BluetoothHeadset for power monitoring.
...
This is a monotonically increasing integer. Wraps to 0 at
Integer.MAX_INT, and at boot.
Current implementation returns the number of AT commands handled since
boot. This is a good indicator for spammy headset/handsfree units that
can keep the device awake by polling for cellular status updates. As a
rule of thumb, each AT command prevents the CPU from sleeping for 500 ms
2009-06-19 10:08:09 -07:00
Wu-cheng Li
1e3fc65b1f
am 649f99e8: Add Intent.ACTION_SEND_MULTIPLE
...
Merge commit '649f99e8347984c1e031dae302830f4c9ebd3df4'
* commit '649f99e8347984c1e031dae302830f4c9ebd3df4':
Add Intent.ACTION_SEND_MULTIPLE
2009-06-19 03:55:09 -07:00
Wu-cheng Li
649f99e834
Add Intent.ACTION_SEND_MULTIPLE
...
Activities can use this intent to send multiple data.
2009-06-19 18:48:37 +08:00
Android (Google) Code Review
cc9baea938
Merge change 4621
...
* changes:
Update WebStorage methods used by DumpRenderTree to complete synchronously if they are called on the webcore thread.
2009-06-19 02:09:28 -07:00
Android (Google) Code Review
ba165caf44
am e0b7e916: Merge change 4679 into donut
...
Merge commit 'e0b7e916a1259d2dd9c116695607f9877ec56056'
* commit 'e0b7e916a1259d2dd9c116695607f9877ec56056':
Replace the dummy code with Keystore for <keygen> support.
2009-06-18 19:54:47 -07:00
Android (Google) Code Review
e0b7e916a1
Merge change 4679 into donut
...
* changes:
Replace the dummy code with Keystore for <keygen> support.
2009-06-18 19:52:00 -07:00
Android (Google) Code Review
8dbbe3b52f
am 63e7155c: Merge change 4696 into donut
...
Merge commit '63e7155c7d1d0c3f0027400aa09e9a45f648a80d'
* commit '63e7155c7d1d0c3f0027400aa09e9a45f648a80d':
Fix targetSdkVersion, make resize mode a flag, delayed dexopt, easy ApplicationInfo.
2009-06-18 19:35:32 -07:00
Android (Google) Code Review
63e7155c7d
Merge change 4696 into donut
...
* changes:
Fix targetSdkVersion, make resize mode a flag, delayed dexopt, easy ApplicationInfo.
2009-06-18 19:33:33 -07:00
Android (Google) Code Review
f923ed6ff7
am 5502f04c: Merge change 4709 into donut
...
Merge commit '5502f04c1dcf2b1918858bacb99fb0480a711707'
* commit '5502f04c1dcf2b1918858bacb99fb0480a711707':
backup stuff
2009-06-18 19:04:56 -07:00
Android (Google) Code Review
1c14776a13
am 16ce3504: Merge change 4708 into donut
...
Merge commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9'
* commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9':
Make RestoreHelper and friends also write out the snapshot state.
2009-06-18 19:04:50 -07:00
Android (Google) Code Review
5502f04c1d
Merge change 4709 into donut
...
* changes:
backup stuff
2009-06-18 19:02:39 -07:00
Android (Google) Code Review
16ce3504c5
Merge change 4708 into donut
...
* changes:
Make RestoreHelper and friends also write out the snapshot state.
2009-06-18 19:02:30 -07:00
Linda Nguyen
abd7eba70b
Add a new checkin server flag for Vending Machine heartbeats.
2009-06-18 18:52:59 -07:00
Android (Google) Code Review
81a2a3931f
am 568b62c8: Merge change 4702 into donut
...
Merge commit '568b62c861ed4abc792d517f61640610400614e1'
* commit '568b62c861ed4abc792d517f61640610400614e1':
Fix bug 1927213 test failures.
2009-06-18 18:47:24 -07:00
Android (Google) Code Review
568b62c861
Merge change 4702 into donut
...
* changes:
Fix bug 1927213 test failures.
2009-06-18 18:45:08 -07:00
Joe Onorato
5d605dc56b
backup stuff
2009-06-18 18:41:11 -07:00