Amith Yamasani
a1e3586a96
am 67920f06
: am b02771ef
: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
...
* commit '67920f0639681cb5e5bc193688e4fc1c7419c872':
2012-10-29 13:41:58 -07:00
Michael Jurka
6576e1a778
am d4362b7d
: Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev
...
* commit 'd4362b7d356f1f33e1752be68c149b1cd95d8463':
Adding ability to add multiple keyguard widgets
2012-10-29 13:41:52 -07:00
Baligh Uddin
38ff9890ba
am ed49b6fc
: am b8a97822
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'ed49b6fc39eeeae00218924e47a206720e365501':
2012-10-29 13:41:40 -07:00
Baligh Uddin
0c31e078d6
am e00f034e
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit 'e00f034ec7badd18a7c4d3a36ed6bb6a0ab7438a':
Import translations. DO NOT MERGE
2012-10-29 13:41:29 -07:00
Amith Yamasani
b14659eb1a
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':
2012-10-29 13:39:30 -07:00
Baligh Uddin
434b9c4ff7
am 06545e87
: am e508a26e
: Remove blank translation string from en-GB, so it can show English.
...
* commit '06545e87b5db25abcdb5790c082fca894db9d664':
2012-10-29 13:39:29 -07:00
Baligh Uddin
f6932aebd4
am a7489954
: am 50ab4b47
: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev
...
* commit 'a7489954019f0d451e0f63b8c39a6e06a9f83002':
2012-10-29 13:39:28 -07:00
Russell Brenner
c0b22b0a35
am 98f884b1
: am 26bb2398
: Merge "Fix layout with no access points" into jb-mr1-dev
...
* commit '98f884b19575e65702286820be58959c12f59815':
2012-10-29 13:39:26 -07:00
Daniel Sandler
96fcd6bb3d
am 25608dd1
: am 769b4711
: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
...
* commit '25608dd1a1fb03ed0b25eeb5966175dc6c620caa':
2012-10-29 13:39:25 -07:00
Amith Yamasani
d379946bca
am 7ff9d5e1
: am b80b8bb2
: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
...
* commit '7ff9d5e100eb9a730c6f390eef04b6172e9d4288':
2012-10-29 13:39:24 -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
3e41884765
Import translations. DO NOT MERGE
...
Change-Id: I55019ba1b073d0d11ac5faed3830207e2066b7e8
Auto-generated-cl: translation import
2012-10-28 12:40:31 -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
103f74b55f
Import translations. DO NOT MERGE
...
Change-Id: Ie1bf43d9ee2b5a3008e0d1be25329fc56ed633af
Auto-generated-cl: translation import
2012-10-25 10:41: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
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
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
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
cf24fc5695
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-24 17:30:17 -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
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
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
039a365f96
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