Commit Graph

9713 Commits

Author SHA1 Message Date
Brian Muramatsu
93aaf7bdea am c3b4ff2a: am e447debb: am 0bfd02b0: am c30a6712: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev
* commit 'c3b4ff2a052c54a410f3c7e1bf9a9bf4093d80e0':
2012-10-29 13:46:02 -07:00
John Huang
364f9e40f6 am 5224bbdf: 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 '5224bbdf5bdc9f94c9f4b59e727c53975c01dcac':
2012-10-29 13:46:00 -07:00
Casey Burkhardt
8b35fa75ce am d3a3bfd5: am af8b915f: am 7367bb2a: am 91ecf27a: Correcting content description in Wifi network selection activity. Bug: 7362208
* commit 'd3a3bfd598ba21a43db7e5e66c90a98d028aa22c':
2012-10-29 13:45:59 -07:00
Zhihai Xu
c6e8367c03 am 3cb9919c: 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 '3cb9919c059601550f97e2d2a17d51ef4f41040b':
2012-10-29 13:45:58 -07:00
Amith Yamasani
15b0293be1 am 1d4ecd8a: am 3ad17a08: am 89e93c97: am 7a1c4cdf: Fix check for multiple users
* commit '1d4ecd8a6302645af4b287a714bda6fec18f2bf3':
2012-10-29 13:45:56 -07:00
Michael Jurka
971c981949 am 44e83b4e: am ed3e89ab: am eabe82d0: am 7d078f94: Fix crash when viewing installed app details page
* commit '44e83b4eeca52a154812545113f78a75c2cebc28':
2012-10-29 13:45:55 -07:00
Baligh Uddin
4bafec6344 am 5f5f37b2: (-s ours) am 391dc9f7: am 3441d4ac: (-s ours) am 8e3f8d3a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '5f5f37b21f32491ec85d9924d34e1e43d8be7647':
2012-10-29 13:45:53 -07:00
Amith Yamasani
5e43f792c4 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 'b14659eb1ad147e1b0046df1a23042df681ddcbc':
2012-10-29 13:42:04 -07:00
Baligh Uddin
5facff2cfe am 434b9c4f: am 06545e87: am e508a26e: Remove blank translation string from en-GB, so it can show English.
* commit '434b9c4ff7c32fd69974ba77be1bc3eb210464a1':
2012-10-29 13:42:02 -07:00
Daniel Sandler
586ba830bc am 381df27c: am 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev
* commit '381df27cd69c9c7315556c1dc40403118f7c585a':
2012-10-29 13:42:01 -07:00
Baligh Uddin
90293772e7 am f6932aeb: am a7489954: am 50ab4b47: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev
* commit 'f6932aebd428a35f2973d2ddda2459c179021b9f':
2012-10-29 13:42:01 -07:00
Russell Brenner
e456e5577d am c0b22b0a: am 98f884b1: am 26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
* commit 'c0b22b0a3590338e1203912822d84dfdc8730706':
2012-10-29 13:42:00 -07:00
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
Michael Jurka
87e7c274f2 am 8a4024ec: Add ability to add clock widget to keyguard
* commit '8a4024ecac34515947b185c153e1055549713b38':
  Add ability to add clock widget to keyguard
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
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
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
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
Baligh Uddin
a1850b359d Import translations. DO NOT MERGE
Change-Id: I20581b67d9c51c69ebea21b3cb5ec425df31cdc9
Auto-generated-cl: translation import
2012-10-29 13:40:29 -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
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
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
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
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
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
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
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
Amith Yamasani
1d4ecd8a63 am 3ad17a08: am 89e93c97: am 7a1c4cdf: Fix check for multiple users
* commit '3ad17a084836a3a501229e09d29fe9d838bc440f':
2012-10-29 13:39:25 -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
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
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
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