OSDN Git Service
Kelly2.Blue [Tue, 5 Jan 2010 07:39:15 +0000 (15:39 +0800)]
add notouch resources for avoid crash on notouch machine
The Android Open Source Project [Fri, 5 Feb 2010 16:09:39 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 29 Jan 2010 22:09:22 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot
The Android Open Source Project [Tue, 12 Jan 2010 23:19:10 +0000 (15:19 -0800)]
android-2.1_r1 snapshot
The Android Automerger [Thu, 10 Dec 2009 17:01:23 +0000 (09:01 -0800)]
Merge branch 'eclair' into eclair-release
Eric Fischer [Thu, 10 Dec 2009 01:25:20 +0000 (17:25 -0800)]
Import revised translations. DO NOT MERGE
The Android Automerger [Tue, 8 Dec 2009 16:48:40 +0000 (08:48 -0800)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Mon, 7 Dec 2009 21:25:02 +0000 (13:25 -0800)]
Merge change I0ad3fc43 into eclair
* changes:
Avoid IAE by only dismissing dialog when still attached.
The Android Automerger [Fri, 4 Dec 2009 17:23:59 +0000 (09:23 -0800)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Thu, 3 Dec 2009 22:00:44 +0000 (14:00 -0800)]
Merge change Ifb15e7fe into eclair
* changes:
Make call log requeries use background thread.
The Android Automerger [Thu, 3 Dec 2009 21:41:17 +0000 (13:41 -0800)]
Merge branch 'eclair' into eclair-release
Romain Guy [Thu, 3 Dec 2009 19:56:31 +0000 (11:56 -0800)]
Add QuickContact badge around contacts shortcuts.
Change-Id: I0757abbc118979917bc7d3ecb64103a9cdd4da00
The Android Automerger [Thu, 3 Dec 2009 16:59:38 +0000 (08:59 -0800)]
Merge branch 'eclair' into eclair-release
Joe Onorato [Thu, 3 Dec 2009 04:17:19 +0000 (20:17 -0800)]
Make QuickContactActivity look at the sourceBounds property of Intent as well.
Romain Guy [Thu, 3 Dec 2009 03:55:14 +0000 (19:55 -0800)]
Make Home contacts shortcut bring up the quick contact window.
Change-Id: I9cb20b9c7d77dc29a08019554f746089665403f5
Jeff Sharkey [Tue, 1 Dec 2009 19:53:46 +0000 (11:53 -0800)]
Make call log requeries use background thread.
Fixes http://b/
2285268
Jeff Sharkey [Tue, 1 Dec 2009 21:56:40 +0000 (13:56 -0800)]
Avoid IAE by only dismissing dialog when still attached.
Fixes http://b/
2138584
The Android Automerger [Tue, 1 Dec 2009 17:06:11 +0000 (09:06 -0800)]
Merge branch 'eclair' into eclair-release
Eric Fischer [Mon, 30 Nov 2009 19:35:32 +0000 (11:35 -0800)]
Import revised translations. DO NOT MERGE
The Android Automerger [Sun, 15 Nov 2009 17:05:12 +0000 (09:05 -0800)]
Merge branch 'eclair' into eclair-release
Eric Fischer [Sat, 14 Nov 2009 01:20:47 +0000 (17:20 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
The Android Automerger [Fri, 13 Nov 2009 21:12:32 +0000 (13:12 -0800)]
Merge branch 'eclair' into eclair-release
The Android Automerger [Fri, 13 Nov 2009 16:38:48 +0000 (08:38 -0800)]
Merge branch 'eclair' into eclair-release
Eric Fischer [Fri, 13 Nov 2009 03:47:23 +0000 (19:47 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:46:09 +0000 (18:46 -0800)]
eclair snapshot
Brett Chabot [Thu, 12 Nov 2009 19:48:30 +0000 (11:48 -0800)]
Add instrumentation definition for ContactsLaunchPerformance.
Change-Id: I5f0d8ddf59184d8b80a18d46ba246d5437f4e0d2
The Android Automerger [Wed, 11 Nov 2009 16:36:21 +0000 (08:36 -0800)]
Merge branch 'eclair' into eclair-release
Daisuke Miyakawa [Wed, 11 Nov 2009 07:42:49 +0000 (16:42 +0900)]
Revert "Use scan mode introduced in VCardParser."
This reverts commit
51f6f77ef0fb1e16be9d19009252ced701e19f75.
Found that the change above is NOT related to the issue
2245363 and break the build.
Dr.NO: Hiroshi
Internal issue number:
2245363
Android (Google) Code Review [Wed, 11 Nov 2009 07:03:01 +0000 (23:03 -0800)]
Merge change I428a6432 into eclair
* changes:
Use scan mode introduced in VCardParser.
Daisuke Miyakawa [Tue, 10 Nov 2009 22:16:18 +0000 (07:16 +0900)]
Use scan mode introduced in VCardParser.
This change must be merged after the change I5d30aa18 being submitted.
Internal issue number:
2245363
Dr.NO: Hiroshi
Jean-Michel Trivi [Tue, 10 Nov 2009 21:00:45 +0000 (13:00 -0800)]
Fix bug
2239212 "Dial pad has no sound"
The DTMF stream volume is tied to the in-call volume. In the dialer
outside of a call, the user has no way to change the touch tone
volume. If (s)he lowered the incall volume all the way down,
the user will usually complain that the dial pad has no sound,
and if they maxed it out, they'll complain it's too loud.
This change causes the tones to use the media volume, outside of
a call only, and to change the media volume when the user presses
the hardware volume keys.
This gives us both the advantage of keeping the incall behavior consistent
with the existing behavior (AFAIK there are no complaints regarding
in call DTMF volume), but offers the user control over the volume
in the dialer before/after a call.
Android Git Automerger [Fri, 6 Nov 2009 22:35:20 +0000 (14:35 -0800)]
Merge commit 'goog/eclair' into eclair-release
Nicolas Catania [Fri, 6 Nov 2009 21:19:43 +0000 (13:19 -0800)]
Added VIBRATE permission to allow haptic feedback.
Bug:
2244573
The Android Automerger [Wed, 4 Nov 2009 16:42:21 +0000 (08:42 -0800)]
Merge branch 'eclair' into eclair-release
The Android Automerger [Tue, 3 Nov 2009 21:35:30 +0000 (13:35 -0800)]
Merge branch 'eclair' into eclair-release
Jeff Sharkey [Tue, 3 Nov 2009 20:57:16 +0000 (12:57 -0800)]
Avoid offering "share" for restricted-only contacts.
Fixes http://b/
2223256
The Android Automerger [Fri, 30 Oct 2009 23:16:06 +0000 (16:16 -0700)]
Merge branch 'eclair' into eclair-release
Jeff Sharkey [Fri, 30 Oct 2009 20:41:53 +0000 (13:41 -0700)]
Avoid NPE in isEmpty() when no EditFields defined.
Fixes http://b/
2226220
Eric Fischer [Fri, 30 Oct 2009 17:04:58 +0000 (10:04 -0700)]
Import revised translations. DO NOT MERGE
The Android Automerger [Fri, 30 Oct 2009 01:38:15 +0000 (18:38 -0700)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Thu, 29 Oct 2009 23:59:17 +0000 (19:59 -0400)]
Merge change I994fc479 into eclair
* changes:
Send RESULT_CANCELED when missing, return legacy Uris.
Jeff Sharkey [Wed, 28 Oct 2009 00:22:53 +0000 (17:22 -0700)]
Send RESULT_CANCELED when missing, return legacy Uris.
When no contact was persisted (for example a save that has
been trimmed to a no-op) we return RESULT_CANCELED.
When an Intent like ACTION_INSERT requests a legacy Uri we
correctly return a legacy Uri instead of lookup-style.
Fixes http://b/
2219805 and http://b/
2219813
Jeff Sharkey [Wed, 28 Oct 2009 21:20:42 +0000 (14:20 -0700)]
When reparenting, prefer GROUP_ROW_ID but allow fallback.
When a GROUP_SOURCE_ID is the only value provided, usually
while a sync is still going on, allow it to remain when a
valid ROW_ID is present. Fixes http://b/
2222283
Evan Millar [Thu, 29 Oct 2009 22:22:37 +0000 (15:22 -0700)]
Fix bug http://b/issue?id=
2208177
Use a subclass of ListView that explicitly requests focus after the
first time it is layed out.
The Android Automerger [Thu, 29 Oct 2009 21:45:28 +0000 (14:45 -0700)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Thu, 29 Oct 2009 15:12:24 +0000 (11:12 -0400)]
Merge change I2dc2bdef into eclair
* changes:
Final UI tweaks for the WGVA dialer.
The Android Automerger [Thu, 29 Oct 2009 06:56:43 +0000 (23:56 -0700)]
Merge branch 'eclair' into eclair-release
Eric Fischer [Thu, 29 Oct 2009 04:18:03 +0000 (21:18 -0700)]
Import revised translations. DO NOT MERGE
Nicolas Catania [Wed, 28 Oct 2009 22:11:39 +0000 (15:11 -0700)]
Final UI tweaks for the WGVA dialer.
Added a bit more space around the torpedo. (VM/dial/BS)
Tested with wvga800 and wvga850.
wvga800 match perfectly the designer's mocks.
wvga854 the torpedo is about 2px lower than it should but
it is best I can do to make the long layout work.
Bug:
2198341
The Android Open Source Project [Thu, 22 Oct 2009 15:30:22 +0000 (08:30 -0700)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Wed, 21 Oct 2009 20:33:58 +0000 (16:33 -0400)]
Merge change I3d0980fd into eclair
* changes:
Fix hardcoded px dimensions in "dialpad chooser" UI.
Eric Fischer [Wed, 21 Oct 2009 17:43:57 +0000 (10:43 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
The Android Open Source Project [Wed, 21 Oct 2009 16:01:51 +0000 (09:01 -0700)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Wed, 21 Oct 2009 14:32:34 +0000 (10:32 -0400)]
Merge change I7a26b27a into eclair
* changes:
Fixed the contact's dialer layout.
Android (Google) Code Review [Wed, 21 Oct 2009 14:32:02 +0000 (10:32 -0400)]
Merge change Ic19d66e9 into eclair
* changes:
Changed the dialed numbers' foreground to be white instead of black.[do not merge]
Nicolas Catania [Tue, 13 Oct 2009 16:59:54 +0000 (09:59 -0700)]
Changed the dialed numbers' foreground to be white instead of black.[do not merge]
Bug:
2184896
Nicolas Catania [Tue, 20 Oct 2009 19:36:32 +0000 (12:36 -0700)]
Fixed the contact's dialer layout.
Currently the bottom row is clipped on WVGA-800.
Changes were made to fix the emergency dialer
that needed to be applied to the contact dialer.
Now, the contact dialer uses the same ButtonGridLayout
class which aligns the button at the bottom of the view.
This way we can control the spacing between the last row and
the 'torpedo' accurately.
The rest of the white space is distributed amongst the element
using layout_weight="1".
Tested on VGA, WVGA-854, WVGA-800
Bug:
2198341
David Brown [Tue, 20 Oct 2009 19:09:17 +0000 (12:09 -0700)]
Fix hardcoded px dimensions in "dialpad chooser" UI.
In the "dialpad chooser" UI (which comes up if you launch the Dialer while
a call is already in progress) the 3 items are too tightly spaced on WVGA
devices. Fixed by changing the relevant dimensions from px to dp.
BUG=
2185527
TESTED: got into the "chooser" state on a WVGA phone, confirmed the items
are now sized correctly.
Evan Millar [Mon, 12 Oct 2009 22:09:21 +0000 (15:09 -0700)]
Move internal change 29743 into eclair from eclair-mr2
Fixes http://b/viewIssue?id=
2176887
Don't show the keyboard when you enter EditContactActivity
The Android Open Source Project [Mon, 19 Oct 2009 16:17:02 +0000 (09:17 -0700)]
Merge branch 'eclair' into eclair-release
Paul Berman [Fri, 9 Oct 2009 16:04:10 +0000 (12:04 -0400)]
Allow TwelveKeyDialer call button to send empty flash for CDMA
Currently the TwelveKeyDialer does not allow the user to press the green
call button if the dial text is empty. However, in CDMA when we place a
3-way call in some network infrastructures, you need to send an empty
Flash command to the network before adding the call. The user is accustomed to
pressing the call button in order to do this. Therefore here we make the
changes in TwelveKeyDialer.java required to handle that keypress and send the
blank flash.
Bug:
2179060
Change-Id: Ib8d05459cac708f9dc216412103c1a324d747ecb
The Android Open Source Project [Thu, 15 Oct 2009 00:15:41 +0000 (17:15 -0700)]
Merge branch 'eclair' into eclair-release
Evan Millar [Wed, 14 Oct 2009 23:23:37 +0000 (16:23 -0700)]
Fix off by one bug in favorites list call button.
bc_triaged bug: http://b/issue?id=
2179352
Dr. No: Tim Sullivan
The Android Open Source Project [Wed, 14 Oct 2009 02:27:11 +0000 (19:27 -0700)]
Merge branch 'eclair' into eclair-release
Jeff Sharkey [Tue, 13 Oct 2009 23:27:09 +0000 (16:27 -0700)]
Remove vertical and colored bars from editors.
Fixes http://b/
2186076
The Android Open Source Project [Tue, 13 Oct 2009 00:56:37 +0000 (17:56 -0700)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Mon, 12 Oct 2009 20:39:28 +0000 (16:39 -0400)]
Merge change I43723de2 into eclair
* changes:
Avoid setting checked state when dismissing FastTrack.
Android (Google) Code Review [Mon, 12 Oct 2009 20:34:46 +0000 (16:34 -0400)]
Merge change I1cde5dd0 into eclair
* changes:
In landscape mode, set the type of digit area to PHONE[do not merge].
Jeff Hamilton [Sun, 11 Oct 2009 06:17:48 +0000 (01:17 -0500)]
Show phones and email addresses for read-only contacts.
Bug:
2180041
Change-Id: I686e5413bb3de4c9373da177673c485581c87bb9
Nicolas Catania [Fri, 9 Oct 2009 18:09:45 +0000 (11:09 -0700)]
In landscape mode, set the type of digit area to PHONE[do not merge].
Backport from Ieb30191ace8a0d62adec4feaca8f81df7ac4e71b
Previously we blindely set the EditText to NULL to prevent the IME
keyboard to pop up in portrait mode. The issue is that in landscape
mode, the keyboard is not in numlock mode which is a pb on devices
where the 1st line is not made of numbers.
Bug:
2180808
Jeff Sharkey [Mon, 12 Oct 2009 17:50:08 +0000 (10:50 -0700)]
Avoid setting checked state when dismissing FastTrack.
Fixes http://b/
2180222
The Android Open Source Project [Sat, 10 Oct 2009 19:50:46 +0000 (12:50 -0700)]
Merge branch 'eclair' into eclair-release
Eric Fischer [Fri, 9 Oct 2009 22:36:01 +0000 (15:36 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
The Android Open Source Project [Fri, 9 Oct 2009 22:01:32 +0000 (15:01 -0700)]
Merge branch 'eclair' into eclair-release
Evan Millar [Fri, 9 Oct 2009 17:13:32 +0000 (10:13 -0700)]
Clear bitmap cache in onResume() to make sure photos are fresh.
bc_triaged bug: http://b/issue?id=
2177238
Dr. No: Tim Sullivan
Android (Google) Code Review [Fri, 9 Oct 2009 04:47:19 +0000 (00:47 -0400)]
Merge change I700622d9 into eclair
* changes:
Fix up photo editing, and few other tweaks to contact editing.
Jeff Hamilton [Fri, 9 Oct 2009 00:46:26 +0000 (19:46 -0500)]
Fix up photo editing, and few other tweaks to contact editing.
- When tapping a photo you're given a choice to replace, remove, or use as primary
- Fix an issue where the secondary group would show when it shouldn't
- Tweak the size of the color bar per Chris
- Format phone numbers when typing them
- Fix a display issue with contacts that didn't fill the height of the screen
- If a contact is read-only and doesn't have a photo don't offer the option to add one
Bugs:
2163109 &
2163519
Change-Id: I700622d9dfdbcaa81e5b577fd5b2a38d708374aa
Jeff Sharkey [Thu, 8 Oct 2009 23:57:06 +0000 (16:57 -0700)]
Handle external sources that request both social and detail.
When a source requests social summary, allow them to still
provide a fallback detail value when no social summary is
available. (Otherwise the data row would be invisible.)
Partially fixes http://b/
2176892
Jeff Sharkey [Thu, 8 Oct 2009 23:39:33 +0000 (16:39 -0700)]
New infobar background assets.
Fixes http://b/
2153296
Android (Google) Code Review [Thu, 8 Oct 2009 22:07:52 +0000 (18:07 -0400)]
Merge change I3ee009e6 into eclair
* changes:
Make shortcut icons adjust to hdpi display.
Evan Millar [Thu, 8 Oct 2009 21:50:27 +0000 (14:50 -0700)]
Make shortcut icons adjust to hdpi display.
bc_triaged bug: http://b/issue?id=
2171333
Change-Id: I3ee009e6469c0472f21a1cf82875a8419c39f59a
Eric Fischer [Thu, 8 Oct 2009 21:59:34 +0000 (14:59 -0700)]
am
906af3fb: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
906af3fbedb9034c84fd18139fa16d3f542d1f67' into eclair
* commit '
906af3fbedb9034c84fd18139fa16d3f542d1f67':
Import revised translations. DO NOT MERGE
The Android Open Source Project [Thu, 8 Oct 2009 21:44:40 +0000 (14:44 -0700)]
Merge branch 'eclair' into eclair-release
Jeff Sharkey [Thu, 8 Oct 2009 18:13:47 +0000 (11:13 -0700)]
Trim edit fields that don't contain printable values.
When persisting edit changes, trim data rows that have no
printable characters. Also wrote unit tests for new method
and building of IM intents to check Uri escaping.
Fixes http://b/
2173811
Jeff Sharkey [Thu, 8 Oct 2009 17:22:30 +0000 (10:22 -0700)]
Allow omission of RES_PACKAGE for status attributions.
FastTrack was being overly cautious about attribution labels
coming from third-party sources. When no RES_PACKAGE is
defined, we now fall back to using the local package instead
of completely dropping the attribution line.
Fixes http://b/
2175531
Evan Millar [Thu, 8 Oct 2009 17:24:12 +0000 (10:24 -0700)]
Handle IM entries with missing protocol field.
Fix bc_triaged bug http://b/issue?id=
2174637
Dr. No approval from Tim Sullivan
Change-Id: Ia91c39e91a54e3c58ec94d1c5064a9572519f036
Jeff Sharkey [Thu, 8 Oct 2009 17:29:22 +0000 (10:29 -0700)]
Omit attribution icon in medium FastTrack.
Fixes http://b/
2175531
Android (Google) Code Review [Thu, 8 Oct 2009 17:07:14 +0000 (13:07 -0400)]
Merge change I652a8d7b into eclair
* changes:
Fix ImportVCardActivity so that NPE will never occur during import.
Jeff Sharkey [Wed, 7 Oct 2009 20:52:48 +0000 (13:52 -0700)]
Ignore transient rows during re-parenting.
When editing, we create template rows such as StructuredName
and Photo, which may be trimmed before persisting if they
remain empty. When a background change occurs and we need
to re-parent the users changes, we didn't handle this
special case, and treated these trimmed rows as inserts,
which triggered the reported missing MIME-type exception.
This change watches for "transient" rows that didn't exist
previously, but were inserted and then deleted during the
process of editing. When encountered, they are ignored
during re-parenting, instead of turning into inserts.
Added a unit test to verify correct behavior, and also wrote
values-level verification for the existing unit tests.
Fixes http://b/
2167925
Jeff Sharkey [Wed, 7 Oct 2009 20:53:39 +0000 (13:53 -0700)]
Increment tries as we reparent to avoid looping.
Fixes http://b/
2173452
android-build SharedAccount [Thu, 8 Oct 2009 04:00:35 +0000 (21:00 -0700)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Thu, 8 Oct 2009 02:19:24 +0000 (22:19 -0400)]
Merge change Ibc1b1f7d into eclair
* changes:
Follow up changes from review of Ib2afc992.
Daisuke Miyakawa [Fri, 2 Oct 2009 23:48:06 +0000 (16:48 -0700)]
Fix ImportVCardActivity so that NPE will never occur during import.
The NPE occurs only when the importing thread exits before the progress dialog is shown.
In theory (and in practice), this is rare, but anyway, this is a bug.
-----IMPORTANT-----
This change is cherry-picked from the latest build to the eclair.
Please see the description in the issue bellow.
-------------------
Internal issue number:
2164280
Dmitri Plotnikov [Thu, 8 Oct 2009 00:07:03 +0000 (17:07 -0700)]
[Issue
2174171] Fixing Join Contact UI title.
The title should read: "Select the contact you want to join with John Doe"
Change-Id: Iec1f41ce97e251635048f91020410cc1981cffbb
Neel Parekh [Wed, 7 Oct 2009 20:52:38 +0000 (13:52 -0700)]
Fix clicking on the total contacts header item.
Bug:
2160378
android-build SharedAccount [Thu, 8 Oct 2009 00:08:58 +0000 (17:08 -0700)]
Merge branch 'eclair' into eclair-release
Evan Millar [Wed, 7 Oct 2009 22:15:05 +0000 (15:15 -0700)]
Fix bc_triaged http://b/issue?id=
2155790
Dr.No approval from Tim Sullivan
Change-Id: I893d40499303accbf675c7e7e2e5873b4800b052
Android (Google) Code Review [Wed, 7 Oct 2009 23:48:00 +0000 (19:48 -0400)]
Merge change I89190b8b into eclair
* changes:
New photo frame in LARGE QuickCotnact window
Android (Google) Code Review [Wed, 7 Oct 2009 23:24:15 +0000 (19:24 -0400)]
Merge change Ia961aa60 into eclair
* changes:
Contacts: fixed custom label handling in GenericEditorView.
Evan Millar [Wed, 7 Oct 2009 22:36:36 +0000 (15:36 -0700)]
New photo frame in LARGE QuickCotnact window
bc_triaged bug: http://b/issue?id=
2170892
Dr.No: Tim Sullivan
Change-Id: I89190b8bf0ba019645c3beb2fe2b73decca0c948