The Android Automerger
30d4f7d4a5
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-26 16:23:12 -07:00
Fábio Silva
b6676bb6a3
Changed the way that date format selector is shown.
...
Changed the way that date format selector is shown excluding ambiguity when day and month have same value.
- i.e. 01/01/2012 (mm-DD-YYYY) and 01/01/2012 (DD-mm-YYYY)
Now it displays 31/12/2012 for DD-mm-YYYY and 12/31/2012 for mm-DD-YYYY.
Change-Id: I27434c9d5713491950d4f345dccf65d647d399cf
2012-10-26 20:05:27 -03:00
Daniel Sandler
4b84bd17d7
am b9cc1faf: am 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev
...
* commit 'b9cc1faf129d1d583bd5c541fe2ab1526032d559':
Wording change for Daydream setting
2012-10-26 05:50:20 -07:00
Daniel Sandler
b9cc1faf12
am 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev
...
* commit '4cf289ad4d2d4f6ef0950b8542f53366f7e6f923':
Wording change for Daydream setting
2012-10-26 05:47:32 -07:00
Daniel Sandler
381df27cd6
am 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev
...
* commit '4cf289ad4d2d4f6ef0950b8542f53366f7e6f923':
Wording change for Daydream setting
2012-10-26 05:46:14 -07:00
Daniel Sandler
4cf289ad4d
Merge "Wording change for Daydream setting" into jb-mr1-dev
2012-10-26 04:46:14 -07:00
Michael Jurka
8a4024ecac
Add ability to add clock widget to keyguard
...
Change-Id: I70e6fbb664181efc2906ed33d732695279462a95
2012-10-25 16:05:10 -07:00
The Android Automerger
1e02061961
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-25 13:42:45 -07:00
Baligh Uddin
4f4cae2b11
am 103f74b5: Import translations. DO NOT MERGE
...
* commit '103f74b55fe07b15c8e87c04e2a83cd4fabdf902':
Import translations. DO NOT MERGE
2012-10-25 10:46:33 -07:00
Baligh Uddin
103f74b55f
Import translations. DO NOT MERGE
...
Change-Id: Ie1bf43d9ee2b5a3008e0d1be25329fc56ed633af
Auto-generated-cl: translation import
2012-10-25 10:41:18 -07:00
Amith Yamasani
f1e74da7b6
am cde507af: am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
...
* commit 'cde507af4c99ca9e411bd8f83eaba65262473b01':
Reduce jank in security lock selection by finishing on return
2012-10-24 22:51:18 -07:00
Amith Yamasani
67920f0639
am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
...
* commit 'b02771eff35cccf03202e4b8e27a44681a5f7570':
Reduce jank in security lock selection by finishing on return
2012-10-24 22:48:41 -07:00
Amith Yamasani
cde507af4c
am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
...
* commit 'b02771eff35cccf03202e4b8e27a44681a5f7570':
Reduce jank in security lock selection by finishing on return
2012-10-24 22:48:39 -07:00
Amith Yamasani
b02771eff3
Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
2012-10-24 22:47:18 -07:00
Daniel Sandler
4125fbd5c1
Wording change for Daydream setting
...
Bug: 7410881
Change-Id: I5970254f2ffc33ab34fa61c08acaf1564e2556ca
2012-10-24 23:37:45 -04:00
Michael Jurka
d4362b7d35
Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev
2012-10-24 18:28:28 -07:00
Michael Jurka
89a30ffc63
Adding ability to add multiple keyguard widgets
...
Bug: 7381803
Change-Id: I099f47a5cc43199635fed9ad2c4d03d79004e4f4
2012-10-24 17:44:36 -07:00
Baligh Uddin
3c42b19d34
am 5379dc64: am b8a97822: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '5379dc64b216367b1be47d0a069900aebd8164c8':
Import translations. DO NOT MERGE
2012-10-24 17:40:22 -07:00
Baligh Uddin
ee398a5f25
am cf24fc56: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'cf24fc5695e0e58238001a4b0eeee594e4f6df0b':
Import translations. DO NOT MERGE
2012-10-24 17:33:41 -07:00
Baligh Uddin
5379dc64b2
am b8a97822: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'b8a9782221c27646ade69141e09a4faa3473422e':
Import translations. DO NOT MERGE
2012-10-24 17:33:36 -07:00
Baligh Uddin
ed49b6fc39
am b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'b8a9782221c27646ade69141e09a4faa3473422e':
Import translations. DO NOT MERGE
2012-10-24 17:33:28 -07:00
Baligh Uddin
e00f034ec7
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-10-24 17:32:35 -07:00
Baligh Uddin
b8a9782221
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-24 17:31:11 -07:00
Baligh Uddin
cf24fc5695
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-24 17:30:17 -07:00
The Android Automerger
58ed28efc6
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-24 16:57:17 -07:00
Baligh Uddin
a8f59cc8b5
Import translations. DO NOT MERGE
...
Change-Id: I5e09f5b9727a8c8121eb2243bc519b99eb313903
Auto-generated-cl: translation import
2012-10-24 16:19:55 -07:00
Baligh Uddin
2b274471f9
Import translations. DO NOT MERGE
...
Change-Id: I5a5f54816579e0aef799b0a695bae71deb69eb69
Auto-generated-cl: translation import
2012-10-24 16:15:53 -07:00
Baligh Uddin
fa00ff0099
Import translations. DO NOT MERGE
...
Change-Id: I650b82d0cfbb0b54f90e6932a09ad576216005eb
Auto-generated-cl: translation import
2012-10-24 16:12:21 -07:00
Amith Yamasani
c666c65fab
Reduce jank in security lock selection by finishing on return
...
Earlier the finish of the chooser was happening before the pattern/pin chooser
was started, resulting in two transitions.
This change defers the finish to after returning from the other activity. There
is still sometimes a very small glitch on the way back, but much smaller than
the current problem.
Bug: 7342594
Change-Id: I5f4f4393b841ce31dc7236074381283155ebddbd
2012-10-24 13:57:01 -07:00
Amith Yamasani
d525470d4b
am 039a365f: am 5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
...
* commit '039a365f961a69845438c22cc4c3a560bc82ed3f':
Use given name instead of full name for the initial population of User name.
2012-10-24 13:32:04 -07:00
Amith Yamasani
c250ae9d71
am 5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
...
* commit '5749ce0903cad3160a5cf907af3a9a4cbc4b1d4e':
Use given name instead of full name for the initial population of User name.
2012-10-24 13:29:28 -07:00
Amith Yamasani
039a365f96
am 5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
...
* commit '5749ce0903cad3160a5cf907af3a9a4cbc4b1d4e':
Use given name instead of full name for the initial population of User name.
2012-10-24 13:29:28 -07:00
Amith Yamasani
5749ce0903
Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
2012-10-24 13:26:39 -07:00
Amith Yamasani
8d40fac706
Use given name instead of full name for the initial population of User name.
...
Bug: 7406217
Change-Id: I5006039ef146369f569445d0fcbaf82fd163343e
2012-10-24 10:30:51 -07:00
The Android Automerger
27dccee942
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-23 16:47:32 -07:00
Baligh Uddin
62abddace3
Remove blank translation string from en-GB, so it can show English.
...
Change-Id: I124abc4113f38b8fbd3ff164af5f0d47970f5471
2012-10-23 16:06:06 -07:00
Baligh Uddin
828f5235ee
Manually enter translations for msgid: 9014073093293520112
...
Per discussion with Maarten / pbrady, enter empty string for
untranslated languages.
Bug: 7383934
Change-Id: I0faa661820e1cb39603327f8d7d748535249e75d
Conflicts:
res/values-af/strings.xml
res/values-am/strings.xml
res/values-ar/strings.xml
res/values-be/strings.xml
res/values-bg/strings.xml
res/values-ca/strings.xml
res/values-cs/strings.xml
res/values-da/strings.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-en-rGB/strings.xml
res/values-es-rUS/strings.xml
res/values-es/strings.xml
res/values-et/strings.xml
res/values-fa/strings.xml
res/values-fi/strings.xml
res/values-fr/strings.xml
res/values-hi/strings.xml
res/values-hr/strings.xml
res/values-hu/strings.xml
res/values-in/strings.xml
res/values-it/strings.xml
res/values-iw/strings.xml
res/values-ja/strings.xml
res/values-ko/strings.xml
res/values-lt/strings.xml
res/values-lv/strings.xml
res/values-ms/strings.xml
res/values-nb/strings.xml
res/values-nl/strings.xml
res/values-pl/strings.xml
res/values-pt-rPT/strings.xml
res/values-pt/strings.xml
res/values-rm/strings.xml
res/values-ro/strings.xml
res/values-ru/strings.xml
res/values-sk/strings.xml
res/values-sl/strings.xml
res/values-sr/strings.xml
res/values-sv/strings.xml
res/values-sw/strings.xml
res/values-th/strings.xml
res/values-tl/strings.xml
res/values-tr/strings.xml
res/values-uk/strings.xml
res/values-vi/strings.xml
res/values-zh-rCN/strings.xml
res/values-zh-rTW/strings.xml
res/values-zu/strings.xml
2012-10-23 16:05:18 -07:00
Russell Brenner
adc728fe66
Fix layout with no access points
...
The "Searching for Wi-Fi" message was filling it's view parent,
pushing the "Other network..." option and Skip button out of view.
Bug: 7335738
Change-Id: I6fd1ceff67e04385c6e325ec4bb8a2e30f38c924
2012-10-23 15:55:55 -07:00
Baligh Uddin
b052137e33
am 5a071255: am e508a26e: Remove blank translation string from en-GB, so it can show English.
...
* commit '5a071255ca53778d7de3c31f2b685cba4c541cdf':
Remove blank translation string from en-GB, so it can show English.
2012-10-23 15:20:54 -07:00
Baligh Uddin
5a071255ca
am e508a26e: Remove blank translation string from en-GB, so it can show English.
...
* commit 'e508a26e037c1b0a813575f1154da0ede7644979':
Remove blank translation string from en-GB, so it can show English.
2012-10-23 15:18:03 -07:00
Baligh Uddin
06545e87b5
am e508a26e: Remove blank translation string from en-GB, so it can show English.
...
* commit 'e508a26e037c1b0a813575f1154da0ede7644979':
Remove blank translation string from en-GB, so it can show English.
2012-10-23 15:17:59 -07:00
The Android Automerger
36bdd2f4e2
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-23 14:37:43 -07:00
Baligh Uddin
e508a26e03
Remove blank translation string from en-GB, so it can show English.
...
Change-Id: I124abc4113f38b8fbd3ff164af5f0d47970f5471
2012-10-23 13:25:55 -07:00
Baligh Uddin
cd4116e37a
am 116a53c1: am 50ab4b47: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev
...
* commit '116a53c133449ad36b0636bf03512c4a64112655':
Manually enter translations for msgid: 9014073093293520112
2012-10-23 11:27:03 -07:00
Baligh Uddin
a748995401
am 50ab4b47: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev
...
* commit '50ab4b47bc776c257c1491cb4a68ee8afc5599e5':
Manually enter translations for msgid: 9014073093293520112
2012-10-23 11:24:40 -07:00
Baligh Uddin
116a53c133
am 50ab4b47: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev
...
* commit '50ab4b47bc776c257c1491cb4a68ee8afc5599e5':
Manually enter translations for msgid: 9014073093293520112
2012-10-23 11:24:13 -07:00
Baligh Uddin
50ab4b47bc
Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev
2012-10-23 11:22:39 -07:00
Russell Brenner
1bf3337289
am de7cc129: am 26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
...
* commit 'de7cc12900c7015849f818809368716174920337':
Fix layout with no access points
2012-10-23 11:03:37 -07:00
Russell Brenner
98f884b195
am 26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
...
* commit '26bb2398cf8ebe1879adfb3043709467474858ec':
Fix layout with no access points
2012-10-23 11:02:59 -07:00
Russell Brenner
de7cc12900
am 26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
...
* commit '26bb2398cf8ebe1879adfb3043709467474858ec':
Fix layout with no access points
2012-10-23 11:02:22 -07:00
