Baligh Uddin
5f5f37b21f
am 391dc9f7: am 3441d4ac: (-s ours) am 8e3f8d3a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '391dc9f798a0b0314c0355a6347d38b8e2e8972e':
2012-10-29 13:39:23 -07:00
Baligh Uddin
27c1348b43
am 5fb549bf: am a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '5fb549bf5f21cb240b4af35779e291d5d48f0109':
2012-10-29 13:39:23 -07:00
Baligh Uddin
aee2ef0a84
am 350ea07c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '350ea07ca8e650bf167491deefdb421a183bbedd':
Import translations. DO NOT MERGE
2012-10-29 13:39:21 -07:00
Guang Zhu
bb15cfbd11
am 09a728a2: am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
...
* commit '09a728a2a919f5ec0c1bad9d3953f4bdc4bf52c2':
2012-10-29 13:36:43 -07:00
Russell Brenner
1a15dcb1a2
am 3fd05c88: am 56a166e9: Added info about why Wi-Fi is required
...
* commit '3fd05c8853d67b273096dbbb7df6666273829ed5':
2012-10-29 13:36:42 -07:00
John Spurlock
7c9b067bb1
am 5586afe0: am d983e1d1: Settings: Use new shared dream setting defaults.
...
* commit '5586afe0eb5b4d6fba04f76d2a589164c526614f':
2012-10-29 13:36:41 -07:00
Jeff Sharkey
717ad24a82
am 9d0fbd72: am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev
...
* commit '9d0fbd728e93de2b6b08a68d5843f47d180e46e8':
2012-10-29 13:36:40 -07:00
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
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
6e16e83326
Import translations. DO NOT MERGE
...
Change-Id: I949227b4d696debe2a5ab01cf76960f352c48e4a
Auto-generated-cl: translation import
2012-10-28 12:46: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
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
4cf289ad4d
Merge "Wording change for Daydream setting" into jb-mr1-dev
2012-10-26 04:46:14 -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
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
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
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
Baligh Uddin
ee398a5f25
am cf24fc56: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'cf24fc5695e0e58238001a4b0eeee594e4f6df0b':
Import translations. DO NOT MERGE
2012-10-24 17:33:41 -07:00
Baligh Uddin
5379dc64b2
am b8a97822: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'b8a9782221c27646ade69141e09a4faa3473422e':
Import translations. DO NOT MERGE
2012-10-24 17:33:36 -07:00
Baligh Uddin
ead856d16b
Merge "Import translations. DO NOT MERGE"
2012-10-24 17:33:30 -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
cf24fc5695
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-24 17:30:17 -07:00
Baligh Uddin
074602024c
Import translations. DO NOT MERGE
...
Change-Id: Ic1270093a7d32d9f4ff80381a68d8e3fd9570d1f
Auto-generated-cl: translation import
2012-10-24 16:27:14 -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
Baligh Uddin
fa00ff0099
Import translations. DO NOT MERGE
...
Change-Id: I650b82d0cfbb0b54f90e6932a09ad576216005eb
Auto-generated-cl: translation import
2012-10-24 16:12:21 -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
5faee7d432
am d525470d: am 039a365f: am 5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
...
* commit 'd525470d4b7a290b7a55ee244d47f8e486cfe72c':
Use given name instead of full name for the initial population of User name.
2012-10-24 13:35:02 -07:00
Amith Yamasani
d525470d4b
am 039a365f: am 5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
...
* commit '039a365f961a69845438c22cc4c3a560bc82ed3f':
Use given name instead of full name for the initial population of User name.
2012-10-24 13:32:04 -07:00