OSDN Git Service
Daniel Sandler [Wed, 2 Sep 2009 18:11:13 +0000 (14:11 -0400)]
Roll back (for now) to *all* low-density artwork in Contacts.
This should end http://b/issue?id=
2086871 by removing the high-density assets
introduced in <https://android-git.corp.google.com/w/?p=platform/packages/apps/Contacts.git;a=commit;h=
bb769338d3ba4af769db147bae06e4f3ddc5030c>
They are way out of sync with the current version of Contacts and need to be replaced with updated versions.
Should fix http://b/
2086871.
Dmitri Plotnikov [Wed, 2 Sep 2009 15:44:32 +0000 (08:44 -0700)]
Fixing support for contact shortcuts.
Jeff Sharkey [Tue, 1 Sep 2009 19:00:58 +0000 (12:00 -0700)]
Older EAS types, new Email field, fix count and INSERT bugs.
The EAS sync-adapter isn't ready to handle type-less Email
and IM entries yet, so bring back the original strongly-
typed editors. Partially fixes http://b/
2089080
Provide a second edit field for Email.DISPLAY_NAME when
editing EAS contacts. Partially fixes http://b/
2092744
Correct count when determining canInsert() for fields that
have typeOverallMax constraints. Fixes http://b/
2089132
Correctly build incoming StructuredName using existing
field, and check for empty fields to fix http://b/
2078726
Android (Google) Code Review [Tue, 1 Sep 2009 20:12:00 +0000 (13:12 -0700)]
Merge change 23475 into eclair
* changes:
Return appropriate URI for PICKER intents.
Android (Google) Code Review [Tue, 1 Sep 2009 20:08:33 +0000 (13:08 -0700)]
Merge change 23177 into eclair
* changes:
Refactor the way we track selected tab in ViewContactActivity.
Evan Millar [Mon, 31 Aug 2009 19:52:39 +0000 (12:52 -0700)]
Return appropriate URI for PICKER intents.
Based on under which authority the calling activity is asking, return
either a legacy style URI or new style URI as a result of a PICK
intent.
Change-Id: Icd7cf220c6355ff3fd14a5f9a39fc071aa7c0434
Android (Google) Code Review [Tue, 1 Sep 2009 18:40:43 +0000 (11:40 -0700)]
Merge change 23458 into eclair
* changes:
Temporarily reverting to low-res Contacts tab artwork.
Daniel Sandler [Tue, 1 Sep 2009 18:10:09 +0000 (14:10 -0400)]
Temporarily reverting to low-res Contacts tab artwork.
Per http://b/
2086871 - the hdpi artwork I put into the build previously are
illegible in the current version of the app. External vendor is supposed
to deliver proper high-res artwork for these UI elements at some point, but
until that time, better to have low-res & legible art in place.
Android (Google) Code Review [Tue, 1 Sep 2009 17:49:57 +0000 (10:49 -0700)]
Merge change 23379 into eclair
* changes:
Mark the VCard configuration strings untranslatable.
Eric Fischer [Tue, 1 Sep 2009 00:38:51 +0000 (17:38 -0700)]
Mark the VCard configuration strings untranslatable.
These are internal tokens, not display strings that need translation.
Daisuke Miyakawa [Mon, 31 Aug 2009 23:37:54 +0000 (08:37 +0900)]
Modify string
Jeff Sharkey [Sun, 30 Aug 2009 01:19:20 +0000 (18:19 -0700)]
Expandable structured support, organize editors, much more.
Wrote expandable editor support, so that StructuredName and
StructuredPostal could be displayed compactly on smaller
screens, but still expanded to edit all possible fields.
Reorganized editors to directly inflate classes instead of
using ViewHolder pattern. This helps us prepare for focus
saving logic coming soon, and also required that each data
row have getViewId() to be uniquely identified.
When editing EAS contacts, don't use separate types for
"Email 1", "Email 2", etc, and instead use a single overall
limit on type-less values. (This is dependant on
http://b/
2065904 being resolved.)
Defined fallback "on-phone" account separately to prevent
confusion with Google account, also limited the possible
data types that could be entered.
Suspend aggregation while persisting RawContacts updates
to prevent possible re-aggregation and user confusion when
returning to View activity. Also correctly generate
AggregationExceptions when inserting new RawContacts under
an existing aggregate. Fixes http://b/
2087517
When inserting Google contacts, add GroupMembership for
"My Contacts" to help visibility, fixing http://b/
2070479
Don't reprompt for account when rotating during INSERT,
fixing http://b/
2084585 and hide editor until finished
with async loading. Ensure that specific rows exist so
we always have StructuredName to edit, and have waiting
Phone and Email fields for INSERT.
Used better method of creating generic ArrayList/HashMap.
Daisuke Miyakawa [Sun, 30 Aug 2009 23:09:07 +0000 (08:09 +0900)]
Enable vCard export world-wide
Jeff Sharkey [Sat, 29 Aug 2009 23:07:46 +0000 (16:07 -0700)]
When dismissing Fast-Track, don't let touch fall through.
Instead of being NOT_TOUCH_MODAL and relying on the window
manager to mark ACTION_OUTSIDE touch events, detect the
events ourselves so we don't let them fall through to any
window behind us.
Also clean up some verbose logcat when loading resources.
Evan Millar [Fri, 28 Aug 2009 16:31:57 +0000 (09:31 -0700)]
Refactor the way we track selected tab in ViewContactActivity.
Change-Id: I68ca5a7d7ea3897f2d724f465787fb9c45ffc06f
Android (Google) Code Review [Fri, 28 Aug 2009 20:16:11 +0000 (13:16 -0700)]
Merge change 23139 into eclair
* changes:
High-resolution (hdpi) artwork from TAT for Contacts.
Eric Fischer [Fri, 28 Aug 2009 19:56:58 +0000 (12:56 -0700)]
Armor string format tokens with translation placeholders.
Change-Id: I4644b4d47c553ea89dc935059746f908f73aa3d4
Daniel Sandler [Fri, 28 Aug 2009 18:51:55 +0000 (14:51 -0400)]
High-resolution (hdpi) artwork from TAT for Contacts.
Jeff Sharkey [Fri, 28 Aug 2009 00:05:59 +0000 (17:05 -0700)]
Specific columns for Fast-Track, hide missing social, call.
Request explicit columns needed for Fast-Track, since "null"
projection no longer returns all needed columns. Hide the
medium header when no social snippet is present. Finally,
initiate a direct call instead of simply dialing.
Fixes http://b/
2084086 and http://b/
2072448
Android (Google) Code Review [Thu, 27 Aug 2009 21:34:25 +0000 (14:34 -0700)]
Merge change 22961 into eclair
* changes:
Fix strings whose apostrophes were eaten because of the lack of a backslash.
Eric Fischer [Thu, 27 Aug 2009 20:52:11 +0000 (13:52 -0700)]
Fix strings whose apostrophes were eaten because of the lack of a backslash.
Change-Id: I259c1cd3fb1d2a65db03b4813dc45ab4aafb5632
Evan Millar [Thu, 27 Aug 2009 20:17:39 +0000 (13:17 -0700)]
Fix bug
2082102.
Clear image fetch handler messages in onFinish().
Change-Id: I6630ee4600a0479c03ca92698792eaea0eedab74
Jeff Sharkey [Mon, 24 Aug 2009 05:13:04 +0000 (22:13 -0700)]
Iteration on Fast-Track, new assets drop, account menu icon.
New asset drop for Fast-Track with new style disambig with
"set default" checkbox, will be hooked up soon. Cleanup of
legacy API references in some places.
Adjust action building to query against PackageManager,
which now brings in best-matching app icons. Previously
the data provider needed to supply icons. This solves the
case where people use third-party apps for SMS, etc.
We also use the ResolveInfo to populate the content
description for the track icons so that Fast-Track actions
use the system accessibility APIs.
Android (Google) Code Review [Wed, 26 Aug 2009 22:34:50 +0000 (15:34 -0700)]
Merge change 22820 into eclair
* changes:
New minitab assets.
Evan Millar [Wed, 26 Aug 2009 22:09:02 +0000 (15:09 -0700)]
New minitab assets.
Add new minitab assets, and fix z-ordering so the selcted tab is always
drawn on top, and it's drop shadows bleed over onto adjacent tabs.
Change-Id: I100e20411972285675de42f356c201326c0386f6
Evan Millar [Wed, 26 Aug 2009 15:46:54 +0000 (08:46 -0700)]
Use fasttrack badge in list view.
Right now the fasttrack badge is a private framework asset. This will
change soon when I create a custom fasttrack badge view.
Change-Id: Ibbcb2f691f4e3eb121ba9ea873194468bb4d4b3e
Evan Millar [Wed, 26 Aug 2009 17:35:24 +0000 (10:35 -0700)]
Use new tab assets.
Also make the ContactsActivityList activity draw it's own list
separators, so that it can *not* draw the when an A-Z divider is
visible.
Change-Id: I0755a2cbcb57d646d770003844e394ac0de753ac
Android (Google) Code Review [Wed, 26 Aug 2009 06:14:44 +0000 (23:14 -0700)]
Merge change 22754 into eclair
* changes:
Temporarily remove summary counts from display groups UI.
Jeff Sharkey [Wed, 26 Aug 2009 06:13:16 +0000 (23:13 -0700)]
Temporarily remove summary counts from display groups UI.
The queries pulling these summary stats can be slow when
someone has thousands of contacts. Will add back later once
we have better, faster solution.
Daisuke Miyakawa [Mon, 24 Aug 2009 01:51:58 +0000 (10:51 +0900)]
- Make Contacts app use new vCard handling codes
- Enable "multiple vCard selection"
Internal issue id:
2030674
Android (Google) Code Review [Tue, 25 Aug 2009 21:48:04 +0000 (14:48 -0700)]
Merge change 22311 into eclair
* changes:
Make the minitabs stretch to fit the available space.
Evan Millar [Fri, 21 Aug 2009 03:30:12 +0000 (20:30 -0700)]
Make the minitabs stretch to fit the available space.
Change-Id: Ifd2b774b40e2831f4f2326c0fe9ebbb3e7d714d0
Jeff Sharkey [Tue, 25 Aug 2009 21:19:39 +0000 (14:19 -0700)]
Changed Fast-Track window flags so it avoids dim bug.
Fixes http://b/
2077548
Android (Google) Code Review [Tue, 25 Aug 2009 05:08:36 +0000 (22:08 -0700)]
Merge change 22565 into eclair
* changes:
Fixed up intent MIME-types, add Accounts menu, clean unused.
Android (Google) Code Review [Tue, 25 Aug 2009 05:08:16 +0000 (22:08 -0700)]
Merge change 22499 into eclair
* changes:
Use new API for resolving Email addresses.
Jeff Sharkey [Tue, 25 Aug 2009 03:46:23 +0000 (20:46 -0700)]
Fixed up intent MIME-types, add Accounts menu, clean unused.
Cleaned up <intent-filter> entries for INSERT_OR_EDIT and
EDIT to watch for more MIME-types after legacy change-over.
Finished clean-up from display groups by removing deprecated
edit sync groups UI, and unused menu. Changed
ContactsListActivity to use XML-based menus and added an
"Accounts" link that replaces the edit sync groups.
Finally, hooked up the INSERT case to read extras from any
incoming intents to help with SHOW_OR_CREATE intent testing.
Jeff Sharkey [Mon, 24 Aug 2009 22:27:31 +0000 (15:27 -0700)]
Use new API for resolving Email addresses.
Also fix case where Fast-Track window would end up hanging
when the background query failed.
Dmitri Plotnikov [Mon, 24 Aug 2009 18:42:47 +0000 (11:42 -0700)]
Support for Global Search Shortcut refresh and contact images.
Jeff Sharkey [Sun, 23 Aug 2009 21:16:27 +0000 (14:16 -0700)]
Use extra to exclude specific MIME-types for Fast-Track.
This is used so that the header widget can hide the profile
icon when launched while already looking at the profile.
Also fixes http://b/
2058751
Jeff Sharkey [Sun, 16 Aug 2009 07:12:48 +0000 (00:12 -0700)]
Iteration on display groups UI, was neglected for awhile.
Switched to using Accounts metadata provided through
Sources cache. Also added long-press and menu item to serve
as our "edit sync groups" in the same UI.
Need to iterating to show all accounts regardless of group
existance, and persist DEFAULT_SHOULD_SYNC values.
Jeff Sharkey [Sun, 23 Aug 2009 06:49:02 +0000 (23:49 -0700)]
Always re-read RawContacts._ID before editing.
In cases where the user hasn't selected a tab, and there is
no "All" tab present (a single RawContact), this code would
try reading details for the second tab that didn't exist.
This fixes http://b/
2072410
Evan Millar [Thu, 20 Aug 2009 00:20:49 +0000 (17:20 -0700)]
Handle saving and communicating selected tab between View/Edit activities.
EditContactActivity now accepts intents with raw_contacts instead of
contacts. In addition it reports back which raw_contact was selected on
exit.
ViewContactActivity now saves and restores which raw_contact was
currently being viewed, and uses the raw_contact reported back from
EditContactActivity. The overall effect is when moving from View->Edit
or Edit->View the selected tab doesn't change.
Daisuke Miyakawa [Fri, 21 Aug 2009 13:17:34 +0000 (22:17 +0900)]
Enable import_all by default. Each career should disable if it does not want the feature.
Jeff Hamilton [Fri, 21 Aug 2009 07:43:47 +0000 (02:43 -0500)]
Merge goog/eclair-dev into goog/eclair
Jeff Hamilton [Fri, 21 Aug 2009 04:58:13 +0000 (23:58 -0500)]
Fix the build.
Jeff Hamilton [Thu, 20 Aug 2009 16:51:30 +0000 (11:51 -0500)]
Switch name back to Contacts for now.
Android (Google) Code Review [Thu, 20 Aug 2009 20:59:42 +0000 (13:59 -0700)]
Merge change 22020 into eclair-dev
* changes:
New minitab assets, and dithering fix.
Android (Google) Code Review [Thu, 20 Aug 2009 18:51:00 +0000 (11:51 -0700)]
Merge change 22023 into eclair-dev
* changes:
Fixing the Split contact UI
Jeff Hamilton [Thu, 20 Aug 2009 16:47:38 +0000 (11:47 -0500)]
Add photos back to Favorites and others.
Dmitri Plotnikov [Thu, 20 Aug 2009 01:03:00 +0000 (18:03 -0700)]
Fixing the Split contact UI
Evan Millar [Thu, 20 Aug 2009 00:36:33 +0000 (17:36 -0700)]
New minitab assets, and dithering fix.
The dithering flag we were setting in the layout was being overriden. We
are now setting it directly on the StateListDrawable in code.
Dmitri Plotnikov [Thu, 20 Aug 2009 00:38:04 +0000 (17:38 -0700)]
Upgrading Call Log and Call Detail views to the new API.
Jeff Hamilton [Wed, 19 Aug 2009 23:03:01 +0000 (18:03 -0500)]
Fix the source icons when viewing a contact.
Android (Google) Code Review [Wed, 19 Aug 2009 18:23:00 +0000 (11:23 -0700)]
Merge change 21855 into eclair-dev
* changes:
Removing reference to MAX_SUGGESTIONS
Li Zhe [Thu, 30 Jul 2009 06:08:42 +0000 (14:08 +0800)]
HSDPA (High-Speed Downlink Packet Access) Contacts IMEI and MEID
Use PhoneType instead of Network type for IMEI or MEID
- change SpecialCharSequenceMgr to use PhoneType for the displaying
IMEI for UMTS, MEID for CDMA
Dmitri Plotnikov [Wed, 19 Aug 2009 02:00:01 +0000 (19:00 -0700)]
Removing reference to MAX_SUGGESTIONS
Evan Millar [Fri, 7 Aug 2009 16:12:49 +0000 (09:12 -0700)]
Update minitab assets and behavior to match spec.
Jeff Sharkey [Wed, 12 Aug 2009 18:28:53 +0000 (11:28 -0700)]
Use AccountManager for details, handle INSERT cases.
Connected Sources to use AccountManager and inflate details
through registered sync adapters. Each ContactsSource now
has a "level" of inflation, since deeper levels aren't
always needed right away. Several places we're making
blocking calls into other processes that are tied to the UI
thread. (This would take a large effort to fix.)
Turned most background Edit activity operations into
WeakAsyncTask, which helps finish background tasks while
preventing leaked Contexts. This allows us to hold the UI
thread while saving, but release it just before ANR,
allowing the background operation to complete.
Enabled INSERT case, both from overall list and when already
editing an aggregate. Finally, cleaned up the manifest
intent-filters to directly match authorities.
Jeff Hamilton [Tue, 18 Aug 2009 20:10:08 +0000 (15:10 -0500)]
Don't crash if an async photo load comes in after leaving the contacts list activity.
Eric Fischer [Tue, 18 Aug 2009 18:00:31 +0000 (11:00 -0700)]
am
d93e35c2: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
d93e35c2bdf5d20ee6f7126d57554f123a36b21c' into eclair
* commit '
d93e35c2bdf5d20ee6f7126d57554f123a36b21c':
Import revised translations. DO NOT MERGE
David Brown [Fri, 14 Aug 2009 20:46:16 +0000 (13:46 -0700)]
do not merge: cherry-picked
0d4cf6265fcbba90a87a1165a800b697e737d847 from master
Eric Fischer [Mon, 17 Aug 2009 20:14:44 +0000 (13:14 -0700)]
Import revised translations. DO NOT MERGE
Fred Quintana [Mon, 17 Aug 2009 04:04:40 +0000 (21:04 -0700)]
accounts api change
Fred Quintana [Mon, 17 Aug 2009 03:43:28 +0000 (20:43 -0700)]
do not merge: cherrypicked
2811b3eaca1ac1cf27a7d63aa9f5c4ec7723ff59 from master branch
Fred Quintana [Sun, 16 Aug 2009 04:49:59 +0000 (21:49 -0700)]
do not merge: cherrypicked
2811b3eaca1ac1cf27a7d63aa9f5c4ec7723ff59 from master branch
Jeff Hamilton [Fri, 14 Aug 2009 05:42:41 +0000 (22:42 -0700)]
Revert "add legacy accounts support"
This reverts commit
8f7fcfa58aee626318bd61ab9d08ba5d53b1c10a.
Android (Google) Code Review [Fri, 14 Aug 2009 03:43:41 +0000 (20:43 -0700)]
Merge change 21231 into eclair-dev
* changes:
Remove reference to missing bindStatic() method.
Jeff Sharkey [Fri, 14 Aug 2009 03:42:46 +0000 (20:42 -0700)]
Remove reference to missing bindStatic() method.
Fred Quintana [Thu, 13 Aug 2009 17:51:33 +0000 (10:51 -0700)]
add legacy accounts support
Evan Millar [Tue, 11 Aug 2009 18:12:00 +0000 (11:12 -0700)]
Show tab icons in view activity.
-Add an asynchronous request api to Sources, to allow for
asynchronous binding of autheticator data to the Sources object. The old
getInstance() api has been changed to getPartialInstance(), as not all
clients of Sources need the authenticator data bound.
-BaseContactProvider uses Sources to get the source icons. This behavior
still needs to be added to EditContactActivity.
Android (Google) Code Review [Thu, 13 Aug 2009 17:52:03 +0000 (10:52 -0700)]
Merge change 21116 into eclair-dev
* changes:
Fix photo display in ContactsListActivity.
Evan Millar [Thu, 13 Aug 2009 17:18:23 +0000 (10:18 -0700)]
Fix photo display in ContactsListActivity.
Android (Google) Code Review [Wed, 12 Aug 2009 21:16:27 +0000 (14:16 -0700)]
Merge change 20978 into eclair-dev
* changes:
Fix Null pointer for exchange contacts IM
Neel Parekh [Wed, 12 Aug 2009 19:57:12 +0000 (12:57 -0700)]
Fix Null pointer for exchange contacts IM
Dmitri Plotnikov [Tue, 11 Aug 2009 22:53:08 +0000 (15:53 -0700)]
Removing support for primary phone/email on Contact.
Jeff Sharkey [Tue, 11 Aug 2009 21:11:45 +0000 (14:11 -0700)]
Don't crash when showing contact with invalid photo.
Fixes http://b/
2047492
Jeff Sharkey [Tue, 11 Aug 2009 18:00:22 +0000 (11:00 -0700)]
Unique strings for labels and actions, SMS as alternate.
To prepare for strings in various languages, make unique
strings for each combination of "action" and EditType, for
example, "Call home" and "Email work" as unique strings.
Also added iconAltRes and actionAltRes to handle alternate
actions on data rows, such as SMS for phone numbers. These
changes allow Fast-Track to show correct labels.
Jeff Sharkey [Tue, 11 Aug 2009 17:59:34 +0000 (10:59 -0700)]
Connect photo and name editors, super primary dialog.
This change connects up the photo and display name editors
to show the values from the selected RawContact. This also
persists StructuredName.DISPLAY_NAME changes back.
Also connects up the long-press menu for selecting a
super-primary display name for an aggregate.
Jeff Sharkey [Thu, 6 Aug 2009 04:02:37 +0000 (21:02 -0700)]
Switch edit UI to tabs, TYPE_ASSERT for version, cleanup.
Integrated with the tabs and header widget built by
emillar, kept separate from BaseContactCardActivity since
I'm handling EDIT/INSERT intents differently. Added hooks
to pick primary photo/name from header.
Cleaned up the colorful testing UI, added padding to match
mocks, and initial pass at collapsed secondary area. Added
back menu items and confirmation toast.
Changed to new TYPE_ASSERT ContentProviderOperation for
asserting RawContacts.VERSION number during updates.
Android (Google) Code Review [Tue, 11 Aug 2009 16:35:20 +0000 (09:35 -0700)]
Merge change 20613 into eclair-dev
* changes:
Make small tweaks to view contact card.
Fred Quintana [Tue, 11 Aug 2009 03:39:26 +0000 (20:39 -0700)]
remove the table name specifications, which no longer work with the view changes
Evan Millar [Fri, 7 Aug 2009 22:40:08 +0000 (15:40 -0700)]
Make small tweaks to view contact card.
-Fix bug in dialing a number from the view card.
-Update the primary number asset and positioning.
-Make the sms button unfocusable.
Evan Millar [Tue, 4 Aug 2009 23:20:57 +0000 (16:20 -0700)]
Improve focus handling around ScrollingTabWidget.
When focus enters the tab widget the focus will always be directed to
the last focused tab, instead of selecting the "best" tab.
Dmitri Plotnikov [Fri, 7 Aug 2009 00:24:34 +0000 (17:24 -0700)]
Removing dependency on the contacts/#/raw_contacts directory
Jeff Sharkey [Tue, 4 Aug 2009 21:21:06 +0000 (14:21 -0700)]
Bring back Fast-Track with yummy assets and animations.
Fast-Track had been quite neglected, so brought it back up
to speed with ContactsContract changes. Also rearranged
the Action launching logic to use ContactsSource.DataKind
for any icons and label generation. Wrote slide animation
that looks awesome.
Added Fast-Track triggering to normal contacts list, since
it has photos now. Also supports being launching in various
modes, which for now are three sizes.
David Brown [Wed, 5 Aug 2009 03:30:09 +0000 (20:30 -0700)]
Dialer: add onscreen "Dial" button.
Add a new "Dial" button, below the keypad (in portrait) or below the
"digits" widget (in landscape). It does the exact same action as tapping
the digits widget, and its enabled/disabled state uses the exact same
logic that turns the digit widget green when it's OK to dial.
This is a partial fix for bug
1825144 (soft SEND/END keys in places other
than in-call),
The button has visibility GONE by default; it's enabled on a per-product
basis using a flag in config.xml. (To enable this on devices that need
it, I'll separately check in resource overlay files in those other
projects)
For now the Dial button is just a regular button, with no special layout
or artwork. (But bug
1993282 is open to cover any future visual design
tweaks we might need.)
Android (Google) Code Review [Wed, 5 Aug 2009 03:22:21 +0000 (20:22 -0700)]
Merge change 20074 into eclair-dev
* changes:
Fix some px values to be dip so the text entry in dialer is the right size on non-HVGA screens.
Jeff Hamilton [Wed, 5 Aug 2009 03:17:18 +0000 (22:17 -0500)]
Fix some px values to be dip so the text entry in dialer is the right size on non-HVGA screens.
Android (Google) Code Review [Tue, 4 Aug 2009 23:20:36 +0000 (16:20 -0700)]
Merge change 9668 into eclair-dev
* changes:
Single line phone/sms view list item.
Android (Google) Code Review [Tue, 4 Aug 2009 21:20:23 +0000 (14:20 -0700)]
Merge change 9513 into eclair-dev
* changes:
Delta parceling, valid types bugfix, INSERT parsing.
Evan Millar [Tue, 4 Aug 2009 17:14:57 +0000 (10:14 -0700)]
Single line phone/sms view list item.
Jean-Baptiste Queru [Tue, 4 Aug 2009 16:00:28 +0000 (09:00 -0700)]
merge from open-source master
Eric Fischer [Mon, 3 Aug 2009 23:45:20 +0000 (16:45 -0700)]
am
6b3da038: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
6b3da03863da9d7319cbaf2eeb6f554616fcd97b'
* commit '
6b3da03863da9d7319cbaf2eeb6f554616fcd97b':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 3 Aug 2009 23:09:05 +0000 (16:09 -0700)]
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Mon, 3 Aug 2009 23:19:44 +0000 (16:19 -0700)]
Merge change 9503 into eclair-dev
* changes:
Extracts the header code from BaseContactCardActivity
Jeff Sharkey [Mon, 3 Aug 2009 18:37:07 +0000 (11:37 -0700)]
Delta parceling, valid types bugfix, INSERT parsing.
Made EntityDelta and ValuesDelta directly Parcelable to
pass across configuration changes. Moved the re-parenting
code to separate EntityDelta.mergeAfter() method. Fixed
getValidTypes() bug that didn't handle typeOverallMax
in "unlimited" cases. Wrote INSERT parsing code to merge
incoming extras bundle into a new or existing EntityDelta,
also handles any source constraints.
Initial hook-up of edit UI to persist changed data, only
shows first Entity because not connected to tabs yet.
Evan Millar [Thu, 30 Jul 2009 20:46:19 +0000 (13:46 -0700)]
Extracts the header code from BaseContactCardActivity
BaseContactCardActivity used to contain code for displaying the
contact card banner. As that is an element needed in other system
apps, it was extracted and made into a reusable widget in
com.android.internal.widget.
Jeff Sharkey [Sun, 2 Aug 2009 02:11:04 +0000 (19:11 -0700)]
Refactor "Augmented" to "Delta" to make meaning clearer.
Jean-Baptiste Queru [Mon, 3 Aug 2009 14:45:46 +0000 (07:45 -0700)]
merge from donut
Jeff Sharkey [Thu, 30 Jul 2009 17:39:14 +0000 (10:39 -0700)]
Bulk of constraint enforcement code, "best" suggestions.
Wrote getValidTypes() which builds a list of EditTypes that
can be inserted given a AugmentedEntity state, which is our
mechanism for enforcing ContactsSource constraints. This
also drives canInsert(), which provides the enabled state
for our "add" buttons.
This change also reintroduces "suggested" types, used to
pick the default EditType for newly added entries. It picks
the first primary type that doesn't already appear, or
otherwise picks the last primary type. (This gives us a
nice "add" transition down the list of possible types.)
Finally, this change connects all of this logic into the
UI, picking available labels and enabling "add" according
to any constraints. Also wrote unit tests to verify the
above code is producing the expected results. These tests
exercise the backbone of our constraint-enforcement logic.