Eric Laurent
5ff77a01b6
am 539d7c66: am 65b9944f: am 79b7fdd2: Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev
...
* commit '539d7c66d624107816c62184ebd6eaede3715ac5':
added dock audio settings for non bluetooth docks
2012-10-29 17:15:51 -07:00
Jeff Sharkey
92fe12e657
am ea6f5051: am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
...
* commit 'ea6f50515620c4ab5abefeca8431505b05db9672':
Selectively enable bugreport in power menu.
2012-10-29 16:38:52 -07:00
Jeff Sharkey
58e97bf41f
am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
...
* commit 'c2c9d5bde11113d3fc86f1ea25b41e7446e3d833':
Selectively enable bugreport in power menu.
2012-10-29 16:37:17 -07:00
Jeff Sharkey
ea6f505156
am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
...
* commit 'c2c9d5bde11113d3fc86f1ea25b41e7446e3d833':
Selectively enable bugreport in power menu.
2012-10-29 16:36:38 -07: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
939d0f1d72
am 5ba8c670: am 2e0679ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '5ba8c670a95dc54f3d384c91a2719a06c706d4ce':
Import translations. DO NOT MERGE
2012-10-29 15:28:01 -07:00
Vikram Aggarwal
09b3127aad
am 9ad7e7e3: am 8d028a87: Allow wireless charging during encrypt
...
* commit '9ad7e7e3dabc0c0125f1373164857e8782e443dd':
Allow wireless charging during encrypt
2012-10-29 15:28:00 -07:00
Baligh Uddin
5ba8c670a9
am 2e0679ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '2e0679ed54cda79fa3f5ae6f75fb2a71aeb40f54':
Import translations. DO NOT MERGE
2012-10-29 15:25:25 -07:00
Vikram Aggarwal
9ad7e7e3da
am 8d028a87: Allow wireless charging during encrypt
...
* commit '8d028a87e97f9420f9db31a6b8aa80859fe393b3':
Allow wireless charging during encrypt
2012-10-29 15:25:19 -07:00
Baligh Uddin
a2018c946f
am 8ae40a07: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '8ae40a07a4b8d9c9ccd73a6eba5ac62be3b8b5ef':
Import translations. DO NOT MERGE
2012-10-29 15:22:57 -07:00
Baligh Uddin
d1d9e35045
am 2e0679ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '2e0679ed54cda79fa3f5ae6f75fb2a71aeb40f54':
Import translations. DO NOT MERGE
2012-10-29 15:22:47 -07:00
Baligh Uddin
feb3d4524d
Merge "Import translations. DO NOT MERGE"
2012-10-29 15:21:08 -07:00
Baligh Uddin
eb70ca293a
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-10-29 15:20:30 -07:00
Baligh Uddin
2e0679ed54
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-29 15:19:59 -07:00
Baligh Uddin
8ae40a07a4
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-29 15:19:34 -07:00
Vikram Aggarwal
ee2840231c
am 8d028a87: Allow wireless charging during encrypt
...
* commit '8d028a87e97f9420f9db31a6b8aa80859fe393b3':
Allow wireless charging during encrypt
2012-10-29 15:14:23 -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
ef9e820307
am dd165551: am e42e7b85: Import translations. DO NOT MERGE
...
* commit 'dd16555147ec31734b755312d954342d02621587':
Import translations. DO NOT MERGE
2012-10-29 14:31:31 -07:00
Eric Laurent
539d7c66d6
am 65b9944f: am 79b7fdd2: Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev
...
* commit '65b9944f5c330f0d623a7fb059566eda942c7045':
added dock audio settings for non bluetooth docks
2012-10-29 14:31:30 -07:00
Baligh Uddin
dd16555147
am e42e7b85: Import translations. DO NOT MERGE
...
* commit 'e42e7b85285963cd959cec701689deaefbe44898':
Import translations. DO NOT MERGE
2012-10-29 14:12:10 -07:00
Eric Laurent
65b9944f5c
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
2012-10-29 14:02:27 -07:00
Daniel Sandler
868d5b9dee
am d18a9238: am 586ba830: am 381df27c: am 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev
...
* commit 'd18a923873e6e77bde8226ea80bac7052c4a92ef':
2012-10-29 13:54:55 -07:00
Michael Jurka
3806e84bcf
am f2aa0fff: am 87e7c274: am 8a4024ec: Add ability to add clock widget to keyguard
...
* commit 'f2aa0fff88bc5801d107effbfb319593c6bd7a11':
Add ability to add clock widget to keyguard
2012-10-29 13:54:54 -07:00
Amith Yamasani
4679b85707
am b7babc9e: am a1e3586a: am 67920f06: am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
...
* commit 'b7babc9ec96a90b589ca7026237f39d55b43d4da':
2012-10-29 13:54:53 -07:00
Michael Jurka
9d56e71dca
am 3b71b1ea: am 6576e1a7: am d4362b7d: Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev
...
* commit '3b71b1ea96759c21d85de9086281bb2901817c4e':
Adding ability to add multiple keyguard widgets
2012-10-29 13:54:51 -07:00
Baligh Uddin
bc523ae9f0
am b83b6f93: (-s ours) am 38ff9890: am ed49b6fc: am b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'b83b6f932c751c0b68f4958e5f6afb76bf7c4540':
2012-10-29 13:54:50 -07:00
Baligh Uddin
3d10864187
am 013987c7: (-s ours) am 0c31e078: am e00f034e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '013987c717291f948f074c05da02bfcfb2a14cec':
Import translations. DO NOT MERGE
2012-10-29 13:54:49 -07:00
Amith Yamasani
b54ea799f7
am 5e43f792: am b14659eb: am c250ae9d: am 5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
...
* commit '5e43f792c43e92794c9e669e434b8f7d8117cd98':
2012-10-29 13:52:12 -07:00
Baligh Uddin
d70ad843b1
am 5facff2c: am 434b9c4f: am 06545e87: am e508a26e: Remove blank translation string from en-GB, so it can show English.
...
* commit '5facff2cfe65eb1dd6020a82d4aedcab73ac43db':
2012-10-29 13:52:11 -07:00
Baligh Uddin
ef7755fa67
am 90293772: am f6932aeb: am a7489954: am 50ab4b47: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev
...
* commit '90293772e77f16ff0c0ca7300781ba89493a3cff':
2012-10-29 13:52:10 -07:00
Russell Brenner
64075913be
am e456e557: am c0b22b0a: am 98f884b1: am 26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
...
* commit 'e456e5577d29b7744850d1d3d35a1229fa993626':
2012-10-29 13:52:09 -07:00
Daniel Sandler
d8f9792f54
am 16d7f777: am 96fcd6bb: am 25608dd1: am 769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
...
* commit '16d7f7770cb16913633534b9a69eaa8b19e7696c':
2012-10-29 13:52:08 -07:00
Daniel Sandler
d18a923873
am 586ba830: am 381df27c: am 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev
...
* commit '586ba830bc4fe4b8617564dac3afb71d78bdb713':
2012-10-29 13:52:06 -07:00
Amith Yamasani
0e38e361c6
am 15d10744: am d379946b: am 7ff9d5e1: am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
...
* commit '15d107441c05abc3e847fa0c270f2d6418f984e2':
2012-10-29 13:52:06 -07:00
Michael Jurka
f2aa0fff88
am 87e7c274: am 8a4024ec: Add ability to add clock widget to keyguard
...
* commit '87e7c274f26b078ddc7bcab783cecbcc0251c86b':
Add ability to add clock widget to keyguard
2012-10-29 13:52:04 -07:00
Baligh Uddin
082cbe2080
am 6de2c973: (-s ours) am 27c1348b: am 5fb549bf: am a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '6de2c97369c9cdc4661ef3d5029689d63ad2b8c5':
2012-10-29 13:52:04 -07:00
Amith Yamasani
b7babc9ec9
am a1e3586a: am 67920f06: am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
...
* commit 'a1e3586a96de17f2a23b5e7bb9e7fff65d6ded3b':
2012-10-29 13:52:03 -07:00
Baligh Uddin
fef0612c7c
am 1013f910: (-s ours) am aee2ef0a: am 350ea07c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '1013f910cdb66190b91b3b28fb3a4b251c9287e8':
Import translations. DO NOT MERGE
2012-10-29 13:52:03 -07:00
Michael Jurka
3b71b1ea96
am 6576e1a7: am d4362b7d: Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev
...
* commit '6576e1a778c38039d7a4609f72fe892b8f70e2c7':
Adding ability to add multiple keyguard widgets
2012-10-29 13:51:59 -07:00
Baligh Uddin
b83b6f932c
am 38ff9890: am ed49b6fc: am b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '38ff9890ba9b165657562534d402a454d1d0efd3':
2012-10-29 13:51:57 -07:00
Baligh Uddin
013987c717
am 0c31e078: am e00f034e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '0c31e078d6a8337e002b084769caa94c199fe10f':
Import translations. DO NOT MERGE
2012-10-29 13:51:55 -07:00
Guang Zhu
2ca38ac0a3
am 1d53e5da: am bb15cfbd: am 09a728a2: am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
...
* commit '1d53e5da8097438c23dbf16f1ab74409e9c90135':
2012-10-29 13:46:13 -07:00
Russell Brenner
400cf4f5c3
am 14f54f88: am 1a15dcb1: am 3fd05c88: am 56a166e9: Added info about why Wi-Fi is required
...
* commit '14f54f88257c08a6932eba0b781b89468fa3632d':
2012-10-29 13:46:12 -07:00
John Spurlock
5d499c036e
am b942b3ef: am 7c9b067b: am 5586afe0: am d983e1d1: Settings: Use new shared dream setting defaults.
...
* commit 'b942b3ef256a36e92c0bcae2d10e943541ca61eb':
2012-10-29 13:46:10 -07:00
Jeff Sharkey
a5b0b1a9f6
am 0996fc88: am 717ad24a: am 9d0fbd72: am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev
...
* commit '0996fc889372543bc0f0fc80df7d56dfae681ec5':
2012-10-29 13:46:09 -07:00
Romain Guy
a05ef444ab
am e2d1799c: am 4d92c702: am 7caa7515: am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev
...
* commit 'e2d1799cd0b99962e1bac4fd22126b922ff667ed':
2012-10-29 13:46:08 -07:00
Zhihai Xu
b47fdd9dac
am a086ff47: am 79cc26f2: 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 'a086ff471e8d830f43f3bc69968a13b2da5973cd':
2012-10-29 13:46:07 -07:00
Daniel Sandler
9e61b6c48b
am 33d4c1a3: am 653e5f9b: am 8b6036c3: am deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev
...
* commit '33d4c1a313357fde783c555b4058801ec04a2f43':
2012-10-29 13:46:05 -07:00
Fabrice Di Meglio
291f8128ba
am 2fad38ec: am c5f7937e: 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 '2fad38ec27036c0a9827700d3b0521e4d80f2e95':
2012-10-29 13:46:04 -07:00
Baligh Uddin
9a438f035b
am d6f00550: (-s ours) am c2e65ef3: am 67a54eaa: (-s ours) am f6d4b290: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'd6f005501b38b437b421df584ee00d9b7bbcb678':
2012-10-29 13:46:03 -07:00
