Commit Graph

3538 Commits

Author SHA1 Message Date
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
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
Makoto Onuki c3b3b7a0a3 Rely on the fact that display name won't be empty
Change-Id: Ifd17daac472c1d439ddc4bd8e6811bb13a9018fa
2010-09-28 11:29:59 -07:00
Marc Blank 0efe738e05 Add Uri for Message queries that include a LIMIT
* Use a query parameter (e.g. ?limit=2); LIMIT works with any
  query

Change-Id: Idd106ab4b61aec237ac9676a201e797c4f65f15b
2010-09-28 10:58:36 -07:00
Makoto Onuki 9ffb4fa0ec Add CHAR LIMIT to new strings
Bug 2930858

Change-Id: I662e5ab16f32dc85ce4c7e5e851a017ce61674c1
2010-09-28 10:30:29 -07:00
Andy Stadler d06add0296 am e242578a: Make WebViews clickable DO NOT MERGE
Merge commit 'e242578a49f54a9f46d0bd68de53c98d7dc460fb' into gingerbread-plus-aosp

* commit 'e242578a49f54a9f46d0bd68de53c98d7dc460fb':
  Make WebViews clickable DO NOT MERGE
2010-09-28 10:12:38 -07:00
Marc Blank 3bf514a85f Merge "Add CHAR LIMIT to added string" 2010-09-28 08:54:19 -07:00
Andy Stadler 1457f3e82c am e8c54390: (-s ours) am ac916da4: Improve handling of content-disposition DO NOT MERGE
Merge commit 'e8c5439006ca5d33e3e69975bbb3f8b1491e584c'

* commit 'e8c5439006ca5d33e3e69975bbb3f8b1491e584c':
  Improve handling of content-disposition DO NOT MERGE
2010-09-27 21:03:35 -07:00
Andy Stadler 0bb755b4e2 am 7c952fd1: (-s ours) am 658df8f6: Merge "Allow spaces in passwords DO NOT MERGE" into gingerbread
Merge commit '7c952fd13851c6eae72cdb2f1726516a4de48b48'

* commit '7c952fd13851c6eae72cdb2f1726516a4de48b48':
  Allow spaces in passwords DO NOT MERGE
2010-09-27 21:02:30 -07:00
Marc Blank f25236b61e Merge "Remove obsolete EAS logging" 2010-09-27 16:39:38 -07:00
Marc Blank 82c944ef3a Remove obsolete EAS logging
Change-Id: I549957c92aa05f98581441c1a7631f87040c5078
2010-09-27 16:38:28 -07:00
Andy Stadler e8c5439006 am ac916da4: Improve handling of content-disposition DO NOT MERGE
Merge commit 'ac916da48e2a550815ac13445038528aa4011442' into gingerbread-plus-aosp

* commit 'ac916da48e2a550815ac13445038528aa4011442':
  Improve handling of content-disposition DO NOT MERGE
2010-09-27 15:54:50 -07:00
Andy Stadler e242578a49 Make WebViews clickable DO NOT MERGE
* Makes the side-scrollable again
* Required after making them non-long-clickable

Requires companion change in WebView, to allow touch events while
clickable or long clickable (it had been requiring both)

Bug: 3036477
Change-Id: I4cae46d047f825d2aab08d254287855b187e9207
2010-09-27 15:54:37 -07:00
Andy Stadler ac916da48e Improve handling of content-disposition DO NOT MERGE
* Check array returned by split("=")
* Add unit tests for this case
* Also add unit tests for quoting removal

Bug: 3040796
Backport from: I170f3cd483fe35186194edeb0c3142fb0e2e9b75

Change-Id: I32ccbdbc7264a95a9cd279218cae390e65e82eeb
2010-09-27 15:16:24 -07:00
Andrew Stadler bbac024785 Merge "Improve handling of content-disposition" 2010-09-27 15:10:19 -07:00
Andrew Stadler 87fcd03a1b Improve handling of content-disposition
* Check array returned by split("=")
* Add unit tests for this case
* Also add unit tests for quoting removal

Bug: 3040796
Change-Id: I170f3cd483fe35186194edeb0c3142fb0e2e9b75
2010-09-27 15:09:35 -07:00
Eric Fischer f708dbb19c am 521a4a42: (-s ours) am f617a25a: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Merge commit '521a4a42e50e4d72e1c6a2ffddf5cf544092c564'

* commit '521a4a42e50e4d72e1c6a2ffddf5cf544092c564':
  Trim unwanted whitespace from translations.  DO NOT MERGE
2010-09-27 14:40:08 -07:00
Andy Stadler 7c952fd138 am 658df8f6: Merge "Allow spaces in passwords DO NOT MERGE" into gingerbread
Merge commit '658df8f69ffe0885dcf99136ec8bd77cacdec505' into gingerbread-plus-aosp

* commit '658df8f69ffe0885dcf99136ec8bd77cacdec505':
  Allow spaces in passwords DO NOT MERGE
2010-09-27 14:25:03 -07:00
Andy Stadler 658df8f69f Merge "Allow spaces in passwords DO NOT MERGE" into gingerbread 2010-09-27 14:22:22 -07:00
Andy Stadler 02a0edb60d Allow spaces in passwords DO NOT MERGE
* Separate/identical fixes for incoming, outgoing, exchange
* Unit tests
* Some protocols will fail anyway (e.g. POP3)

Bug: 2981433
Backport from: I82984e5912fc7fcb88e747815d0fe33cb36605e7

Change-Id: I49d5c13137e4f78b6fa0f9ce288c1a78ff028f88
2010-09-27 13:31:04 -07:00
Eric Fischer 521a4a42e5 am f617a25a: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Merge commit 'f617a25a7b55194ded8f2980a98c1a6482ba0513' into gingerbread-plus-aosp

* commit 'f617a25a7b55194ded8f2980a98c1a6482ba0513':
  Trim unwanted whitespace from translations.  DO NOT MERGE
2010-09-27 12:33:46 -07:00
Eric Fischer f617a25a7b Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 2010-09-27 12:28:40 -07:00
Eric Fischer b08f78ca1b Trim unwanted whitespace from translations. DO NOT MERGE
Change-Id: Ibf46e7f3dcbc111b28ab64e336b35fc41dbb9ace
2010-09-27 12:18:37 -07:00