OSDN Git Service
Geoff Mendal [Tue, 7 Oct 2014 00:56:04 +0000 (00:56 +0000)]
am
5df0bf9a: (-s ours) am
c4fd0715: (-s ours) am
c3cd6d95: (-s ours) Import translations. DO NOT MERGE
* commit '
5df0bf9a34f2891982eacf0e5aa3119f14326f41':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 7 Oct 2014 00:40:12 +0000 (00:40 +0000)]
am
c4fd0715: (-s ours) am
c3cd6d95: (-s ours) Import translations. DO NOT MERGE
* commit '
c4fd0715c06b8197ff6f47da5d55f58cc4b336f6':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 7 Oct 2014 00:32:21 +0000 (00:32 +0000)]
am
c3cd6d95: (-s ours) Import translations. DO NOT MERGE
* commit '
c3cd6d956b2687a99564010b888513250d2ac29d':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 7 Oct 2014 00:18:58 +0000 (00:18 +0000)]
am
3a797b8b: (-s ours) am
78fb9572: (-s ours) Import translations. DO NOT MERGE
* commit '
3a797b8bdb3f4d68e7483478030f704688169ea6':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 7 Oct 2014 00:13:09 +0000 (00:13 +0000)]
am
b2bd24f1: (-s ours) Import translations. DO NOT MERGE
* commit '
b2bd24f195b523538138a594c0c227004886a94d':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 7 Oct 2014 00:11:50 +0000 (00:11 +0000)]
am
78fb9572: (-s ours) Import translations. DO NOT MERGE
* commit '
78fb95728d534a7099c220ea21fc13f3b52afd5f':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 7 Oct 2014 00:04:43 +0000 (17:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I86bdfc2ed82420c69d8123d82c3e376eef9ff2b1
Auto-generated-cl: translation import
Geoff Mendal [Tue, 7 Oct 2014 00:00:54 +0000 (17:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6c277439d0c0ffb1f36e56fdad5669c7fbc44c56
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 23:57:23 +0000 (16:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I24a02b89f2baf4a914ff56381e46f8a326b9ddba
Auto-generated-cl: translation import
Baligh Uddin [Sun, 5 Oct 2014 18:29:10 +0000 (18:29 +0000)]
am
04b3b84d: (-s ours) am
44705ba3: (-s ours) am
b305e7ad: (-s ours) am
43848de1: (-s ours) Import translations. DO NOT MERGE
* commit '
04b3b84d30d723e71ea501b929f7b4af81e1150d':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 18:23:42 +0000 (18:23 +0000)]
am
44705ba3: (-s ours) am
b305e7ad: (-s ours) am
43848de1: (-s ours) Import translations. DO NOT MERGE
* commit '
44705ba3c254b62c8ab95ef5d05a5c1e3c8c0a75':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 18:21:41 +0000 (18:21 +0000)]
am
c683e91b: (-s ours) am
d10da630: (-s ours) am
4aed4235: (-s ours) Import translations. DO NOT MERGE
* commit '
c683e91b14d2e8826ba1d6f81abb8cc70117699f':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 18:17:26 +0000 (18:17 +0000)]
am
b305e7ad: (-s ours) am
43848de1: (-s ours) Import translations. DO NOT MERGE
* commit '
b305e7adecfafbcfd0c41354750dd2a77c3fdfa9':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 18:16:35 +0000 (18:16 +0000)]
am
08edaf4a: (-s ours) am
f6a4f3e1: (-s ours) Import translations. DO NOT MERGE
* commit '
08edaf4a15d4b7e3f90902ed952b9ce3cf5b863f':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 18:14:49 +0000 (18:14 +0000)]
am
d10da630: (-s ours) am
4aed4235: (-s ours) Import translations. DO NOT MERGE
* commit '
d10da630cbb1998d900033cdbd00b0f88cec3f57':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 18:12:01 +0000 (18:12 +0000)]
am
44a32145: (-s ours) Import translations. DO NOT MERGE
* commit '
44a32145ca9400540c2fe82cad265bceb60d5f05':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 18:10:55 +0000 (18:10 +0000)]
am
43848de1: (-s ours) Import translations. DO NOT MERGE
* commit '
43848de1603dc30e390049e2057285303132a836':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 18:10:03 +0000 (18:10 +0000)]
am
f6a4f3e1: (-s ours) Import translations. DO NOT MERGE
* commit '
f6a4f3e1eaa98a2c39732d0900996664e0256622':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 18:09:22 +0000 (18:09 +0000)]
am
4aed4235: (-s ours) Import translations. DO NOT MERGE
* commit '
4aed423562538583076fe3568bdd01a613d5b36f':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 04:38:39 +0000 (21:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9049c251a4ee54d87835a2a4a892c15ddf313a1e
Auto-generated-cl: translation import
Baligh Uddin [Sun, 5 Oct 2014 04:36:10 +0000 (21:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: If0f8717088e311300497cdced1071430511640e5
Auto-generated-cl: translation import
Baligh Uddin [Sun, 5 Oct 2014 04:33:29 +0000 (21:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: If4aa14267640180bada6274d733dfe955835a8b9
Auto-generated-cl: translation import
Baligh Uddin [Sun, 5 Oct 2014 04:30:28 +0000 (21:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebb3a9a429b160434faeae21a112480e888c6bb4
Auto-generated-cl: translation import
Elliott Hughes [Sat, 4 Oct 2014 16:38:07 +0000 (09:38 -0700)]
resolved conflicts for merge of
3269c409 to lmp-mr1-dev-plus-aosp
Change-Id: I21a6ffe22c40c5c308487926d26d28dcae7f186d
PauloftheWest [Sat, 4 Oct 2014 15:45:10 +0000 (15:45 +0000)]
am
0834ff0b: am
6ceaa82b: am
4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev
* commit '
0834ff0b870d022f028a45a81ca5887eb99f4677':
[DS] DSDS support for Settings
Elliott Hughes [Sat, 4 Oct 2014 00:48:06 +0000 (00:48 +0000)]
am
50c377f0: Merge "Fix percentage formatting throughout Settings." into lmp-mr1-dev
* commit '
50c377f09ffba10d7ff4787b7641aee4975c6f98':
Fix percentage formatting throughout Settings.
Elliott Hughes [Sat, 4 Oct 2014 00:44:10 +0000 (00:44 +0000)]
Merge "Fix percentage formatting throughout Settings." into lmp-mr1-dev
PauloftheWest [Sat, 4 Oct 2014 00:04:28 +0000 (00:04 +0000)]
am
6ceaa82b: am
4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev
* commit '
6ceaa82b5a188e2f000d2224f7fb8d6d4b9cf139':
[DS] DSDS support for Settings
PauloftheWest [Fri, 3 Oct 2014 23:57:18 +0000 (23:57 +0000)]
am
4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev
* commit '
4046cf9cb46762a517b69c6cb78faa5903d6a3d5':
[DS] DSDS support for Settings
Elliott Hughes [Thu, 2 Oct 2014 23:36:32 +0000 (16:36 -0700)]
Fix percentage formatting throughout Settings.
Bug:
15476051
Change-Id: Ic64e7c36d0e2732d3e0e79fec2b79de42decf77d
PauloftheWest [Fri, 3 Oct 2014 22:45:26 +0000 (22:45 +0000)]
Merge "[DS] DSDS support for Settings" into lmp-sprout-dev
Svetoslav [Fri, 3 Oct 2014 22:39:26 +0000 (22:39 +0000)]
am
94c1f70c: am
5c690775: am
35314f27: am
5cdd3f4f: Update accessibility plus secure lock warning messages.
* commit '
94c1f70c8833a5b7b3858213b7d8a30b647c1bb2':
Update accessibility plus secure lock warning messages.
PauloftheWest [Fri, 3 Oct 2014 18:07:14 +0000 (11:07 -0700)]
[DS] DSDS support for Settings
+ Rebase and modify as APIs rename.
+ Fix bugs on set sub's name as title.
+ Enabled Sim Settings.
Change-Id: Ic731c7882be95b86b6b8dcdd3f208a6125681f3e
Svetoslav [Fri, 3 Oct 2014 22:20:41 +0000 (22:20 +0000)]
am
5c690775: am
35314f27: am
5cdd3f4f: Update accessibility plus secure lock warning messages.
* commit '
5c690775bca9aa5bf3b5cb5b6fb49542e006f223':
Update accessibility plus secure lock warning messages.
Svetoslav [Fri, 3 Oct 2014 22:12:34 +0000 (22:12 +0000)]
am
35314f27: am
5cdd3f4f: Update accessibility plus secure lock warning messages.
* commit '
35314f2771a9443acf334bf90ac88f582ded43ee':
Update accessibility plus secure lock warning messages.
Svetoslav [Fri, 3 Oct 2014 22:06:18 +0000 (22:06 +0000)]
am
5cdd3f4f: Update accessibility plus secure lock warning messages.
* commit '
5cdd3f4f6fcee6af89742dc0427df4bba4214cc8':
Update accessibility plus secure lock warning messages.
Svetoslav [Fri, 3 Oct 2014 20:27:08 +0000 (13:27 -0700)]
Update accessibility plus secure lock warning messages.
bug:
17671790
Change-Id: I694586452963a8f0e4c86b5c9c807ca9bb2ec15d
John Spurlock [Fri, 3 Oct 2014 14:14:35 +0000 (14:14 +0000)]
am
a876854d: am
5ded06ec: am
40fdd482: am
c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev
* commit '
a876854d8e119fe464122b082882a6ec34fe4529':
Settings: Update media & alarm stream icons.
John Spurlock [Fri, 3 Oct 2014 14:10:28 +0000 (14:10 +0000)]
am
5ded06ec: am
40fdd482: am
c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev
* commit '
5ded06eca13a91da5ab40890ebfaedeae8c000f2':
Settings: Update media & alarm stream icons.
John Spurlock [Fri, 3 Oct 2014 14:05:42 +0000 (14:05 +0000)]
am
40fdd482: am
c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev
* commit '
40fdd482048bbf47878137f8552b6cade6832147':
Settings: Update media & alarm stream icons.
PauloftheWest [Fri, 3 Oct 2014 14:00:26 +0000 (14:00 +0000)]
am
d960f94f: am
de8ef74e: am
32ce9484: am
6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec.
* commit '
d960f94f2d270123e562a303df7c169cceb7ee0c':
Updated Wi-Fi hotspot dialog to the Material Spec.
John Spurlock [Fri, 3 Oct 2014 14:00:25 +0000 (14:00 +0000)]
am
c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev
* commit '
c05b739c691684350b63ca2e232319ee4fcaa76d':
Settings: Update media & alarm stream icons.
PauloftheWest [Fri, 3 Oct 2014 13:56:10 +0000 (13:56 +0000)]
am
de8ef74e: am
32ce9484: am
6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec.
* commit '
de8ef74e1ab1cd026969a881838762ecf49945fa':
Updated Wi-Fi hotspot dialog to the Material Spec.
John Spurlock [Fri, 3 Oct 2014 13:55:34 +0000 (13:55 +0000)]
Merge "Settings: Update media & alarm stream icons." into lmp-dev
PauloftheWest [Fri, 3 Oct 2014 13:50:51 +0000 (13:50 +0000)]
am
32ce9484: am
6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec.
* commit '
32ce9484b7e8b039bb7d5b9f31ddaa9834fc1f5d':
Updated Wi-Fi hotspot dialog to the Material Spec.
PauloftheWest [Fri, 3 Oct 2014 13:46:28 +0000 (13:46 +0000)]
am
6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec.
* commit '
6e26427e521a79a11c1a9e1b64995494290eaf7c':
Updated Wi-Fi hotspot dialog to the Material Spec.
John Spurlock [Thu, 2 Oct 2014 23:20:36 +0000 (19:20 -0400)]
Settings: Update media & alarm stream icons.
Update icon pointers and remove obsolete preference class.
Bug:
17762712
Change-Id: Ia4b96c5b38f2a73a7a339b2ab3abfcd433f4403d
Elliott Hughes [Thu, 2 Oct 2014 23:48:02 +0000 (23:48 +0000)]
am
d055c6ad: am
ebbe9a67: Merge "Use the StorageManager constant for the PatternVisible key." into lmp-mr1-dev
* commit '
d055c6ad5db651ff0fdf6431b6bab8230bc873a2':
Use the StorageManager constant for the PatternVisible key.
Elliott Hughes [Thu, 2 Oct 2014 23:38:50 +0000 (23:38 +0000)]
am
ebbe9a67: Merge "Use the StorageManager constant for the PatternVisible key." into lmp-mr1-dev
* commit '
ebbe9a6796eb96776c77c70a0890af3d228e789b':
Use the StorageManager constant for the PatternVisible key.
Wink Saville [Thu, 2 Oct 2014 23:37:57 +0000 (23:37 +0000)]
am
77ef7163: am
28ec3d9d: am
dbd052ed: Enable Sim Settings
* commit '
77ef716371459665af0e9799b054e587ae56e20e':
Enable Sim Settings
Elliott Hughes [Thu, 2 Oct 2014 23:35:07 +0000 (23:35 +0000)]
Merge "Use the StorageManager constant for the PatternVisible key." into lmp-mr1-dev
Wink Saville [Thu, 2 Oct 2014 23:10:30 +0000 (23:10 +0000)]
am
28ec3d9d: am
dbd052ed: Enable Sim Settings
* commit '
28ec3d9db7d1773e53751ecf82a146351fc763dc':
Enable Sim Settings
Wink Saville [Thu, 2 Oct 2014 23:04:12 +0000 (23:04 +0000)]
am
dbd052ed: Enable Sim Settings
* commit '
dbd052ed5ee71b2fc552e0a2954f8c283acc6f70':
Enable Sim Settings
Wink Saville [Thu, 2 Oct 2014 22:54:21 +0000 (15:54 -0700)]
Enable Sim Settings
Changes from Paul and MTK will be coming soon but this
allow us to do some initial testing.
Change-Id: Ic52bc3656bc7066c8bbb7435eaf14e9b8e66a257
PauloftheWest [Thu, 2 Oct 2014 13:22:47 +0000 (06:22 -0700)]
Updated Wi-Fi hotspot dialog to the Material Spec.
+ If there is scrolling then force the scrollbars to always appear.
+ Align contents of the dialog with the title.
+ Change "Network SSID" to "Network name".
+ Added wifi_* styles to other style xml files so that Wi-Fi hotspot dialogs are visible on tablets.
+ Move layout_width/height from res/layout/{wifi_dialog.xml, wifi_dialog_row.xml} from style into the xml file.
Bug:
17684359
Change-Id: I42fb69132d6ba0fb8d9853de6f5524f29e6b70b6
Elliott Hughes [Thu, 2 Oct 2014 20:29:58 +0000 (13:29 -0700)]
Use the StorageManager constant for the PatternVisible key.
Bug:
17659622
Change-Id: Ibd44f5c619f61764ef4e4a3447f241e2f73339b5
PauloftheWest [Thu, 2 Oct 2014 12:40:12 +0000 (12:40 +0000)]
am
0d903323: am
7d31d81c: am
c744c448: am
59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
* commit '
0d903323d509613e8c5992f4bf8b0a3ed761ebe5':
Fixed a Setting Bluetooth Airplane mode bug.
Alan Viverette [Thu, 2 Oct 2014 12:40:11 +0000 (12:40 +0000)]
am
63ba6643: am
68e3f05c: am
91f4e5a8: am
7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
* commit '
63ba6643fda639b588d4410e4de43659cf062b62':
Ensure recycled APN preferences are updated to show radio button
Baligh Uddin [Thu, 2 Oct 2014 12:40:10 +0000 (12:40 +0000)]
am
51b5e2af: (-s ours) am
cb6b336e: (-s ours) am
299c6e12: (-s ours) am
9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
51b5e2af70081ea2d2b70e05341b1cca79e6c5f0':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 2 Oct 2014 12:40:09 +0000 (12:40 +0000)]
am
8ea8cfab: (-s ours) am
48f0021c: (-s ours) am
0905bb07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
8ea8cfabf36f7fb59f4f3fc8c9437a3cde4b539e':
Import translations. DO NOT MERGE
Hui Shu [Thu, 2 Oct 2014 12:40:08 +0000 (12:40 +0000)]
am
e9a39e28: am
9184ed5c: am
c1c9888d: am
905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit '
e9a39e28c21fe6b732e2af13a9c5a658954f749a':
Remove WebView DRP Setting from Developer Settings
Baligh Uddin [Thu, 2 Oct 2014 12:37:41 +0000 (12:37 +0000)]
am
fffdc1b7: (-s ours) am
8133d31b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
fffdc1b762df51f1d13717da914ae3380f8581e8':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 2 Oct 2014 12:37:34 +0000 (12:37 +0000)]
am
d4936ba9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
d4936ba987bbd9ea1c6ef441bd9bce8d691e0145':
Import translations. DO NOT MERGE
Zoltan Szatmary-Ban [Thu, 2 Oct 2014 12:37:20 +0000 (12:37 +0000)]
am
231c4a23: am
b5550a65: am
45f8ffa1: am
b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
* commit '
231c4a231531cadd451c3beeb360de4a72ad6ae2':
Disambiguate categories in Settings > Trusted Credentials
Maurice Lam [Thu, 2 Oct 2014 12:37:19 +0000 (12:37 +0000)]
am
a1ecc44f: am
492f8728: am
5fdb8fa4: am
f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev
* commit '
a1ecc44fa8802c0a931aec833910d515c88928af':
[WifiSetup] Update background texture
Svetoslav [Thu, 2 Oct 2014 12:37:18 +0000 (12:37 +0000)]
am
7358b7d5: am
e78840ff: am
42eff3b7: am
52448442: Use default encryption password if an accessibility service is enabled.
* commit '
7358b7d56286d1896f833bbd9d970b83dfb5fed1':
Use default encryption password if an accessibility service is enabled.
Fabrice Di Meglio [Thu, 2 Oct 2014 12:37:17 +0000 (12:37 +0000)]
am
3d2441f7: am
3cc8fe3b: am
976aba99: am
fc14e272: Merge "Update Settings App icons" into lmp-dev
* commit '
3d2441f7766fd28c0e08a28eaf0a4f9315533cf0':
Update Settings App icons
PauloftheWest [Thu, 2 Oct 2014 12:37:16 +0000 (12:37 +0000)]
am
cd93da02: am
8506c378: am
cc6736bf: am
29aab7a2: Fixed a Settings crash.
* commit '
cd93da0235c61061d1eb335783183766c484cab2':
Fixed a Settings crash.
Baligh Uddin [Thu, 2 Oct 2014 12:37:16 +0000 (12:37 +0000)]
am
91b315c1: (-s ours) am
02e6f611: (-s ours) am
6cbdf17e: (-s ours) am
5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
91b315c1d6afac99f51e58488a14d4a1d8498f3a':
Import translations. DO NOT MERGE
PauloftheWest [Thu, 2 Oct 2014 12:37:16 +0000 (12:37 +0000)]
am
db464694: am
c4ef9bf8: am
dc5f87ff: am
709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev
* commit '
db46469432b67550b9b5968d7aa4004121332b0d':
Fixed multiple MAP issues.
PauloftheWest [Wed, 1 Oct 2014 22:31:00 +0000 (22:31 +0000)]
am
7d31d81c: am
c744c448: am
59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
* commit '
7d31d81c85e05bdc852835cdfe6bfa715249ab3d':
Fixed a Setting Bluetooth Airplane mode bug.
Alan Viverette [Wed, 1 Oct 2014 22:30:54 +0000 (22:30 +0000)]
am
68e3f05c: am
91f4e5a8: am
7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
* commit '
68e3f05cab5a567dc56b4801698a3d2d706efab7':
Ensure recycled APN preferences are updated to show radio button
Baligh Uddin [Wed, 1 Oct 2014 22:30:48 +0000 (22:30 +0000)]
am
cb6b336e: (-s ours) am
299c6e12: (-s ours) am
9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
cb6b336ec2e0d90df9977993d351d372a5ace4d7':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 1 Oct 2014 22:30:42 +0000 (22:30 +0000)]
am
48f0021c: (-s ours) am
0905bb07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
48f0021cec8943c3027f41faff147b83ba6d991f':
Import translations. DO NOT MERGE
Hui Shu [Wed, 1 Oct 2014 22:30:41 +0000 (22:30 +0000)]
am
9184ed5c: am
c1c9888d: am
905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit '
9184ed5cb4ac66839515da9c0ae69b08a97a91ae':
Remove WebView DRP Setting from Developer Settings
PauloftheWest [Wed, 1 Oct 2014 22:18:00 +0000 (22:18 +0000)]
am
c744c448: am
59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
* commit '
c744c448e472a065c1fc96fd6a26e2d1e9fa5c6a':
Fixed a Setting Bluetooth Airplane mode bug.
Alan Viverette [Wed, 1 Oct 2014 22:17:46 +0000 (22:17 +0000)]
am
91f4e5a8: am
7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
* commit '
91f4e5a8aff6266bcb9fb717f8bfc8a4323fc9cf':
Ensure recycled APN preferences are updated to show radio button
Baligh Uddin [Wed, 1 Oct 2014 22:16:50 +0000 (22:16 +0000)]
am
299c6e12: (-s ours) am
9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
299c6e127d5105890a963208a64309af42051b56':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 1 Oct 2014 22:16:47 +0000 (22:16 +0000)]
am
0905bb07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
0905bb07fc7059afc567d03dbca7696604aee0e2':
Import translations. DO NOT MERGE
Hui Shu [Wed, 1 Oct 2014 22:15:49 +0000 (22:15 +0000)]
am
c1c9888d: am
905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit '
c1c9888db4171a9db81345f428342ec838b5da99':
Remove WebView DRP Setting from Developer Settings
PauloftheWest [Wed, 1 Oct 2014 21:12:30 +0000 (21:12 +0000)]
am
59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
* commit '
59d33dbd25d8ca968e03bdeefedea9b0fe2e01f3':
Fixed a Setting Bluetooth Airplane mode bug.
PauloftheWest [Wed, 1 Oct 2014 21:07:55 +0000 (21:07 +0000)]
Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
Alan Viverette [Wed, 1 Oct 2014 20:12:01 +0000 (20:12 +0000)]
am
7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
* commit '
7a4d229d2dd958fe033c739785eae6728caa5184':
Ensure recycled APN preferences are updated to show radio button
Alan Viverette [Wed, 1 Oct 2014 20:05:20 +0000 (20:05 +0000)]
Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
Alan Viverette [Wed, 1 Oct 2014 19:42:18 +0000 (12:42 -0700)]
Ensure recycled APN preferences are updated to show radio button
BUG:
17516352
Change-Id: I5da19b7c6d5a3ec03fe24f7bdfda656d6d616342
Baligh Uddin [Wed, 1 Oct 2014 19:32:47 +0000 (19:32 +0000)]
am
8133d31b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
8133d31b5275c35dd078ec24f300863dc9ac706f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 1 Oct 2014 19:32:32 +0000 (19:32 +0000)]
am
9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
9d4dc326d1988ef2760e9d0d31239e43801587e2':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 1 Oct 2014 19:29:16 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Wed, 1 Oct 2014 19:29:14 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Baligh Uddin [Wed, 1 Oct 2014 19:29:12 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 1 Oct 2014 19:29:10 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Zoltan Szatmary-Ban [Wed, 1 Oct 2014 18:56:50 +0000 (18:56 +0000)]
am
b5550a65: am
45f8ffa1: am
b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
* commit '
b5550a65c089f230a58b636c9a55c61a054d169b':
Disambiguate categories in Settings > Trusted Credentials
Hui Shu [Wed, 1 Oct 2014 18:32:04 +0000 (18:32 +0000)]
am
905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit '
905f9e2f90c886a8405e0cca8286cd3dd7f430e9':
Remove WebView DRP Setting from Developer Settings
Hui Shu [Wed, 1 Oct 2014 18:28:51 +0000 (18:28 +0000)]
Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
Zoltan Szatmary-Ban [Wed, 1 Oct 2014 17:20:47 +0000 (17:20 +0000)]
am
45f8ffa1: am
b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
* commit '
45f8ffa1da2f5dc937ab47c5f6e097f1a2d06750':
Disambiguate categories in Settings > Trusted Credentials
Zoltan Szatmary-Ban [Wed, 1 Oct 2014 17:02:07 +0000 (17:02 +0000)]
am
b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
* commit '
b0c216d3b95b3aa3a0a38ebde92ec19956598e9d':
Disambiguate categories in Settings > Trusted Credentials
Zoltan Szatmary-Ban [Wed, 1 Oct 2014 15:47:59 +0000 (15:47 +0000)]
Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
PauloftheWest [Wed, 1 Oct 2014 13:14:58 +0000 (06:14 -0700)]
Fixed a Setting Bluetooth Airplane mode bug.
+ This patch moves the switch listeners from setup/teardown of the SwitchBar
to pause/resume of Bluetooth Settings. This prevents Bluetooth from
receiving connect messages while Airplane mode is turning off Bluetooth
(which is what caused Bluetooth to re-enable.)
Bug:
17465951
Change-Id: I4d32fcf5bb3a2241ed03e2295c86390e15743954
Maurice Lam [Wed, 1 Oct 2014 15:19:17 +0000 (15:19 +0000)]
am
492f8728: am
5fdb8fa4: am
f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev
* commit '
492f87288699dbf8bb521c4160688b73d241d454':
[WifiSetup] Update background texture
Svetoslav [Wed, 1 Oct 2014 15:19:16 +0000 (15:19 +0000)]
am
e78840ff: am
42eff3b7: am
52448442: Use default encryption password if an accessibility service is enabled.
* commit '
e78840ff097dd09c24977876e2f84972dbe1361b':
Use default encryption password if an accessibility service is enabled.
OSDN Git Service
