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
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
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
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
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
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
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
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
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
50ab4b47bc
Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev
2012-10-23 11:22:39 -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
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
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
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
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
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
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
350ea07ca8
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-10-22 13:59:29 -07:00
Baligh Uddin
a7acb166b2
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-22 13:58:38 -07:00
Baligh Uddin
697ca010af
Import translations. DO NOT MERGE
...
Change-Id: I8c6dd26846136e2c70a725bddde0bf26e44b1509
Auto-generated-cl: translation import
2012-10-22 12:11:35 -07:00
Baligh Uddin
3a7fd50408
Import translations. DO NOT MERGE
...
Change-Id: Ia49c8378454cc2af782efffce6aa70c60568f3fd
Auto-generated-cl: translation import
2012-10-22 12:09:26 -07:00
Guang Zhu
09a728a2a9
am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
...
* commit 'a023f4f6404027c3525af2cc48535a208e33b1d8':
Prevent sync state changes when user is a monkey
2012-10-22 11:53:22 -07:00
Guang Zhu
a023f4f640
Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
2012-10-22 11:50:39 -07:00
Guang Zhu
167ba2af93
Prevent sync state changes when user is a monkey
...
Bug: 7385019
Change-Id: Icf305683e57b83b3260f2587ae0a3d1a6dc3c21d
2012-10-22 11:37:31 -07:00
The Android Automerger
8e9678eb6f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-22 06:59:29 -07:00
Russell Brenner
f012a9dd14
Added info about why Wi-Fi is required
...
Added a new optional textview to wifi settings, informing that wifi
is required during setup. For use on Nakasi 3G.
Bug: 7383934
Change-Id: I231472438e61ccddedc1e680a362f90738d64a2d
2012-10-21 13:34:38 -07:00
Russell Brenner
3fd05c8853
am 56a166e9: Added info about why Wi-Fi is required
...
* commit '56a166e9e3cac96246bd724ceea96846fc9e41e1':
Added info about why Wi-Fi is required
2012-10-21 08:05:17 -07:00
Russell Brenner
56a166e9e3
Added info about why Wi-Fi is required
...
Added a new optional textview to wifi settings, informing that wifi
is required during setup. For use on Nakasi 3G.
Bug: 7383934
Change-Id: I231472438e61ccddedc1e680a362f90738d64a2d
2012-10-19 18:55:14 -07:00
The Android Automerger
e2d92fe6f0
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-19 15:46:29 -07:00
John Spurlock
5586afe0eb
am d983e1d1: Settings: Use new shared dream setting defaults.
...
* commit 'd983e1d1a52af2ab85d10f1a15c8387a6b6a3ba9':
Settings: Use new shared dream setting defaults.
2012-10-19 11:06:26 -07:00
