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
5faee7d432
am d525470d: am 039a365f: am 5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
...
* commit 'd525470d4b7a290b7a55ee244d47f8e486cfe72c':
Use given name instead of full name for the initial population of User name.
2012-10-24 13:35:02 -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
76df067335
am b052137e: am 5a071255: am e508a26e: Remove blank translation string from en-GB, so it can show English.
...
* commit 'b052137e33844d9d669b8f5564327d2d14334c84':
Remove blank translation string from en-GB, so it can show English.
2012-10-23 15:23:35 -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
9bc8230dfe
am cd4116e3: am 116a53c1: am 50ab4b47: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev
...
* commit 'cd4116e37a7a2cd493f34723e0c10fe94e41a067':
Manually enter translations for msgid: 9014073093293520112
2012-10-23 11:29:42 -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
d8e9d3ae07
am 1bf33372: am de7cc129: am 26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
...
* commit '1bf3337289e640f93bf16ae4436d96b7847ff91f':
Fix layout with no access points
2012-10-23 11:06:11 -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
Baligh Uddin
2baed326c3
Manually enter translations for msgid: 9014073093293520112
...
Per discussion with Maarten / pbrady, enter empty string for
untranslated languages.
Bug: 7383934
Change-Id: I0faa661820e1cb39603327f8d7d748535249e75d
2012-10-23 11:00:22 -07:00
Russell Brenner
26bb2398cf
Merge "Fix layout with no access points" into jb-mr1-dev
2012-10-23 11:00:01 -07:00
Russell Brenner
e2acfde27c
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 10:45:03 -07:00
Daniel Sandler
01a71f0831
am b757ae62: am d5e1cf25: am 769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
...
* commit 'b757ae62d52577c7573f156afe065619bf4524a1':
Dreams/Sleep Mode is now Daydreams.
2012-10-23 08:21:21 -07:00
Daniel Sandler
b757ae62d5
am d5e1cf25: am 769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
...
* commit 'd5e1cf253eed7e95017542bcfa754948bee9b8f6':
Dreams/Sleep Mode is now Daydreams.
2012-10-23 08:19:21 -07:00
Daniel Sandler
25608dd1a1
am 769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
...
* commit '769b4711c94cc9093012e51e0101659d712b99ee':
Dreams/Sleep Mode is now Daydreams.
2012-10-23 08:17:28 -07:00
Daniel Sandler
d5e1cf253e
am 769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
...
* commit '769b4711c94cc9093012e51e0101659d712b99ee':
Dreams/Sleep Mode is now Daydreams.
2012-10-23 08:17:17 -07:00
Daniel Sandler
769b4711c9
Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
2012-10-23 08:15:48 -07:00
The Android Automerger
a8327e3dc6
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-23 06:59:47 -07:00
Daniel Sandler
3bdbf45316
Dreams/Sleep Mode is now Daydreams.
...
Bug: 7395321
Change-Id: Ifac4eca70e83c8b90e0cd2d16809dd117e279790
2012-10-23 01:22:36 -04:00
Amith Yamasani
6e158a91f6
am efc9458b: am 4f5555ab: am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
...
* commit 'efc9458b46cdbab7abe5df169d83a09582e8e6cd':
Fixes an AIOOBE when device admin enforces a small timeout for screen lock
2012-10-22 18:03:49 -07:00
Amith Yamasani
efc9458b46
am 4f5555ab: am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
...
* commit '4f5555ab9355e0b51a9858668aab8538e29d658c':
Fixes an AIOOBE when device admin enforces a small timeout for screen lock
2012-10-22 18:01:19 -07:00
Amith Yamasani
7ff9d5e100
am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
...
* commit 'b80b8bb2535504bada0664a7255b5fa61c2c3947':
Fixes an AIOOBE when device admin enforces a small timeout for screen lock
2012-10-22 17:59:11 -07:00
Amith Yamasani
4f5555ab93
am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
...
* commit 'b80b8bb2535504bada0664a7255b5fa61c2c3947':
Fixes an AIOOBE when device admin enforces a small timeout for screen lock
2012-10-22 17:59:10 -07:00
Amith Yamasani
b80b8bb253
Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
2012-10-22 17:56:54 -07:00
The Android Automerger
9cf38816ef
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-22 16:42:30 -07:00
Amith Yamasani
64516a191f
Fixes an AIOOBE when device admin enforces a small timeout for screen lock
...
Bug: 7378871
If the timeout choices are empty, set an empty summary.
Change-Id: I20dbe61af56f9c41337a7c284580511322e5a45e
2012-10-22 16:38:02 -07:00
Baligh Uddin
fa84e686b8
am 9fb51628: (-s ours) am 2d962955: am a7acb166: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '9fb5162867ca516917f355f6ab4d6be51c94ed43':
Import translations. DO NOT MERGE
2012-10-22 14:06:46 -07:00
Baligh Uddin
9fb5162867
am 2d962955: am a7acb166: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '2d9629557dab78d174cbe1d6d392f7d1735ace25':
Import translations. DO NOT MERGE
2012-10-22 14:04:05 -07:00
Baligh Uddin
d156dccfd3
am bb45792a: (-s ours) am aeeba258: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'bb45792a69cb17fbb3566aa4334b2d5cd41ca395':
Import translations. DO NOT MERGE
2012-10-22 14:03:10 -07:00
Baligh Uddin
2d9629557d
am a7acb166: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'a7acb166b282e3aa178eb1f6d1c8ece877d2c64d':
Import translations. DO NOT MERGE
2012-10-22 14:01:54 -07:00
Baligh Uddin
5fb549bf5f
am a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'a7acb166b282e3aa178eb1f6d1c8ece877d2c64d':
Import translations. DO NOT MERGE
2012-10-22 14:01:14 -07:00
Baligh Uddin
bb45792a69
am aeeba258: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'aeeba258e1c1f136c25a1d778b5470c3f70bb544':
Import translations. DO NOT MERGE
2012-10-22 14:00:31 -07:00
Baligh Uddin
c80664d1cf
Merge "Import translations. DO NOT MERGE"
2012-10-22 13:59:51 -07:00
