Eric Laurent
f79daa9420
Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
2012-10-30 14:12:23 -07:00
Justin Ho
29c4c88be2
Merge "Whoops, missed a 'Sleep Mode' -> 'Daydream' string." into jb-mr1-dev
2012-10-30 11:16:45 -07:00
Eric Laurent
f892bc856c
display audio dialog when connecting low end dock
...
Display a dialog to enable the use of the dock audio connection
when a low end dock is connected for the first time.
Modify DockService to process docked and undocked messages even if
the device indicated is null (meaning the dock is not a bluetooth dock)
only for low end docks.
Bug 7302106.
Change-Id: I331d83a74fecf5f26b24bfc178342df414bd8153
2012-10-30 10:41:46 -07:00
Daniel Sandler
bcebe48f67
Whoops, missed a 'Sleep Mode' -> 'Daydream' string.
...
Change-Id: I7ed00811e2c31459aaa32336dba4ff75b095f5ef
2012-10-30 09:59:16 -04:00
Jeff Sharkey
c2c9d5bde1
Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
2012-10-29 16:35:08 -07:00
Baligh Uddin
2e0679ed54
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-29 15:19:59 -07:00
Jeff Sharkey
2817c46c04
Selectively enable bugreport in power menu.
...
The underlying bugreport init service depends on USB debugging being
turned on for user builds. This change makes the developer options
UI reflect this constraint.
Bug: 7427434
Change-Id: I8dc16cc53ec4a97a3b39ee631694456be3bde081
2012-10-29 14:57:41 -07:00
Baligh Uddin
fc66cb8386
Import translations. DO NOT MERGE
...
Change-Id: Iab4a9535ce1e86eb842f82bcbb9a7e689a168064
Auto-generated-cl: translation import
2012-10-29 13:24:42 -07:00
Vikram Aggarwal
8d028a87e9
Allow wireless charging during encrypt
...
Bug: 7426476 Cant Encrypt mako device using Charging pad as charging
source
Change-Id: I6584a9e7a1533e06f0b0d55c1afd42641ee7ac3d
2012-10-29 12:42:55 -07:00
Baligh Uddin
e42e7b8528
Import translations. DO NOT MERGE
...
Change-Id: Ida5a2fe0251fde7f8ad846aa94564a5be6c5fe0b
Auto-generated-cl: translation import
2012-10-28 12:42:08 -07:00
Eric Laurent
79b7fdd2c0
Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev
2012-10-27 14:43:39 -07:00
Eric Laurent
e00cd9ff60
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
2012-10-27 13:30:55 -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
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
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
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
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
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
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