Commit Graph

3759 Commits

Author SHA1 Message Date
Makoto Onuki
f54e08eaee Introduce tabs to view message, attachment and invite separately
Added "tabs" to the message view according to the latset mock.
This removes the necessity of putting a WebView inside a ScrollView,
which caused the infinitely-growing email bug (issue 6882).

Right now the tabs are actually just Buttons.  Complete visual refresh
should follow it.

http://code.google.com/p/android/issues/detail?id=6882
Bug 2349275

Change-Id: I897a3a32e0dd7a90d637ac5ea1d47e5e65a1eabe
2010-10-05 16:53:59 -07:00
Makoto Onuki
feb8869c4f Remove unused method Utility.getIconIds()
And redirected the related tests to getIcon().

Bug 2894555

Change-Id: I1d90f01e7476ca79bddd644e123ad979d6ebe987
2010-10-05 16:15:38 -07:00
Andy Stadler
0da4a3b63c am 79b05696: (-s ours) am d7876681: Reorganize startup/shutdown code in SyncManager DO NOT MERGE
Merge commit '79b05696876aadada8cb3f21f89f36b7ae72121d'

* commit '79b05696876aadada8cb3f21f89f36b7ae72121d':
  Reorganize startup/shutdown code in SyncManager DO NOT MERGE
2010-10-05 15:18:04 -07:00
Marc Blank
d04ef0fd19 am 5c5f3a0d: Fix issue w/ race condition leading to log spam
Merge commit '5c5f3a0dbcef00bc1a20f16f924bab85133e4407' into gingerbread-plus-aosp

* commit '5c5f3a0dbcef00bc1a20f16f924bab85133e4407':
  Fix issue w/ race condition leading to log spam
2010-10-05 14:13:22 -07:00
Marc Blank
5c5f3a0dbc Fix issue w/ race condition leading to log spam
Bug: 3064901
Change-Id: I115fa6878ae9b4464b3f0b9cace1f200e2e5f47c
2010-10-05 12:52:35 -07:00
Makoto Onuki
d058f8abcd Auto-refresh message view
Now MessageViewFragment detects changes made to the current message,
and update the UI.
(Although it doesn't really know if the message is really changed, or just
something else was changed in the DB.  It updates the header regardless.)

Change-Id: I35627c7aff129723b83605fc84521da907078571
2010-10-05 11:11:31 -07:00
Makoto Onuki
591e8fa0c9 Merge "Fix "move to" dialog style" 2010-10-05 11:06:00 -07:00
Makoto Onuki
7bfa32dbc5 Merge "Move reply/forward buttons to header" 2010-10-05 11:05:51 -07:00
Makoto Onuki
01b7e67f78 Move reply/forward buttons to header
Moved the buttons to the header.  All other buttons below the message view
go away, so I just hid the old buttons.

Also now we stop trying to hide these buttons when entering contextual mode,
which fixes bug 3044284: Message view buttons get disabled when closing
quick contact

Assets were temporarily copied from gmail.

Change-Id: Ib178c6221dfab02832a10d0c0441044e4969fb70
2010-10-05 11:04:10 -07:00
Makoto Onuki
573e0c5ffd Merge "Extract the throttling part from ThrottlingCursorLoader" 2010-10-05 10:26:14 -07:00
Andy Stadler
79b0569687 am d7876681: Reorganize startup/shutdown code in SyncManager DO NOT MERGE
Merge commit 'd7876681a85a4cc799feec775bdfe7927f983464' into gingerbread-plus-aosp

* commit 'd7876681a85a4cc799feec775bdfe7927f983464':
  Reorganize startup/shutdown code in SyncManager DO NOT MERGE
2010-10-04 16:20:09 -07:00
Andy Stadler
d7876681a8 Reorganize startup/shutdown code in SyncManager DO NOT MERGE
* Move all thread-related startup code into run()
* Move all thread-related shutdown code into new method shutdown()
* Add appropriate synchronization during startup/shutdown
* Add thread names to worker threads

Bug: 2790929
Bug: 2645835

Backport of: Idbd35892cea3de5fbd365102a62103b2f0bdf6c9
Backport of: Ib12a70222ac3fd9e65bec3834c0aae061858776c

Change-Id: Idfd1c9ac7fbe8ce6859b1933ab6d287e3cb0d2e9
2010-10-04 15:50:41 -07:00
Makoto Onuki
085f7eb121 Extract the throttling part from ThrottlingCursorLoader
Extracted into the Throttle class as I'll need this logic elsewhere.

Bonus: Now it has tests.

Change-Id: Ie9a5933f8e5015dda6985ba76814f1f945266178
2010-10-01 17:46:59 -07:00
Makoto Onuki
56034cab20 Fix "move to" dialog style
- Pass the correct context to the adapter to make the text visible.
- MailboxesAdapter itself now has two modes (normal mode for MailboxList,
  and "move to" mode), and use different views for them.

Change-Id: I2bd8a7d3a99d7fa3a047e653a77ec958e37e563b
2010-10-01 11:40:09 -07:00
Makoto Onuki
966fd5ea0b Merge "Add "Clear WebView cache" button to debug preference" 2010-10-01 10:20:23 -07:00
Eric Fischer
dd5fe40936 am 01e50768: (-s ours) am aa32ce7e: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '01e5076843eee7f319cc3e6160587df2bd1e125f'

* commit '01e5076843eee7f319cc3e6160587df2bd1e125f':
  Import revised translations.  DO NOT MERGE
2010-09-30 18:13:16 -07:00
Eric Fischer
01e5076843 am aa32ce7e: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'aa32ce7ea59db1e61908225a558d0dcc9a395ae4' into gingerbread-plus-aosp

* commit 'aa32ce7ea59db1e61908225a558d0dcc9a395ae4':
  Import revised translations.  DO NOT MERGE
2010-09-30 15:57:46 -07:00
Eric Fischer
aa32ce7ea5 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-30 15:46:42 -07:00
Makoto Onuki
1a0b0092e0 Add "Clear WebView cache" button to debug preference
Change-Id: I317b57cb06b071f9574077b58998aafcb5e0dff8
2010-09-30 15:41:40 -07:00
Marc Blank
14a5d8d947 Provide better information w/ 500 error in EAS validation
* HTTP error 500 occurs with Exchange 2003 when the user tries to
  authenticate with wrong credentials; we report this as "Cannot
  connect to server", which is wrong
* Error 500 is supposed to mean "internal server error", but since
  we know that an authentication error can cause this, we now put
  up a better error message

Bug: 2933381
Change-Id: I9319a5ed6fbf4c92739f305b42b6b1cad7036a4b
2010-09-30 11:47:20 -07:00
Ying Wang
1f28e33234 am b95db75b: am b38a043e: Fix proguard flag file dependency.
Merge commit 'b95db75bc5a867b9ae0453b1ab3f7cd3f3cf34b4'

* commit 'b95db75bc5a867b9ae0453b1ab3f7cd3f3cf34b4':
  Fix proguard flag file dependency.
2010-09-30 11:28:00 -07:00
Eric Fischer
bbcde2775d Merge "resolved conflicts for merge of 2f580362 to master" 2010-09-30 11:22:45 -07:00
Eric Fischer
216a5eb4de resolved conflicts for merge of 2f580362 to master
Change-Id: If74e59216d368012115d422a40328a27a20ed74c
2010-09-30 11:22:05 -07:00
Marc Blank
624081f373 Merge "Fix build break." 2010-09-30 11:21:22 -07:00
Marc Blank
b21db41b1f Fix build break.
Change-Id: Ica28b1e234e2c6966408efc7151ea517a18aa72f
2010-09-30 11:20:36 -07:00
Makoto Onuki
61eec98d39 Switch to static fragments
- Now we declare all fragments in the layouts.
- Added clearContent() to MessageList/MessageView to keep them calm when not
  used.  (e.g. MessageView.clearContent() will be called when closing message
  view and going back to the mailbox list+message list screen.)

- Some of the processes have moved from onStop to onPause.
- Now that we don't use the fragment transaction, the "restored fragments"
  has been removed, and the separation between selectXxx() methods and
  updateXxx() methods are gone.

Bug 3045555
Bug 3041502

Change-Id: I958897a8a38bccea1dfed7cfcd900e6dd52d2eed
2010-09-30 11:03:33 -07:00
Marc Blank
beb3a06fd7 Merge "Allow Serializer logging via isLoggable" 2010-09-30 10:39:34 -07:00
Marc Blank
05530d4c33 Allow Serializer logging via isLoggable
Change-Id: Ie6c0257a3fa854d7abc92a82b690884ce2a4cb4c
2010-09-30 10:39:01 -07:00
Ying Wang
b95db75bc5 am b38a043e: Fix proguard flag file dependency.
Merge commit 'b38a043ece445fc5cbbaa35081dd6400e9d248d6' into gingerbread-plus-aosp

* commit 'b38a043ece445fc5cbbaa35081dd6400e9d248d6':
  Fix proguard flag file dependency.
2010-09-30 09:32:08 -07:00
Makoto Onuki
4e400caab4 Merge "Switch to tablet style notification" 2010-09-29 18:35:47 -07:00
Makoto Onuki
899c5b8661 Switch to tablet style notification
- Now we show separate notification for each account
- New notification has sender photo, sender name, and subject
  of the latest email
- Added the NotificationController class, which is intended to manage
  all notifications besides "new message" eventually.

The framework doesn't seem to be 100% ready, and it's not clear how to
add the 3rd line in the expanded notification at this point.  Need to
revisit it later to verify UI details.

Change-Id: I40193ee372cb6b2b7245c1588890f238b2469699
2010-09-29 18:35:17 -07:00
Makoto Onuki
62c9df806e Two bug fixes related to preserving list scroll position
* When changing account/mailbox, reset scroll position.
Applied same change as I4b368f51 to MailboxListFragment.

Also fixed a bug introduced in the same CL.
When CursorLoader detects content changed events and reloads itself,
only onLoadFinished() gets called, and in this case we should keep the scroll
position.  This means mMailboxChanging should be cleared once data is loaded
for the next content changed reload.

Bug 3015916

* Don't try to make the selection visible when reloading the list for content
changed events.

We should make the selection visible only when account/mailbox is explicitly
selected.  We can use the same mXxxChanging flags for this.

Bug 3036317

Change-Id: I93e3653da6816f491c1e99c9ef6d6b947be4de37
2010-09-29 18:28:34 -07:00
Ying Wang
b38a043ece Fix proguard flag file dependency.
Change-Id: If5955c5714f9a5d3d6a111ee9d825b1574cc677e
2010-09-29 15:22:04 -07:00
Eric Fischer
3886b266f2 Import revised translations. DO NOT MERGE
Change-Id: If12cbb0d1c04684bf0dcf59980a0b784fb6693f9
2010-09-29 14:34:01 -07:00
Makoto Onuki
8818a658a1 Three pane layout
Implement basic behavior of the new layout.  Supports collapsing/expanding
message list on portrait.

TODO Collapsing the middle pane should cancel the selection mode on
     message list
TODO Implement animation
TODO On STATE_PORTRAIT_MIDDLE_EXPANDED state, right pane should be pushed out,
     rather than squished.

Change-Id: I0306516845de3a1f05a102864c3dc4aba809a49a
2010-09-29 13:38:32 -07:00
Marc Blank
cd2e98d000 Merge "Use LIMIT parameter in getFirstRowX calls" 2010-09-29 12:53:01 -07:00
Makoto Onuki
2711c16a46 Merge "Don't use QuickContactBadge.assignContactFromEmail" 2010-09-29 12:46:59 -07:00
Makoto Onuki
6740c7b5ac Merge "Don't restore list view state when changing mailbox." 2010-09-29 12:46:53 -07:00
Makoto Onuki
bc9253fb9a Merge "Rely on the fact that display name won't be empty" 2010-09-29 12:46:43 -07:00
Marc Blank
07597e547b Use LIMIT parameter in getFirstRowX calls
* Also, rename the LIMIT parameter to be consistent with naming
  conventions

Bug: 3046494

Change-Id: Iafc7f7d76f45bc7988e5d63783359082756b7ffa
2010-09-29 12:27:42 -07:00
Eric Fischer
2f580362a6 am 5849608f: Genericize strings that refer to the SD card.
Merge commit '5849608f5e804efca081c80b19534583cac689bc' into gingerbread-plus-aosp

* commit '5849608f5e804efca081c80b19534583cac689bc':
  Genericize strings that refer to the SD card.
2010-09-29 12:26:31 -07:00
Eric Fischer
5849608f5e Genericize strings that refer to the SD card.
Change-Id: Ia754540c7bfc0e9a97c1d9d386efd2b2d0642560
2010-09-29 12:09:05 -07:00
Andy Stadler
d22651ccd1 am 060b1df0: am a9bc41f5: Show server name instead of account name
Merge commit '060b1df06954be1d72a659b0f00e30b8057484e0'

* commit '060b1df06954be1d72a659b0f00e30b8057484e0':
  Show server name instead of account name
2010-09-28 23:14:27 -07:00
Marc Blank
1d2c88738d Merge "Add Uri for Message queries that include a LIMIT" 2010-09-28 22:14:50 -07:00
Andy Stadler
060b1df069 am a9bc41f5: Show server name instead of account name
Merge commit 'a9bc41f5ecea991d06b88ce861a412288303e9dd' into gingerbread-plus-aosp

* commit 'a9bc41f5ecea991d06b88ce861a412288303e9dd':
  Show server name instead of account name
2010-09-28 22:12:16 -07:00
Andy Stadler
a9bc41f5ec Show server name instead of account name
The format string "The server %s requires that you allow it to remotely
control some security features of your phone." was being displayed with
the account name instead of the server name.

Bug: 3011124
Change-Id: I1aadb5790297777831dd69f04ea89641240b7b87
2010-09-28 20:15:54 -07:00
Makoto Onuki
e33a317db0 Expand hit-area for checkbox and star on message list
Bug 2561779

Change-Id: I4b71d48c9440e0f3c308fbe8ff16ada04b9df54e
2010-09-28 16:56:53 -07:00
Makoto Onuki
ddfae933da Don't use QuickContactBadge.assignContactFromEmail
* assignContactFromEmail("") was causing the following exception on logcat.
"java.lang.IllegalArgumentException: URI: content://com.android.contacts/data/emails/lookup/,"

* This method is to set the contact to open when the badge is tapped,
  but we trigger quick contact by ourselves, so don't have to do call this.

Bug 3013527

Change-Id: I16e1573bd82ffe5c39d30b69361354010f508f91
2010-09-28 16:32:18 -07:00
Makoto Onuki
dc33d50a24 Don't restore list view state when changing mailbox.
Bug 3015916

Change-Id: I4b368f511a94ec83723b571d1cfca1b3d39e4d04
2010-09-28 15:23:39 -07:00
Andy Stadler
072f680682 am d06add02: (-s ours) am e242578a: Make WebViews clickable DO NOT MERGE
Merge commit 'd06add0296d838e1cf3976ea4603bdf9c4e9cb09'

* commit 'd06add0296d838e1cf3976ea4603bdf9c4e9cb09':
  Make WebViews clickable DO NOT MERGE
2010-09-28 13:20:32 -07:00