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
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
aeeba258e1
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-22 13:58:21 -07:00
Baligh Uddin
9015eccf1d
Import translations. DO NOT MERGE
...
Change-Id: I0de602f7a27ceef958b12e2f4479228eae1c4056
Auto-generated-cl: translation import
2012-10-22 12:14: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
Baligh Uddin
4a3bed0cf9
Import translations. DO NOT MERGE
...
Change-Id: I94a7973ca3611509deb3847b4bc211196f12ca30
Auto-generated-cl: translation import
2012-10-22 12:07:22 -07:00
Guang Zhu
4b8b98d81f
am 8f2a9c00: am 6a07244f: am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
...
* commit '8f2a9c0043081f0008bfadc50bb7cbc010a2b3cb':
Prevent sync state changes when user is a monkey
2012-10-22 11:58:22 -07:00
Guang Zhu
8f2a9c0043
am 6a07244f: am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
...
* commit '6a07244fa83a4c6296d8a743238b6bd936bfb3ba':
Prevent sync state changes when user is a monkey
2012-10-22 11:55:47 -07:00
Guang Zhu
6a07244fa8
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:23 -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
3ee25f2eec
am 86a52bec: am 5c412204: am 56a166e9: Added info about why Wi-Fi is required
...
* commit '86a52bec4b0134e540cc5c546da4e88dc2d62487':
Added info about why Wi-Fi is required
2012-10-21 08:09:59 -07:00
Russell Brenner
86a52bec4b
am 5c412204: am 56a166e9: Added info about why Wi-Fi is required
...
* commit '5c412204a63031b4dee3195d3a350d9e2d929fe4':
Added info about why Wi-Fi is required
2012-10-21 08:08:01 -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
5c412204a6
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:12 -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
e32a008ef8
am 9055dd74: am 76f99688: am d983e1d1: Settings: Use new shared dream setting defaults.
...
* commit '9055dd74f4ac42e422de941259d9f9c437ef9eca':
Settings: Use new shared dream setting defaults.
2012-10-19 11:11:18 -07:00
John Spurlock
9055dd74f4
am 76f99688: am d983e1d1: Settings: Use new shared dream setting defaults.
...
* commit '76f99688cfc0f0c3a7e3782e8b9bcd640a0e4653':
Settings: Use new shared dream setting defaults.
2012-10-19 11:08:33 -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
John Spurlock
76f99688cf
am d983e1d1: Settings: Use new shared dream setting defaults.
...
* commit 'd983e1d1a52af2ab85d10f1a15c8387a6b6a3ba9':
Settings: Use new shared dream setting defaults.
2012-10-19 11:05:49 -07:00
John Spurlock
d983e1d1a5
Settings: Use new shared dream setting defaults.
...
Bug:7373284
Change-Id: I12d00b45d0bada5207af3a7bda906370e7a87413
2012-10-19 11:27:22 -04:00
