Commit Graph

4976 Commits

Author SHA1 Message Date
Eric Fischer
deb6d39394 Import revised translations.
Change-Id: I84bb8da3f1e442b68124a500fa513b0cb1048912
2011-04-15 14:40:03 -07:00
Todd Kennedy
49786fbe2a Remove extra padding from expanded icon
Change-Id: I1e351dc0978a5e2d576a7c0c84625d66b3ebbbbc
2011-04-15 09:20:02 -07:00
Todd Kennedy
d1b1404d76 Merge "Implement drag-n-drop with nested folders" 2011-04-15 08:57:26 -07:00
Todd Kennedy
6c3cd4e247 Implement drag-n-drop with nested folders
We can now drill down into nested folders during drag-n-drop. Simply hover over
a collapsed folder for 750ms and it will auto-expand.

Change-Id: Ia9b42dd87e19c2ebdf8675c761cb1453bb26d158
2011-04-14 16:23:20 -07:00
Ben Komalo
8a05da7c8c Remove uneeded layer of parcelling.
ListStateSaver did nothing more than hold a Parcelable, and was a
Parcelable itself. The abstraction may have been useful at some point,
but that time seems to have passed.

Change-Id: I2f1f45828782ab44aa8935aa50b825e07845a2a5
2011-04-14 15:30:54 -07:00
Makoto Onuki
edeca22ac3 Merge "Make two pane layout (more or less) useable on phone" 2011-04-14 14:26:04 -07:00
Makoto Onuki
b32704dae5 Make two pane layout (more or less) useable on phone
Now the two pane activity survives longer on the phone, as opposed to
crash immediately.
(It still crashes when you open the message view.)

I'd like to submit this because:
- It'll make my experiment easier
- It wouldn't do any harm to the tablet UI.

Change-Id: Id716a42c63026cf09b30ff6a63e0e58311aa53ed
2011-04-14 14:25:05 -07:00
Ben Komalo
28b3fec5c1 Include guava in Email.
- adds a compile time dependency to the guava library
- changes to use @VisibleForTesting in places to ensure it works

Change-Id: I2c5c4f9861234fec3613da011185e5c11f228466
2011-04-14 13:49:01 -07:00
Todd Kennedy
8faa4e9cfa Merge "Fix layout of chip in combined view" 2011-04-14 10:25:12 -07:00
Todd Kennedy
9eb697c657 Fix layout of chip in combined view
the chip was part of the sub-layout when it should not have been.

Change-Id: Ie3a547bdf6d6ae4a3b458eaf4c30b57463b8ec34
2011-04-14 10:19:13 -07:00
Todd Kennedy
7219fccc42 Always display subfolder icon in the same view
We were handling the subfolder icon strangely. Sometimes it was shown in the
folder_icon view and sometimes in the folder_expanded_icon view. Now the
folder_icon view is used exclusively for system folders (such as inbox, etc...)
and folder_expanded_icon is always used for the expanded/collapsed icon.

Change-Id: Ifff9a44cc792497a469c2408337dafd431f6dfc3
2011-04-14 10:12:18 -07:00
Ben Komalo
5b84c8d9d0 Merge "Apply auto-advance policy when doing a batch op." 2011-04-13 18:04:25 -07:00
Ben Komalo
52618afa81 Apply auto-advance policy when doing a batch op.
Batch operations that occur when the current message selection is
contained within the affected messages will now force the selection to
advance according to the auto advance policy to the next unselected
conversation.

Bug: 3409809
Bug: 3405864
Change-Id: Ibe75f32b9263ef6f3fb2314a07e63980f437f988
2011-04-13 18:03:48 -07:00
Ben Komalo
2071bde957 Merge "Minor fix to error dialog formatting." 2011-04-13 16:13:54 -07:00
Ben Komalo
5a2d7da136 Minor fix to error dialog formatting.
Bug: 3515558
Change-Id: Id4d88379dc68c114338fdd2d4d437a2defb94ba4
2011-04-13 16:07:50 -07:00
Todd Kennedy
a8ba5e76dc Merge "only allow navigating to mailboxes w/ children" 2011-04-13 14:56:16 -07:00
Todd Kennedy
f7036b7379 only allow navigating to mailboxes w/ children
If a mailbox doesn't have any sub-mailboxes, only allow selecting them to view
any contained messages. Do not update the mailbox list.

Change-Id: I6f469bf20a57dc440885402084c21ff184f13dff
2011-04-13 14:35:03 -07:00
Ben Komalo
ead17de8f2 Merge "Remove a layer of public methods that weren't used" 2011-04-13 13:07:47 -07:00
Ben Komalo
6336a5231e Remove a layer of public methods that weren't used
Change-Id: Iba88634db2a687ce72f6875e0b499f79c219ca8f
2011-04-13 13:03:23 -07:00
Marc Blank
4bf590d400 Merge "Create constant for unknown sync window (0, i.e. uninitialized)" 2011-04-13 11:54:28 -07:00
Ben Komalo
1d1b7a070a Merge "Add signature when starting from external intents." 2011-04-13 10:22:51 -07:00
Todd Kennedy
ce99dd8cd1 Add comment to package-private members & methods
Change-Id: I9bb641d44253635f8dacc5dfecde55eac8d72c59
2011-04-13 09:52:42 -07:00
Ben Komalo
0fb68c8f0c Add signature when starting from external intents.
Also update some of the tests.

Bug: 3122070
Change-Id: Ia0e4620f54279dc53ca1c4484fec6508c411b418
2011-04-12 18:10:05 -07:00
Todd Kennedy
2b82c3f0a3 Add columns to cursor to allow for proper layout
The layout requires different indentation. Although the exact layout may
change, we will likely always need to differentiate between the different
mailbox types.

Change-Id: Ia2ff84b552873f92fa45563b2dc0868c29bec3e3
2011-04-12 15:09:51 -07:00
Todd Kennedy
57dc03acec Merge "Add current nested folder to list" 2011-04-12 15:08:00 -07:00
Marc Blank
38eb3b3a94 Create constant for unknown sync window (0, i.e. uninitialized)
Change-Id: I85410162893e76748f293f48fd12571eeaf4b620
2011-04-12 14:19:58 -07:00
Makoto Onuki
0efbee2bd0 Merge "Fix bug that prevents from accepting 2 invites in a row." 2011-04-12 13:56:59 -07:00
Makoto Onuki
5dceaa5b5e Fix bug that prevents from accepting 2 invites in a row.
mPreviousMeetingResponse is tied to the current response state, so it
should be reset too when we clear the response checkboxes.

Bug 4132763

Change-Id: If816706f47f8500441330882fb4f372b31465ff5
2011-04-12 11:08:16 -07:00
Todd Kennedy
7f139f14b9 Add current nested folder to list
When selecting a nested folder, the currently selected folder should be listed
along with "All Folders" and sub-folders

Change-Id: I7c6f726a0355a13d3e7b59aa4707bd92473283b4
2011-04-12 09:47:56 -07:00
Ben Komalo
7dc1e86d91 Less aggressive selection change in msg content.
All focus changes to the message body content was pushing the selection
to the end, which is wrong if state restoration happens, and is just
non-standard behavior if the user explicitly taps on a particular spot
on the text view. Make this slightly less aggressive.

Misc other changes in compose view.

Bug: 3076256
Change-Id: I9edb9c3c4edb5ddec12207f4136f3ca73cabf89d
2011-04-12 09:23:40 -07:00
Ben Komalo
2577842269 Misc fixes and dead code removal.
Change-Id: I48b2fa5f7bf619197d882c71e8b174d31d130e26
2011-04-11 14:01:01 -07:00
Marc Blank
cd5da3c445 Remember to clear query in MessagesAdapter if we're not searching
Change-Id: I3b16f080c66f6ce025e41a7c459aa3cb94dbecd0
2011-04-08 14:01:35 -07:00
Marc Blank
18d3b3de1e Merge "Improve temporary mailbox settings UI" 2011-04-07 20:04:18 -07:00
Marc Blank
f047c7cfd1 Improve temporary mailbox settings UI
* Start dialogs with current setting selected
* Add Cancel/OK buttons

Change-Id: Ia3d28eec558a8af8d3826b70cb313b68a5efc533
2011-04-07 20:03:23 -07:00
Joe Onorato
7af1ad3b58 Remove the deprecated things from Config.java. These havent been working since before 1.0.
Change-Id: Iea671dc01ff45f1009f6fbb22cf7259e0fc1d4f1
2011-04-07 18:41:11 -07:00
Todd Kennedy
df3133bf3d Merge "Always use the same loader id" 2011-04-07 15:03:59 -07:00
Marc Blank
983a624549 Merge "Temporary UI for setting mailbox sync frequency/lookback" 2011-04-07 14:53:48 -07:00
Marc Blank
d4a1500ae9 Temporary UI for setting mailbox sync frequency/lookback
* Just in MessageListXL for now, as with search
* This allows us to test functionality within EAS, and confirm that
  it's all working w/ unbundled Exchange (API 1)

Change-Id: I4f062ae871a28d2b57a23a269d6ec65903181d26
2011-04-07 14:53:08 -07:00
Todd Kennedy
5965b23909 Always use the same loader id
There's no need to use a different loader ID for each mailbox. Just use
one loader ID to keep things simple.

Change-Id: I46cf0a9ad48c8e0badf72ee73e2d5edadda66912
2011-04-07 14:48:21 -07:00
Todd Kennedy
c5ea3f522a Using the wrong selection for Exchange accounts
Exchange accounts support nested folders, so, we need to use the selection
that excludes any mailboxes with IDs greater than 0. Otherwise, we see all
mailboxes on the account.

Change-Id: If8c2085458176e8bd87013e3b598bd7740c652b2
2011-04-07 14:42:39 -07:00
Todd Kennedy
007d0be4ed First pass at nested folder support
currently only really works for exchange accounts. legacy accounts (imap
or pop) do not build a folder heirarchy.

Change-Id: Idb7c622b64a599a0776233a076359869f4ab4a4f
2011-04-07 14:23:21 -07:00
Marc Blank
fc0f42d6dc Merge "Temporary search UI" 2011-04-06 15:53:09 -07:00
Eric Fischer
8afe058c2a am 5255bd6c: (-s ours) am c7ae9f4b: Import revised translations. DO NOT MERGE
* commit '5255bd6cda542ebdff7f88ef0e035fbcc688352c':
  Import revised translations.  DO NOT MERGE
2011-04-06 14:21:49 -07:00
Eric Fischer
5255bd6cda am c7ae9f4b: Import revised translations. DO NOT MERGE
* commit 'c7ae9f4b469aaa4788ddce02ae83db1d0229a9b1':
  Import revised translations.  DO NOT MERGE
2011-04-06 14:19:32 -07:00
Eric Fischer
c7ae9f4b46 Import revised translations. DO NOT MERGE
Change-Id: Ib613c0438c34b07dfdf725a14eda10954f6a183f
2011-04-06 13:49:57 -07:00
Makoto Onuki
0b28cce4b5 Merge "Fix message view for phone" 2011-04-06 10:32:09 -07:00
Marc Blank
78684ccc79 Temporary search UI
Change-Id: Ia138ca93f0b28fd0915aa79c965f752f7c08ee90
2011-04-06 08:51:14 -07:00
Makoto Onuki
96332096ca Fix message view for phone
- All layouts are still temporary, but at least they're usable now.
- Removed reply/forward button from the bottom panel.
  There're buttons in the layout.
- Switched to getView().
- removed the unnecessary LinearLayout from the xlarge layout.
- removed some backgrounds that'll probably not be used.

Change-Id: I3aa27c63ab139ae30e5714ac3d9a1eadce74b0e8
2011-04-05 19:20:41 -07:00
Ben Komalo
2a2e42b7d8 Remove dead resources.
Change-Id: I8ccbf1e2770199765b3bd73261c4c7982ff8683b
2011-04-05 18:25:43 -07:00
Todd Kennedy
3659fdf5af Don't use hidden API
AndroidTestCase#getTestContext() is decorated with @hide. Instead, use
InstrumentationTestCase#getContext(). This gives us the same functionality
[i.e. the ability to load a test-only XML resource] without using a hidden
API.

Change-Id: I866234e227d975bac62c12e6a2e8efe90de0261c
2011-04-05 14:40:10 -07:00