OSDN Git Service
Baligh Uddin [Mon, 29 Oct 2012 21:12:10 +0000 (14:12 -0700)]
am
e42e7b85: Import translations. DO NOT MERGE
* commit '
e42e7b85285963cd959cec701689deaefbe44898':
Import translations. DO NOT MERGE
Eric Laurent [Mon, 29 Oct 2012 21:02:27 +0000 (14:02 -0700)]
am
79b7fdd2: Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev
* commit '
79b7fdd2c0682f59f3a0899041b470cc02154219':
added dock audio settings for non bluetooth docks
Daniel Sandler [Mon, 29 Oct 2012 20:42:01 +0000 (13:42 -0700)]
am
381df27c: am
4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev
* commit '
381df27cd69c9c7315556c1dc40403118f7c585a':
Michael Jurka [Mon, 29 Oct 2012 20:41:59 +0000 (13:41 -0700)]
am
8a4024ec: Add ability to add clock widget to keyguard
* commit '
8a4024ecac34515947b185c153e1055549713b38':
Add ability to add clock widget to keyguard
Amith Yamasani [Mon, 29 Oct 2012 20:41:58 +0000 (13:41 -0700)]
am
67920f06: am
b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
* commit '
67920f0639681cb5e5bc193688e4fc1c7419c872':
Michael Jurka [Mon, 29 Oct 2012 20:41:52 +0000 (13:41 -0700)]
am
d4362b7d: Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev
* commit '
d4362b7d356f1f33e1752be68c149b1cd95d8463':
Adding ability to add multiple keyguard widgets
Baligh Uddin [Mon, 29 Oct 2012 20:41:40 +0000 (13:41 -0700)]
am
ed49b6fc: am
b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
ed49b6fc39eeeae00218924e47a206720e365501':
Baligh Uddin [Mon, 29 Oct 2012 20:41:29 +0000 (13:41 -0700)]
am
e00f034e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
e00f034ec7badd18a7c4d3a36ed6bb6a0ab7438a':
Import translations. DO NOT MERGE
Amith Yamasani [Mon, 29 Oct 2012 20:39:30 +0000 (13:39 -0700)]
am
c250ae9d: am
5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
* commit '
c250ae9d712d7ba4b771ea8414876b9007a8da24':
Baligh Uddin [Mon, 29 Oct 2012 20:39:29 +0000 (13:39 -0700)]
am
06545e87: am
e508a26e: Remove blank translation string from en-GB, so it can show English.
* commit '
06545e87b5db25abcdb5790c082fca894db9d664':
Baligh Uddin [Mon, 29 Oct 2012 20:39:28 +0000 (13:39 -0700)]
am
a7489954: am
50ab4b47: Merge "Manually enter translations for msgid:
9014073093293520112" into jb-mr1-dev
* commit '
a7489954019f0d451e0f63b8c39a6e06a9f83002':
Russell Brenner [Mon, 29 Oct 2012 20:39:26 +0000 (13:39 -0700)]
am
98f884b1: am
26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
* commit '
98f884b19575e65702286820be58959c12f59815':
Daniel Sandler [Mon, 29 Oct 2012 20:39:25 +0000 (13:39 -0700)]
am
25608dd1: am
769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
* commit '
25608dd1a1fb03ed0b25eeb5966175dc6c620caa':
Amith Yamasani [Mon, 29 Oct 2012 20:39:24 +0000 (13:39 -0700)]
am
7ff9d5e1: am
b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
* commit '
7ff9d5e100eb9a730c6f390eef04b6172e9d4288':
Baligh Uddin [Mon, 29 Oct 2012 20:39:23 +0000 (13:39 -0700)]
am
5fb549bf: am
a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
5fb549bf5f21cb240b4af35779e291d5d48f0109':
Baligh Uddin [Mon, 29 Oct 2012 20:39:21 +0000 (13:39 -0700)]
am
350ea07c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
350ea07ca8e650bf167491deefdb421a183bbedd':
Import translations. DO NOT MERGE
Guang Zhu [Mon, 29 Oct 2012 20:36:43 +0000 (13:36 -0700)]
am
09a728a2: am
a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
* commit '
09a728a2a919f5ec0c1bad9d3953f4bdc4bf52c2':
Russell Brenner [Mon, 29 Oct 2012 20:36:42 +0000 (13:36 -0700)]
am
3fd05c88: am
56a166e9: Added info about why Wi-Fi is required
* commit '
3fd05c8853d67b273096dbbb7df6666273829ed5':
John Spurlock [Mon, 29 Oct 2012 20:36:41 +0000 (13:36 -0700)]
am
5586afe0: am
d983e1d1: Settings: Use new shared dream setting defaults.
* commit '
5586afe0eb5b4d6fba04f76d2a589164c526614f':
Jeff Sharkey [Mon, 29 Oct 2012 20:36:40 +0000 (13:36 -0700)]
am
9d0fbd72: am
5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev
* commit '
9d0fbd728e93de2b6b08a68d5843f47d180e46e8':
Romain Guy [Mon, 29 Oct 2012 20:36:38 +0000 (13:36 -0700)]
am
7caa7515: am
8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev
* commit '
7caa7515f8673d9516620d2a5147be9e2233f1bb':
Zhihai Xu [Mon, 29 Oct 2012 20:36:37 +0000 (13:36 -0700)]
am
ac8cfd0b: am
8346107d: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
* commit '
ac8cfd0b9c4814e286e5147f90b80d295380a4a7':
Daniel Sandler [Mon, 29 Oct 2012 20:36:36 +0000 (13:36 -0700)]
am
8b6036c3: am
deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev
* commit '
8b6036c3fb4ebaf63026c658fb6871e4f11ed070':
Fabrice Di Meglio [Mon, 29 Oct 2012 20:36:35 +0000 (13:36 -0700)]
am
17edbf38: am
c14d1134: Merge "Fix bug #
7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )" into jb-mr1-dev
* commit '
17edbf38d7d4efe2ca6526d1538136f4cd116509':
Baligh Uddin [Mon, 29 Oct 2012 20:36:33 +0000 (13:36 -0700)]
am
67a54eaa: (-s ours) am
f6d4b290: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
67a54eaa812f1904c8e6dc17cc0888d252b53d3f':
Brian Muramatsu [Mon, 29 Oct 2012 20:35:02 +0000 (13:35 -0700)]
am
0bfd02b0: am
c30a6712: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev
* commit '
0bfd02b05e1753703459bb2fdb3f9857a8b17d0d':
John Huang [Mon, 29 Oct 2012 20:34:57 +0000 (13:34 -0700)]
am
ff11f09a: am
50023033: Merge "Revert "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)"" into jb-mr1-dev
* commit '
ff11f09af0fbfd0c42644cb6e262c29920d6ee5d':
Casey Burkhardt [Mon, 29 Oct 2012 20:34:55 +0000 (13:34 -0700)]
am
7367bb2a: am
91ecf27a: Correcting content description in Wifi network selection activity. Bug:
7362208
* commit '
7367bb2a3118d8eb4cabc52883ec396a6b019e25':
Zhihai Xu [Mon, 29 Oct 2012 20:34:54 +0000 (13:34 -0700)]
am
57569b40: am
6ec44ff0: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
* commit '
57569b4080f4987548915b29daf021d3bb2cbb7b':
Amith Yamasani [Mon, 29 Oct 2012 20:34:53 +0000 (13:34 -0700)]
Michael Jurka [Mon, 29 Oct 2012 20:34:52 +0000 (13:34 -0700)]
am
eabe82d0: am
7d078f94: Fix crash when viewing installed app details page
* commit '
eabe82d032ee8a3668046792cb6743fec4181d58':
Baligh Uddin [Mon, 29 Oct 2012 20:34:50 +0000 (13:34 -0700)]
am
3441d4ac: (-s ours) am
8e3f8d3a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
3441d4ac6a2368d56c2d88a65a36da414bd53a24':
Baligh Uddin [Sun, 28 Oct 2012 19:42:08 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ida5a2fe0251fde7f8ad846aa94564a5be6c5fe0b
Auto-generated-cl: translation import
Baligh Uddin [Sun, 28 Oct 2012 19:40:31 +0000 (12:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I55019ba1b073d0d11ac5faed3830207e2066b7e8
Auto-generated-cl: translation import
Eric Laurent [Sat, 27 Oct 2012 21:43:39 +0000 (14:43 -0700)]
Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev
Eric Laurent [Sat, 27 Oct 2012 01:55:16 +0000 (18:55 -0700)]
added dock audio settings for non bluetooth docks
This is a quick implementation allowing support for non bluetooth
audio docks.
Longer term it would be better to generalize DockService to support
all kinds of docks.
Bug
7302106.
Change-Id: I2df31ddbd8057a7297b244ea6a9e2d5a6a39bf7f
Daniel Sandler [Fri, 26 Oct 2012 12:47:32 +0000 (05:47 -0700)]
am
4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev
* commit '
4cf289ad4d2d4f6ef0950b8542f53366f7e6f923':
Wording change for Daydream setting
Daniel Sandler [Fri, 26 Oct 2012 12:46:14 +0000 (05:46 -0700)]
am
4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev
* commit '
4cf289ad4d2d4f6ef0950b8542f53366f7e6f923':
Wording change for Daydream setting
Daniel Sandler [Fri, 26 Oct 2012 11:46:13 +0000 (04:46 -0700)]
Merge "Wording change for Daydream setting" into jb-mr1-dev
Michael Jurka [Thu, 25 Oct 2012 23:05:10 +0000 (16:05 -0700)]
Add ability to add clock widget to keyguard
Change-Id: I70e6fbb664181efc2906ed33d732695279462a95
Baligh Uddin [Thu, 25 Oct 2012 17:41:18 +0000 (10:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie1bf43d9ee2b5a3008e0d1be25329fc56ed633af
Auto-generated-cl: translation import
Amith Yamasani [Thu, 25 Oct 2012 05:48:41 +0000 (22:48 -0700)]
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
Amith Yamasani [Thu, 25 Oct 2012 05:48:39 +0000 (22:48 -0700)]
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
Amith Yamasani [Thu, 25 Oct 2012 05:47:17 +0000 (22:47 -0700)]
Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
Daniel Sandler [Thu, 25 Oct 2012 03:34:28 +0000 (23:34 -0400)]
Wording change for Daydream setting
Bug:
7410881
Change-Id: I5970254f2ffc33ab34fa61c08acaf1564e2556ca
Michael Jurka [Thu, 25 Oct 2012 01:28:27 +0000 (18:28 -0700)]
Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev
Michael Jurka [Wed, 24 Oct 2012 19:26:41 +0000 (12:26 -0700)]
Adding ability to add multiple keyguard widgets
Bug:
7381803
Change-Id: I099f47a5cc43199635fed9ad2c4d03d79004e4f4
Baligh Uddin [Thu, 25 Oct 2012 00:33:36 +0000 (17:33 -0700)]
am
b8a97822: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
b8a9782221c27646ade69141e09a4faa3473422e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 25 Oct 2012 00:33:28 +0000 (17:33 -0700)]
am
b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
b8a9782221c27646ade69141e09a4faa3473422e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 25 Oct 2012 00:32:33 +0000 (17:32 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Thu, 25 Oct 2012 00:31:11 +0000 (17:31 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 25 Oct 2012 00:30:16 +0000 (17:30 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Wed, 24 Oct 2012 23:19:55 +0000 (16:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5e09f5b9727a8c8121eb2243bc519b99eb313903
Auto-generated-cl: translation import
Baligh Uddin [Wed, 24 Oct 2012 23:15:53 +0000 (16:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5a5f54816579e0aef799b0a695bae71deb69eb69
Auto-generated-cl: translation import
Baligh Uddin [Wed, 24 Oct 2012 23:12:21 +0000 (16:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I650b82d0cfbb0b54f90e6932a09ad576216005eb
Auto-generated-cl: translation import
Amith Yamasani [Wed, 24 Oct 2012 17:27:05 +0000 (10:27 -0700)]
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
Amith Yamasani [Wed, 24 Oct 2012 20:29:28 +0000 (13:29 -0700)]
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.
Amith Yamasani [Wed, 24 Oct 2012 20:29:28 +0000 (13:29 -0700)]
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.
Amith Yamasani [Wed, 24 Oct 2012 20:26:38 +0000 (13:26 -0700)]
Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
Amith Yamasani [Tue, 23 Oct 2012 22:36:16 +0000 (15:36 -0700)]
Use given name instead of full name for the initial population of User name.
Bug:
7406217
Change-Id: I5006039ef146369f569445d0fcbaf82fd163343e
Baligh Uddin [Tue, 23 Oct 2012 22:18:03 +0000 (15:18 -0700)]
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.
Baligh Uddin [Tue, 23 Oct 2012 22:17:59 +0000 (15:17 -0700)]
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.
Baligh Uddin [Tue, 23 Oct 2012 20:25:55 +0000 (13:25 -0700)]
Remove blank translation string from en-GB, so it can show English.
Change-Id: I124abc4113f38b8fbd3ff164af5f0d47970f5471
Baligh Uddin [Tue, 23 Oct 2012 18:24:40 +0000 (11:24 -0700)]
am
50ab4b47: Merge "Manually enter translations for msgid:
9014073093293520112" into jb-mr1-dev
* commit '
50ab4b47bc776c257c1491cb4a68ee8afc5599e5':
Manually enter translations for msgid:
9014073093293520112
Baligh Uddin [Tue, 23 Oct 2012 18:24:13 +0000 (11:24 -0700)]
am
50ab4b47: Merge "Manually enter translations for msgid:
9014073093293520112" into jb-mr1-dev
* commit '
50ab4b47bc776c257c1491cb4a68ee8afc5599e5':
Manually enter translations for msgid:
9014073093293520112
Baligh Uddin [Tue, 23 Oct 2012 18:22:38 +0000 (11:22 -0700)]
Merge "Manually enter translations for msgid:
9014073093293520112" into jb-mr1-dev
Russell Brenner [Tue, 23 Oct 2012 18:02:59 +0000 (11:02 -0700)]
am
26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
* commit '
26bb2398cf8ebe1879adfb3043709467474858ec':
Fix layout with no access points
Russell Brenner [Tue, 23 Oct 2012 18:02:22 +0000 (11:02 -0700)]
am
26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
* commit '
26bb2398cf8ebe1879adfb3043709467474858ec':
Fix layout with no access points
Baligh Uddin [Mon, 22 Oct 2012 21:42:21 +0000 (14:42 -0700)]
Manually enter translations for msgid:
9014073093293520112
Per discussion with Maarten / pbrady, enter empty string for
untranslated languages.
Bug:
7383934
Change-Id: I0faa661820e1cb39603327f8d7d748535249e75d
Russell Brenner [Tue, 23 Oct 2012 18:00:00 +0000 (11:00 -0700)]
Merge "Fix layout with no access points" into jb-mr1-dev
Russell Brenner [Tue, 23 Oct 2012 17:45:03 +0000 (10:45 -0700)]
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
Daniel Sandler [Tue, 23 Oct 2012 15:17:28 +0000 (08:17 -0700)]
am
769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
* commit '
769b4711c94cc9093012e51e0101659d712b99ee':
Dreams/Sleep Mode is now Daydreams.
Daniel Sandler [Tue, 23 Oct 2012 15:17:17 +0000 (08:17 -0700)]
am
769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
* commit '
769b4711c94cc9093012e51e0101659d712b99ee':
Dreams/Sleep Mode is now Daydreams.
Daniel Sandler [Tue, 23 Oct 2012 15:15:47 +0000 (08:15 -0700)]
Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
Daniel Sandler [Tue, 23 Oct 2012 05:22:36 +0000 (01:22 -0400)]
Dreams/Sleep Mode is now Daydreams.
Bug:
7395321
Change-Id: Ifac4eca70e83c8b90e0cd2d16809dd117e279790
Amith Yamasani [Tue, 23 Oct 2012 00:59:11 +0000 (17:59 -0700)]
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
Amith Yamasani [Tue, 23 Oct 2012 00:59:10 +0000 (17:59 -0700)]
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
Amith Yamasani [Tue, 23 Oct 2012 00:56:54 +0000 (17:56 -0700)]
Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
Amith Yamasani [Mon, 22 Oct 2012 23:38:02 +0000 (16:38 -0700)]
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
Baligh Uddin [Mon, 22 Oct 2012 21:01:54 +0000 (14:01 -0700)]
am
a7acb166: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
a7acb166b282e3aa178eb1f6d1c8ece877d2c64d':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Oct 2012 21:01:14 +0000 (14:01 -0700)]
am
a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
a7acb166b282e3aa178eb1f6d1c8ece877d2c64d':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Oct 2012 20:59:28 +0000 (13:59 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Mon, 22 Oct 2012 20:58:38 +0000 (13:58 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 22 Oct 2012 20:58:21 +0000 (13:58 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Mon, 22 Oct 2012 19:11:35 +0000 (12:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8c6dd26846136e2c70a725bddde0bf26e44b1509
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Oct 2012 19:09:26 +0000 (12:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia49c8378454cc2af782efffce6aa70c60568f3fd
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Oct 2012 19:07:22 +0000 (12:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I94a7973ca3611509deb3847b4bc211196f12ca30
Auto-generated-cl: translation import
Guang Zhu [Mon, 22 Oct 2012 18:53:23 +0000 (11:53 -0700)]
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
Guang Zhu [Mon, 22 Oct 2012 18:53:22 +0000 (11:53 -0700)]
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
Guang Zhu [Mon, 22 Oct 2012 18:50:38 +0000 (11:50 -0700)]
Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
Guang Zhu [Sat, 20 Oct 2012 00:55:05 +0000 (17:55 -0700)]
Prevent sync state changes when user is a monkey
Bug:
7385019
Change-Id: Icf305683e57b83b3260f2587ae0a3d1a6dc3c21d
Russell Brenner [Sun, 21 Oct 2012 15:05:17 +0000 (08:05 -0700)]
am
56a166e9: Added info about why Wi-Fi is required
* commit '
56a166e9e3cac96246bd724ceea96846fc9e41e1':
Added info about why Wi-Fi is required
Russell Brenner [Sun, 21 Oct 2012 15:05:12 +0000 (08:05 -0700)]
am
56a166e9: Added info about why Wi-Fi is required
* commit '
56a166e9e3cac96246bd724ceea96846fc9e41e1':
Added info about why Wi-Fi is required
Russell Brenner [Sat, 20 Oct 2012 01:55:14 +0000 (18:55 -0700)]
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
John Spurlock [Fri, 19 Oct 2012 18:06:26 +0000 (11:06 -0700)]
am
d983e1d1: Settings: Use new shared dream setting defaults.
* commit '
d983e1d1a52af2ab85d10f1a15c8387a6b6a3ba9':
Settings: Use new shared dream setting defaults.
John Spurlock [Fri, 19 Oct 2012 18:05:49 +0000 (11:05 -0700)]
am
d983e1d1: Settings: Use new shared dream setting defaults.
* commit '
d983e1d1a52af2ab85d10f1a15c8387a6b6a3ba9':
Settings: Use new shared dream setting defaults.
John Spurlock [Thu, 18 Oct 2012 20:41:09 +0000 (16:41 -0400)]
Settings: Use new shared dream setting defaults.
Bug:
7373284
Change-Id: I12d00b45d0bada5207af3a7bda906370e7a87413
Jeff Sharkey [Fri, 19 Oct 2012 06:26:08 +0000 (23:26 -0700)]
am
5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev
* commit '
5a740ab1b9d5757d684f6a798932f0b4729cc9a7':
More migration to Global settings.
Jeff Sharkey [Fri, 19 Oct 2012 06:25:23 +0000 (23:25 -0700)]
am
5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev
* commit '
5a740ab1b9d5757d684f6a798932f0b4729cc9a7':
More migration to Global settings.
Jeff Sharkey [Fri, 19 Oct 2012 06:23:07 +0000 (23:23 -0700)]
Merge "More migration to Global settings." into jb-mr1-dev