Commit Graph

9734 Commits

Author SHA1 Message Date
Martin Hibdon 5369b102c7 Update version number
Change-Id: Ic18cd52ffdfe2905a7d9510f41f1331c2ef11675
2014-06-05 13:16:45 -07:00
Alan Lau 07e0bf5c74 DO NOT MERGE Adding data to the pending intent for notification action. This is now needed
because Wear allows users to perform action on each conversation and therefore
the pending intent can't be shared.

Bug 15344221

Change-Id: Ib6d3f17ba64c1a8a14ab9abe56b2d8168c7b9558
(cherry picked from commit 10d73dbe18)
2014-06-02 17:17:23 +00:00
Martin Hibdon 636a20a727 Bump version number
Change-Id: I2831b14d1e6a612f05caf285aaa1253e757f0890
2014-05-29 13:40:37 -07:00
Tony Mantler ee818ac898 Add missing space in MIME header
Also skip adding the filename if none exists

b/13138456

Change-Id: I2e3d82c2a560049cfc3fcd0130f4c6d8020757a2
(cherry picked from commit 8b80821645)
2014-05-20 18:16:41 +00:00
Martin Hibdon 5c5ed8f14a Merge "Bump version number" into ub-mail-algol 2014-05-19 21:45:54 +00:00
Martin Hibdon 7aa399bc37 Bump version number
Change-Id: Icf8cb5db2a8da6c99d5cbf458b4a22dfe6ec45e1
2014-05-19 14:42:41 -07:00
Tony Mantler 9a44073e75 Fix the remainder of save-alert cases
b/14969455

Change-Id: I19b138b7d5b30a4f617a1af9a5be878c03068327
(cherry picked from commit 28dd431c23)
2014-05-19 21:41:13 +00:00
Martin Hibdon 4b5b7886bc Merge "Disable the debug menu" into ub-mail-algol 2014-05-15 20:41:25 +00:00
Martin Hibdon 2c26bb3b09 Disable the debug menu
b/14995079

Change-Id: I0b7fa2edc7cf7cdac97aba9412a18aece09cb5c2
2014-05-15 13:35:33 -07:00
Martin Hibdon 5df6ff137d Bump the version number
Change-Id: I24a7a30acee4879de6e69b72e4ae7d6ddbc22bb6
2014-05-15 10:42:41 -07:00
Tony Mantler 0cb5fd3f7f DO NOT MERGE Fix URI comparison
b/14914981

The framework may make copies of the URI objects before they're passed in,
so we should use .equals() instead of pointer equality.

Change-Id: Ia443e96c81d53829ac6cfce70cebc098861f1c78
(cherry picked from commit e8a3c14f28)
2014-05-14 23:36:31 +00:00
Baligh Uddin 1cf672eafd Import translations. DO NOT MERGE
Change-Id: If70ec53e84a062cc11b4d967c182fecf1f0d19bd
Auto-generated-cl: translation import
2014-05-12 13:25:19 -07:00
Tony Mantler 8989dfa5e7 Fix cancel handling in account settings screens
- Don't loop on the confirmation dialog
- Do a deep copy of the initial hostauth state
- Save the initial hostauth state on configuration changes
- Collect the user input before comparing the old state with the new

b/14285245

Change-Id: Ibc033fac525be2a4cb03c6a0d1e92254a2236b4c
(cherry picked from commit 294593c5f5)
2014-05-08 21:27:23 +00:00
Baligh Uddin 92fdb3d39a Import translations. DO NOT MERGE
Change-Id: Ib2ccf8152e545f20a789a9633774b47a14824bc3
Auto-generated-cl: translation import
2014-05-07 19:33:14 -07:00
Baligh Uddin 28197113d0 Merge "Import translations. DO NOT MERGE" into ub-mail-algol 2014-05-06 14:55:44 +00:00
Baligh Uddin b0085c774a Import translations. DO NOT MERGE
Change-Id: Id701dd23f377d5cb0f05c65e5bd608b7d20b2468
Auto-generated-cl: translation import
2014-05-05 14:15:53 -07:00
Martin Hibdon 81f9a57a65 Fix some STOPSHIP logging
b/14564870

Change-Id: I9365013eacde23178578b45f728713f80417bc7a
2014-05-05 13:04:19 -07:00
Tony Mantler 0d7c709125 Always return a valid Uri for account inbox
Also don't return virtual folders unless real folders exist

b/14319452

Change-Id: Id5f62f5ccc4d5488ae467df741b0598a158ceb81
2014-05-01 15:05:15 -07:00
Baligh Uddin a41c1bd1b1 Import translations. DO NOT MERGE
Change-Id: I4490880603d2cc350e87097d379b161ae185403d
Auto-generated-cl: translation import
2014-04-30 13:53:32 -07:00
Baligh Uddin b244ac85cd Merge "Import translations. DO NOT MERGE" into ub-mail-algol 2014-04-29 21:12:10 +00:00
Martin Hibdon 03d80363fa Merge "Update the font for account setup basics" into ub-mail-algol 2014-04-29 17:46:37 +00:00
Martin Hibdon f318cac84f Merge "Update version" into ub-mail-algol 2014-04-28 22:31:13 +00:00
Martin Hibdon de437fcc32 Update version
Change-Id: I3683df2afb2d973a067668a2caf1d66e24813ba1
2014-04-28 15:20:24 -07:00
Martin Hibdon 3264276e6c Update the font for account setup basics
b/14386385

Change-Id: Ica54796333b48bb04822406a6e2a719570840949
2014-04-28 14:58:50 -07:00
Baligh Uddin 31f72d0343 Import translations. DO NOT MERGE
Change-Id: Ia8463964cff67d2bd1d1b39c2555c20ad06b3cdc
Auto-generated-cl: translation import
2014-04-28 13:30:43 -07:00
Martin Hibdon eecebc3fe7 Fix a a problem in some button padding
I was using "10sp" instead of "10dp", and it needs to be
20dp anyway.

Change-Id: I31b1f770571968547f02920be90b05e27dd5419b
2014-04-23 17:54:18 -07:00
Baligh Uddin 4eda266dfd Merge "Import translations. DO NOT MERGE" into ub-mail-algol 2014-04-23 23:14:58 +00:00
Baligh Uddin ab0a3e2440 Import translations. DO NOT MERGE
Change-Id: I0c41c8f62dcf28de327411ed622a7ddcb4e1ee95
Auto-generated-cl: translation import
2014-04-23 15:28:03 -07:00
Martin Hibdon bd7994295d Merge "Update more padding and layouts" into ub-mail-algol 2014-04-23 22:24:17 +00:00
Martin Hibdon fefeddeaf0 Update more padding and layouts
b/14255447
The password label, edit text, and clear button were not
lining up correctly. Also, there needed to be more space
around the password edit text.

Change-Id: I71864733457b3b599160a6d9a44d48d2e23961ce
2014-04-23 15:17:09 -07:00
Martin Hibdon 6e85bca660 Merge "Update strings in account_setup_options" into ub-mail-algol 2014-04-23 22:08:39 +00:00
Martin Hibdon b84087e641 Update font size for device Id
b/14255447

Change-Id: I4d994a934e1691c9bc8d2554df797fdba72d3767
2014-04-23 14:20:48 -07:00
Martin Hibdon 10267247d2 Update strings in account_setup_options
Change-Id: I02f4eee523b921aff4b0d548a03186b6bdd8426e
2014-04-23 13:57:40 -07:00
Martin Hibdon 18e65df13a Fix some alignment issues on the certificate selector
b/14255447

Change-Id: Ic17b9ca2ff5c8196ddbed7e70d1eee0de941823f
2014-04-23 13:16:16 -07:00
Martin Hibdon e0364574dc Merge "Update padding on some buttons, and adjust font size" into ub-mail-algol 2014-04-23 18:18:53 +00:00
Martin Hibdon 6c7b413097 Update padding on some buttons, and adjust font size
b/14255447

Change-Id: I641820217df3fa3953a5c88e04870d9596224392
2014-04-23 11:17:49 -07:00
Martin Hibdon 92581f7820 Move the setup nav buttons to the bottom on tablets
b/14187851
Now the bars on the sides for tablet landscape setup are actually
in the activity, not the fragment. The setup fragment template
is identical between tablet and phone, with any differences between
them contained in different styles or dimensions.

Change-Id: Id7005f73aa29ed6010e629873155eb5fdc8e818f
2014-04-23 10:34:16 -07:00
Martin Hibdon 91eec1a519 Use the correct string for the password label
b/14257168

Change-Id: I08a73bbb91bd4f897617617b67cf51fe4f0c2b7f
2014-04-22 17:31:47 -07:00
Martin Hibdon 8b063aa979 Fix a typo I introduced in a previous change
b/14257168
In this CL I changed the name of a string, but missed one
place where it was references.
https://googleplex-android-review.git.corp.google.com/#/c/453472/

Change-Id: I7d943a2209f2defb6f0eb846b6f361a08f40f756
2014-04-22 17:19:33 -07:00
Martin Hibdon 2883e37f0a Update labels to be upper case
b/14257168

Change-Id: I1de342636aafb3778fee470d98d821abc76cfb37
2014-04-22 14:54:33 -07:00
Martin Hibdon 0dae4d3ffb Update a bunch of layouts
b/14169396
Swap the positions of the headline text and email image
on account setup basics
b/14257403
Swap the positions of the password and "signed in with XXX"
button on the credentials fragment
b/14255447
Adjust padding to fix a number of alignment issues.

Change-Id: I011e259a86123cf205d86407def2ff774744e005
2014-04-22 14:46:32 -07:00
Martin Hibdon 93345dcd83 Update version number
Change-Id: I53de96340d7584009103b2870d04616a075fc889
2014-04-21 15:13:56 -07:00
Martin Hibdon d623aee90e Merge "Make the manual button into a normal button" into ub-mail-algol 2014-04-21 19:59:12 +00:00
Martin Hibdon 89a03e8e83 Merge "Change the side background color" into ub-mail-algol 2014-04-21 19:59:10 +00:00
Martin Hibdon 590c14b585 Make the manual button into a normal button
b/14226801

Change-Id: I51aecf8761b7c689b0c9efd094592bfc24f372fc
2014-04-21 12:36:21 -07:00
Martin Hibdon 07296e9e60 Change the side background color
b/14170786

Change-Id: I99da56e9a5c2203b79b6c8be951f8859dbc866ef
2014-04-21 12:22:27 -07:00
Tony Mantler f501d41c7b Merge "Add cross-fade to setup flow" into ub-mail-algol 2014-04-18 22:37:32 +00:00
Tony Mantler b5fd6b8905 Add cross-fade to setup flow
b/14164262

Change-Id: I41fe0bf5661d9f7a2b5051604c0b6dbfc4506414
2014-04-18 14:54:55 -07:00
Tony Mantler b2fd4d2576 Merge "Make AccountSettings implement callbacks for check settings dialog" into ub-mail-algol 2014-04-18 18:21:21 +00:00
Tony Mantler 0d70ee2cb9 Merge "Fix layout of standalone credential activity" into ub-mail-algol 2014-04-18 18:17:53 +00:00