The Android Open Source Project
16baa1494e
am 76df3996
: am 163d3521
: Reconcile with ics-mr1-release
...
* commit '76df3996ee3dc5aec6cae88e787c0f70138c064b':
2011-12-12 15:34:53 -08:00
The Android Open Source Project
76df3996ee
am 163d3521
: Reconcile with ics-mr1-release
...
* commit '163d3521fb8d30c88e682f48bf9f055adeb566cd':
2011-12-12 15:30:01 -08:00
Mindy Pereira
a56910cca2
am b64944e9
: am 82e050db
: (-s ours) am 6d7eef22
: DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
...
* commit 'b64944e9d10d8890e1fc6280aee535145d5b0e36':
DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
2011-12-12 13:38:05 -08:00
Mindy Pereira
b64944e9d1
am 82e050db
: (-s ours) am 6d7eef22
: DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
...
* commit '82e050dbbb0db1fbc02f7abacb9c1e7b7cb03180':
DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
2011-12-12 12:35:00 -08:00
Eric Fischer
3ca30fdc6e
am 3adec178
: am c34330bb
: (-s ours) am 0130c5a0
: Import revised translations. DO NOT MERGE
...
* commit '3adec178adb95cb6360d21b079b081e9d7b7601b':
Import revised translations. DO NOT MERGE
2011-12-09 15:03:56 -08:00
The Android Open Source Project
18c1c48065
am 531ad632
: am 35353d25
: Reconcile with ics-mr1-release
...
* commit '531ad63238f1c20c62cf8a27fe4501dfd26543cc':
2011-12-09 15:03:55 -08:00
Eric Fischer
3adec178ad
am c34330bb
: (-s ours) am 0130c5a0
: Import revised translations. DO NOT MERGE
...
* commit 'c34330bb45887b5057145d1c91563fdf89be0fe6':
Import revised translations. DO NOT MERGE
2011-12-09 14:58:14 -08:00
The Android Open Source Project
531ad63238
am 35353d25
: Reconcile with ics-mr1-release
...
* commit '35353d259849cad1ad204b1b84f1398044b3eeaa':
2011-12-09 14:57:54 -08:00
The Android Open Source Project
163d3521fb
Reconcile with ics-mr1-release
...
Change-Id: I81d29eeea3d099d15968955ccadd8a330c6fbae6
2011-12-09 07:11:37 -08:00
The Android Automerger
e8949d30bc
merge in ics-mr1-release history after reset to ics-mr1
2011-12-08 17:35:48 -08:00
Mindy Pereira
82e050dbbb
am 6d7eef22
: DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
...
* commit '6d7eef22cd2634bd0da8de8e38635dd92b3e5a48':
DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
2011-12-08 15:33:32 -08:00
Mindy Pereira
6c1214282a
am 6d7eef22
: DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
...
* commit '6d7eef22cd2634bd0da8de8e38635dd92b3e5a48':
DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
2011-12-08 15:32:09 -08:00
Mindy Pereira
0170f3e391
am 2df61456
: Clear back stack and make this the top level stack.
...
* commit '2df61456f4aef692316acbb39b69de4c78a9f8bb':
Clear back stack and make this the top level stack.
2011-12-08 13:47:30 -08:00
Mindy Pereira
6d7eef22cd
DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
...
Fixes b/5716835 back stack in email gets messed up in certain circumstances
Change-Id: I499a1c19f1ebbb7e4debde690cacf17f9f6c3454
2011-12-08 13:47:02 -08:00
Andy Huang
d6894cdac9
am a7d1b5c5
: Fix various text size problems when system font size is huge
...
* commit 'a7d1b5c58ce52ed63a935d07d46906a78632ceb6':
Fix various text size problems when system font size is huge
2011-12-08 13:37:22 -08:00
Mindy Pereira
2df61456f4
Clear back stack and make this the top level stack.
...
Fixes b/5716835 back stack in email gets messed up in certain circumstances
Change-Id: I6fb593a520931b16e973f025c00709f7e76bb4d9
2011-12-08 13:36:47 -08:00
Andy Huang
a7d1b5c58c
Fix various text size problems when system font size is huge
...
This CL to replace Iafd5d1dc.
* use common styles for spinner anchor and dropdown text
(introduced in I3063cfea)
* allow dropdown item height to scale beyond fixed height to fit
huge text
Other fixes:
* use Gmail's color for dropdown and folder list header text
* remove spurious divider in dropdown items that precede a
header
Bug: 5687252
Change-Id: I3e46cff736a045c4a59a0ff8810977e39f903a14
2011-12-08 13:24:51 -08:00
Eric Fischer
c34330bb45
am 0130c5a0
: Import revised translations. DO NOT MERGE
...
* commit '0130c5a03756b01ec4a39422ab08474625153a81':
Import revised translations. DO NOT MERGE
2011-12-08 11:13:16 -08:00
Eric Fischer
d957dda20f
am 0130c5a0
: Import revised translations. DO NOT MERGE
...
* commit '0130c5a03756b01ec4a39422ab08474625153a81':
Import revised translations. DO NOT MERGE
2011-12-08 11:13:11 -08:00
Eric Fischer
0130c5a037
Import revised translations. DO NOT MERGE
...
Change-Id: I0b065eb88500457583eedf899db1c76ef939dbab
2011-12-08 10:34:54 -08:00
The Android Open Source Project
35353d2598
Reconcile with ics-mr1-release
...
Change-Id: I7fa1d584dcfecb90d259d70546b269118533f00c
2011-12-08 10:22:14 -08:00
Mindy Pereira
12cd9236ba
am 970e9b70
: Merge "Revert "Fix various text size problems when system font size is huge""
...
* commit '970e9b70db30e0cb00e101bfb4f346ec8e0bf82e':
Revert "Fix various text size problems when system font size is huge"
2011-12-08 09:36:31 -08:00
Mindy Pereira
970e9b70db
Merge "Revert "Fix various text size problems when system font size is huge""
2011-12-08 09:35:08 -08:00
Mindy Pereira
c756389817
Revert "Fix various text size problems when system font size is huge"
...
This reverts commit 19bc1921f2
2011-12-08 09:33:30 -08:00
Vikram Aggarwal
1010b5389f
am d8296ff4
: Merge "Fix various text size problems when system font size is huge"
...
* commit 'd8296ff4f2137c1e72324760afc93517350450c2':
Fix various text size problems when system font size is huge
2011-12-08 09:02:31 -08:00
Vikram Aggarwal
d8296ff4f2
Merge "Fix various text size problems when system font size is huge"
2011-12-08 09:01:12 -08:00
Andy Huang
19bc1921f2
Fix various text size problems when system font size is huge
...
* use common styles for spinner anchor and dropdown text
(introduced in I3063cfea)
* allow dropdown item height to scale beyond fixed height to fit
huge text
Other fixes:
* use Gmail's color for dropdown and folder list header text
* remove spurious divider in dropdown items that precede a
header
Bug: 5687252
Change-Id: Iafd5d1dc7c3809393c3892138b42b7274fb03a27
2011-12-07 18:28:41 -08:00
Marc Blank
5d9d49f126
am 5c0c5575
: Merge "Use LOCALIZED collation for mailbox names"
...
* commit '5c0c5575676ec73404fa70fc705e3f6476822064':
Use LOCALIZED collation for mailbox names
2011-12-07 18:02:07 -08:00
Marc Blank
5c0c557567
Merge "Use LOCALIZED collation for mailbox names"
2011-12-07 18:00:27 -08:00
Marc Blank
4c49b4a220
Use LOCALIZED collation for mailbox names
...
* Our mailbox sort order varies from that of other clients due to
our not having used LOCALIZED collation
Bug: 2347066
Change-Id: I334feb9fa5690118401e2fe2b4a767eb3f29b25f
2011-12-07 15:05:30 -08:00
Claudia de Veaux
f865e4f66c
am 886acf74
: Merge "Edit to strings per UI text standards."
...
* commit '886acf7420eea4c0c5f0ed10cf91715324968f23':
Edit to strings per UI text standards.
2011-12-07 14:37:18 -08:00
Claudia de Veaux
886acf7420
Merge "Edit to strings per UI text standards."
2011-12-07 14:36:01 -08:00
Claudia de Veaux
76e273e3c8
Edit to strings per UI text standards.
...
* Used standard language ("Allows this app..." for permission descriptions.
* Messages and toasts use ending punctuation.
* Checkbox labels do not use ending punctuation.
* Toast language should be cryptic.
* Use "unsuccessful" instead of failed, or "Couldn\'t ...".
* Use contractions.
Bug: 5165745
Bug: 5162667
Bug: 5163232
Change-Id: I4417a4c7b06b278ceb2a61f61493842c9bf922e1
2011-12-07 11:50:44 -08:00
Eric Fischer
ae919821d6
am 844b1556
: Import revised translations. DO NOT MERGE
...
* commit '844b1556b1de89a23e019be6a7fb7da3b09db867':
Import revised translations. DO NOT MERGE
2011-12-07 11:02:09 -08:00
The Android Open Source Project
96238907a8
am f9da02a5
: Reconcile with ics-mr1-release
...
* commit 'f9da02a5034b32e1e504653568f2843bcf5e90a0':
2011-12-07 07:48:53 -08:00
The Android Open Source Project
f9da02a503
Reconcile with ics-mr1-release
...
Change-Id: Ice5b782571d079b6a70acba24a504e5489ba4d55
2011-12-07 07:44:53 -08:00
The Android Automerger
0fe9c4a616
merge in ics-mr1-release history after reset to ics-mr1
2011-12-06 16:54:41 -08:00
Eric Fischer
48d296efb1
am dafb73e3
: am 844b1556
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit 'dafb73e3f45de084dc825fef8405cd1112915aac':
Import revised translations. DO NOT MERGE
2011-12-06 10:45:19 -08:00
Eric Fischer
dafb73e3f4
am 844b1556
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '844b1556b1de89a23e019be6a7fb7da3b09db867':
Import revised translations. DO NOT MERGE
2011-12-06 10:42:34 -08:00
Eric Fischer
844b1556b1
Import revised translations. DO NOT MERGE
...
Change-Id: I1a328a978d6968242ed48871c636a8000fb7ffb9
2011-12-06 10:28:50 -08:00
Mindy Pereira
352faa3515
am 50bf7109
: Merge "Like Gmail, we only want to set activated text to a diff color for two pane."
...
* commit '50bf710937d1915d4e65d3aa19cf58a764be8e38':
Like Gmail, we only want to set activated text to a diff color for two pane.
2011-12-02 14:29:14 -08:00
Mindy Pereira
50bf710937
Merge "Like Gmail, we only want to set activated text to a diff color for two pane."
2011-12-02 14:27:23 -08:00
Mindy Pereira
bb86a95acd
Like Gmail, we only want to set activated text to a diff color for two pane.
...
Fixes b/5699511 Draft message is showing in white color text
Change-Id: I9f15807936db8864a1752d56056b08ddfb32f121
2011-12-02 14:20:46 -08:00
Mindy Pereira
89f3d2b16b
am 333cdbae
: Tweak padding slightly to match the EditTextPreference screens.
...
* commit '333cdbaef46c3814ff6cad7317a8963457316f70':
Tweak padding slightly to match the EditTextPreference screens.
2011-12-02 11:58:43 -08:00
Mindy Pereira
333cdbaef4
Tweak padding slightly to match the EditTextPreference screens.
...
The edittextpreference uses a default system screens, but since this isn't really a preference
screen, it isn't usable here.
Change-Id: I770c12a5ec3a33906f5d6d1c9d0b7a6b027460da
2011-12-02 11:36:34 -08:00
Mindy Pereira
0f754b20d1
am dc931441
: Merge "Fix layout for edit quick response dialog."
...
* commit 'dc931441d879ede625a073755bfac40f93de6d10':
Fix layout for edit quick response dialog.
2011-12-02 11:15:56 -08:00
Mindy Pereira
dc931441d8
Merge "Fix layout for edit quick response dialog."
2011-12-02 11:14:22 -08:00
Mindy Pereira
d637dc245b
Fix layout for edit quick response dialog.
...
Fixes b/5528659 Quick Response "create new" dialog is janky
Change-Id: Ib78d677114f9af1969ce8314e6f58002d2ad727f
2011-12-02 11:11:21 -08:00
Mindy Pereira
32cec75171
am bc6625ef
: Merge "Make sure to check for a null account before using the account."
...
* commit 'bc6625ef73d52f207cb68b6d7a982abb3a30b8f5':
Make sure to check for a null account before using the account.
2011-12-02 10:46:02 -08:00
Mindy Pereira
bc6625ef73
Merge "Make sure to check for a null account before using the account."
2011-12-02 10:44:21 -08:00