Commit Graph

8848 Commits

Author SHA1 Message Date
Daniel Sandler
16d7f7770c am 96fcd6bb: am 25608dd1: am 769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
* commit '96fcd6bb3d07eeccd4a1105cfa9a2e32ddb523ca':
2012-10-29 13:41:59 -07:00
Amith Yamasani
15d107441c 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 'd379946bca8dd7cf91707698aa15f2a8b5514d03':
2012-10-29 13:41:58 -07:00
Baligh Uddin
6de2c97369 am 27c1348b: am 5fb549bf: am a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '27c1348b43125cf31e84ed93987989c6d37d5cb7':
2012-10-29 13:41:57 -07:00
Baligh Uddin
1013f910cd am aee2ef0a: am 350ea07c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit 'aee2ef0a848d8008eda92a0f1fbdcb65af0490ce':
  Import translations. DO NOT MERGE
2012-10-29 13:41:56 -07:00
Guang Zhu
1d53e5da80 am bb15cfbd: am 09a728a2: am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
* commit 'bb15cfbd112e729372e8b1a424d56cbdb34d5db5':
2012-10-29 13:39:42 -07:00
Russell Brenner
14f54f8825 am 1a15dcb1: am 3fd05c88: am 56a166e9: Added info about why Wi-Fi is required
* commit '1a15dcb1a2ae6116112e92a5638c30c1629c6729':
2012-10-29 13:39:41 -07:00
John Spurlock
b942b3ef25 am 7c9b067b: am 5586afe0: am d983e1d1: Settings: Use new shared dream setting defaults.
* commit '7c9b067bb165824dcc3917d11dc95a891374e6a8':
2012-10-29 13:39:40 -07:00
Jeff Sharkey
0996fc8893 am 717ad24a: am 9d0fbd72: am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev
* commit '717ad24a822c40044992743025e93664281136f4':
2012-10-29 13:39:39 -07:00
Romain Guy
e2d1799cd0 am 4d92c702: am 7caa7515: am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev
* commit '4d92c702b5561ed072a73227c898e41ebac6b44e':
2012-10-29 13:39:38 -07:00
Zhihai Xu
a086ff471e 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 '79cc26f24c57c699ca890f5bbf3362c740db4f4f':
2012-10-29 13:39:37 -07:00
Daniel Sandler
33d4c1a313 am 653e5f9b: am 8b6036c3: am deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev
* commit '653e5f9bc83148ba5452edb29fc576bac93fb89b':
2012-10-29 13:39:35 -07:00
Fabrice Di Meglio
2fad38ec27 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 'c5f7937e064ee7c125c2f91c5b3a934b7b15d4d3':
2012-10-29 13:39:33 -07:00
Baligh Uddin
d6f005501b am c2e65ef3: am 67a54eaa: (-s ours) am f6d4b290: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'c2e65ef38e3946625465477e88cb5a59d36e1618':
2012-10-29 13:39:32 -07:00
Brian Muramatsu
c3b4ff2a05 am e447debb: am 0bfd02b0: am c30a6712: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev
* commit 'e447debbd8f071a01d32d782aac2e02140c32572':
2012-10-29 13:39:30 -07:00
John Huang
5224bbdf5b am 2a43340d: 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 '2a43340ddb42ee3913235fcb9ddfd7ea33b6c085':
2012-10-29 13:39:29 -07:00
Casey Burkhardt
d3a3bfd598 am af8b915f: am 7367bb2a: am 91ecf27a: Correcting content description in Wifi network selection activity. Bug: 7362208
* commit 'af8b915f9c49b50aa02e41d3849ed0668b833328':
2012-10-29 13:39:28 -07:00
Zhihai Xu
3cb9919c05 am b1571ad6: 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 'b1571ad6866184c0048f60ea05e235856a1464b1':
2012-10-29 13:39:27 -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
1d4ecd8a63 am 3ad17a08: am 89e93c97: am 7a1c4cdf: Fix check for multiple users
* commit '3ad17a084836a3a501229e09d29fe9d838bc440f':
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
Michael Jurka
44e83b4eec am ed3e89ab: am eabe82d0: am 7d078f94: Fix crash when viewing installed app details page
* commit 'ed3e89abe50425f50bce2880bff86a6e38772f10':
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
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
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
af70bb4c82 am 3e418847: Import translations. DO NOT MERGE
* commit '3e41884765347d7671e414c884901bafe70f225d':
  Import translations. DO NOT MERGE
2012-10-29 07:44:33 -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
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
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
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