Romain Guy
4d92c702b5
am 7caa7515
: am 8b982465
: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev
...
* commit '7caa7515f8673d9516620d2a5147be9e2233f1bb':
2012-10-29 13:36:38 -07:00
Zhihai Xu
79cc26f24c
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':
2012-10-29 13:36:37 -07:00
Daniel Sandler
653e5f9bc8
am 8b6036c3
: am deb5a843
: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev
...
* commit '8b6036c3fb4ebaf63026c658fb6871e4f11ed070':
2012-10-29 13:36:36 -07:00
Fabrice Di Meglio
c5f7937e06
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':
2012-10-29 13:36:35 -07:00
Baligh Uddin
c2e65ef38e
am 67a54eaa
: (-s ours) am f6d4b290
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '67a54eaa812f1904c8e6dc17cc0888d252b53d3f':
2012-10-29 13:36:33 -07:00
Brian Muramatsu
e447debbd8
am 0bfd02b0
: am c30a6712
: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev
...
* commit '0bfd02b05e1753703459bb2fdb3f9857a8b17d0d':
2012-10-29 13:35:02 -07:00
John Huang
2a43340ddb
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':
2012-10-29 13:34:57 -07:00
Casey Burkhardt
af8b915f9c
am 7367bb2a
: am 91ecf27a
: Correcting content description in Wifi network selection activity. Bug: 7362208
...
* commit '7367bb2a3118d8eb4cabc52883ec396a6b019e25':
2012-10-29 13:34:55 -07:00
Zhihai Xu
b1571ad686
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':
2012-10-29 13:34:54 -07:00
Amith Yamasani
3ad17a0848
am 89e93c97
: am 7a1c4cdf
: Fix check for multiple users
...
* commit '89e93c97d5cbb9bace0d98862604e8330f32f5fb':
2012-10-29 13:34:53 -07:00
Michael Jurka
ed3e89abe5
am eabe82d0
: am 7d078f94
: Fix crash when viewing installed app details page
...
* commit 'eabe82d032ee8a3668046792cb6743fec4181d58':
2012-10-29 13:34:52 -07:00
Baligh Uddin
391dc9f798
am 3441d4ac
: (-s ours) am 8e3f8d3a
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '3441d4ac6a2368d56c2d88a65a36da414bd53a24':
2012-10-29 13:34:50 -07:00
Baligh Uddin
33ed3e0591
Import translations. DO NOT MERGE
...
Change-Id: Ifdee0ced0a57d8ccf512e12166ea1ec66418a6c2
Auto-generated-cl: translation import
2012-10-29 13:31:03 -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
Baligh Uddin
d285188d24
Import translations. DO NOT MERGE
...
Change-Id: I93035479d7bf14c84ce3d39da4fca2dfdaadd9d6
Auto-generated-cl: translation import
2012-10-29 13:15:52 -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
The Android Automerger
ab7392b892
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-29 11:20:23 -07:00
Baligh Uddin
8abf422a75
am af70bb4c
: (-s ours) am 3e418847
: Import translations. DO NOT MERGE
...
* commit 'af70bb4c8296c290491b2cc48004fc28a91d2ae4':
Import translations. DO NOT MERGE
2012-10-29 07:47:05 -07:00
Baligh Uddin
af70bb4c82
am 3e418847
: Import translations. DO NOT MERGE
...
* commit '3e41884765347d7671e414c884901bafe70f225d':
Import translations. DO NOT MERGE
2012-10-29 07:44:33 -07:00
Przemyslaw Szczepaniak
03b9f86722
Alert for using network-only-tts with no network.
...
If TTS requires network for selected language, we will
show dialog informing why we can't synthesize an example
if user have no internet connectivity.
Bug: 7398316
Change-Id: I01b033a9a8b8538b322ed3639b671f90f849ae29
2012-10-29 04:48:38 -07:00
Baligh Uddin
910fe0479a
am e42e7b85
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e42e7b85285963cd959cec701689deaefbe44898':
Import translations. DO NOT MERGE
2012-10-28 18:36:02 -07:00
Baligh Uddin
6e16e83326
Import translations. DO NOT MERGE
...
Change-Id: I949227b4d696debe2a5ab01cf76960f352c48e4a
Auto-generated-cl: translation import
2012-10-28 12:46:08 -07:00
Baligh Uddin
9ad78e880f
Import translations. DO NOT MERGE
...
Change-Id: I60f85bd27cdf76663190767052c90db3c521848f
Auto-generated-cl: translation import
2012-10-28 12:43:44 -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
Baligh Uddin
3e41884765
Import translations. DO NOT MERGE
...
Change-Id: I55019ba1b073d0d11ac5faed3830207e2066b7e8
Auto-generated-cl: translation import
2012-10-28 12:40:31 -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
The Android Automerger
30d4f7d4a5
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-26 16:23:12 -07:00
Fábio Silva
b6676bb6a3
Changed the way that date format selector is shown.
...
Changed the way that date format selector is shown excluding ambiguity when day and month have same value.
- i.e. 01/01/2012 (mm-DD-YYYY) and 01/01/2012 (DD-mm-YYYY)
Now it displays 31/12/2012 for DD-mm-YYYY and 12/31/2012 for mm-DD-YYYY.
Change-Id: I27434c9d5713491950d4f345dccf65d647d399cf
2012-10-26 20:05:27 -03:00
Daniel Sandler
aa999084c5
am 4b84bd17
: am b9cc1faf
: am 4cf289ad
: Merge "Wording change for Daydream setting" into jb-mr1-dev
...
* commit '4b84bd17d78ece13ed39bfc493a851b2305cf5c7':
Wording change for Daydream setting
2012-10-26 05:52:25 -07:00
Daniel Sandler
4b84bd17d7
am b9cc1faf
: am 4cf289ad
: Merge "Wording change for Daydream setting" into jb-mr1-dev
...
* commit 'b9cc1faf129d1d583bd5c541fe2ab1526032d559':
Wording change for Daydream setting
2012-10-26 05:50:20 -07:00
Daniel Sandler
b9cc1faf12
am 4cf289ad
: Merge "Wording change for Daydream setting" into jb-mr1-dev
...
* commit '4cf289ad4d2d4f6ef0950b8542f53366f7e6f923':
Wording change for Daydream setting
2012-10-26 05:47:32 -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
The Android Automerger
1e02061961
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-25 13:42:45 -07:00
Baligh Uddin
dcbd81e098
am 4f4cae2b
: (-s ours) am 103f74b5
: Import translations. DO NOT MERGE
...
* commit '4f4cae2b11dd4b4caa03ee71d2ec321f3704de3e':
Import translations. DO NOT MERGE
2012-10-25 10:49:17 -07:00
Baligh Uddin
4f4cae2b11
am 103f74b5
: Import translations. DO NOT MERGE
...
* commit '103f74b55fe07b15c8e87c04e2a83cd4fabdf902':
Import translations. DO NOT MERGE
2012-10-25 10:46:33 -07:00
Baligh Uddin
103f74b55f
Import translations. DO NOT MERGE
...
Change-Id: Ie1bf43d9ee2b5a3008e0d1be25329fc56ed633af
Auto-generated-cl: translation import
2012-10-25 10:41:18 -07:00
Amith Yamasani
c9d4d31c98
am f1e74da7
: am cde507af
: am b02771ef
: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
...
* commit 'f1e74da7b6b6267d5ce1da432760552cc7ad8673':
Reduce jank in security lock selection by finishing on return
2012-10-24 22:54:16 -07:00
Amith Yamasani
f1e74da7b6
am cde507af
: am b02771ef
: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
...
* commit 'cde507af4c99ca9e411bd8f83eaba65262473b01':
Reduce jank in security lock selection by finishing on return
2012-10-24 22:51:18 -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
cde507af4c
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:39 -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
Baligh Uddin
b379708c28
am 3c42b19d
: (-s ours) am 5379dc64
: am b8a97822
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '3c42b19d342024ffb69b05c1cb44cc4fdc4230ed':
Import translations. DO NOT MERGE
2012-10-24 17:45:23 -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
3c42b19d34
am 5379dc64
: am b8a97822
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '5379dc64b216367b1be47d0a069900aebd8164c8':
Import translations. DO NOT MERGE
2012-10-24 17:40:22 -07:00
Baligh Uddin
49346db97f
am ee398a5f
: (-s ours) am cf24fc56
: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'ee398a5f259d7994013d8fa95bd627c52232fd39':
Import translations. DO NOT MERGE
2012-10-24 17:36:43 -07:00