Commit Graph

25305 Commits

Author SHA1 Message Date
Julia Reynolds
af3414c2c7 am 559a3e78: am e113f0c4: am b7028f25: am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
* commit '559a3e788652d448c2c95e2c024cf9f444258ca7':
  Hide optimization control on battery details page for non whitelisted apps.
2015-08-07 16:57:50 +00:00
Julia Reynolds
559a3e7886 am e113f0c4: am b7028f25: am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
* commit 'e113f0c4876b7529170768f8c7cf99f218d48ca8':
  Hide optimization control on battery details page for non whitelisted apps.
2015-08-07 16:52:11 +00:00
Julia Reynolds
e113f0c487 am b7028f25: am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
* commit 'b7028f254de1f7fdda5c3ee248f2e5a9294cc4dd':
  Hide optimization control on battery details page for non whitelisted apps.
2015-08-07 16:45:04 +00:00
Julia Reynolds
a9490b6860 am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
* commit '5ab0e183abdd4008c5591011804d0bc770851a7f':
  Hide optimization control on battery details page for non whitelisted apps.
2015-08-07 16:35:56 +00:00
Julia Reynolds
b7028f254d am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
* commit '5ab0e183abdd4008c5591011804d0bc770851a7f':
  Hide optimization control on battery details page for non whitelisted apps.
2015-08-07 16:34:58 +00:00
Julia Reynolds
5ab0e183ab Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev 2015-08-07 16:29:41 +00:00
Yasuhiro Matsuda
acb7b31bff Handle the case where null is returned for USB_STATE intent.
USB_STATE is not received if USB_STATE has not changed from
the initial state. This CL adds handling for that case.

BUG: 22163689
Change-Id: I232a558caaac4f4984f7629e2574d478fc7ad432
2015-08-07 18:14:04 +09:00
Geoff Mendal
ccd54267ae am fab5c39a: (-s ours) am 75a77cc7: (-s ours) am 233f1b61: (-s ours) am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit 'fab5c39af678c5fb0142e6d5a0f23a046df96535':
  Import translations. DO NOT MERGE
2015-08-07 06:07:14 +00:00
Geoff Mendal
fab5c39af6 am 75a77cc7: (-s ours) am 233f1b61: (-s ours) am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit '75a77cc77d30be0b8eb7b0e8dbd398ba1d8321cb':
  Import translations. DO NOT MERGE
2015-08-07 05:02:05 +00:00
Geoff Mendal
75a77cc77d am 233f1b61: (-s ours) am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit '233f1b61ce627819adb4351eb0b2d78f3020a38d':
  Import translations. DO NOT MERGE
2015-08-07 04:55:25 +00:00
Geoff Mendal
233f1b61ce am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit '6540a97291a5217558e67e5ed4186a25fbd16145':
  Import translations. DO NOT MERGE
2015-08-07 04:48:08 +00:00
Geoff Mendal
acf198a7ac am 2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit '2d546b77b997376416e2ba22d5a01ef6da27cbb3':
  Import translations. DO NOT MERGE
2015-08-07 04:44:33 +00:00
Geoff Mendal
6540a97291 am 2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit '2d546b77b997376416e2ba22d5a01ef6da27cbb3':
  Import translations. DO NOT MERGE
2015-08-07 04:44:05 +00:00
Geoff Mendal
2d546b77b9 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 22879473
Bug: 22719051
Change-Id: Ic6f0352135604d3a4d02ecfc9713f21191b046fd
2015-08-07 04:21:22 +00:00
Andres Morales
2eec566259 am 23f40d37: am ae560bf1: am 13d38763: am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit '23f40d37fcfc3e7718ef40065a51360f5b4b2239':
  fix CC for work profiles
2015-08-06 22:54:46 +00:00
Andres Morales
23f40d37fc am ae560bf1: am 13d38763: am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit 'ae560bf189a7f738d67e87ed78579203b99a0066':
  fix CC for work profiles
2015-08-06 22:49:32 +00:00
Andres Morales
ae560bf189 am 13d38763: am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit '13d387631f586d03a77aace9da9a991d5aea32ba':
  fix CC for work profiles
2015-08-06 22:41:42 +00:00
Andres Morales
13d387631f am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit 'd4c3dff6e3f900ab5693c9406ea625c2e398f7ba':
  fix CC for work profiles
2015-08-06 22:36:04 +00:00
Andres Morales
af2ea2f4dd am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit '4897fa87a55173f45bfddb2480a2e34eb412b8ef':
  fix CC for work profiles
2015-08-06 22:30:57 +00:00
Andres Morales
d4c3dff6e3 am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit '4897fa87a55173f45bfddb2480a2e34eb412b8ef':
  fix CC for work profiles
2015-08-06 22:30:55 +00:00
Andres Morales
4897fa87a5 Merge "fix CC for work profiles" into mnc-dev 2015-08-06 22:22:17 +00:00
Julia Reynolds
89a7a88124 Wrap text on long preferences.
Bug: 22987590
Change-Id: Iaef2c7d7d4581372a381d537f6d85a64d94bdf12
2015-08-06 14:23:47 -04:00
Julia Reynolds
2f01c5f5b5 Hide optimization control on battery details page for non whitelisted apps.
Bug: 22978210
Change-Id: If532960478dccf6ef9bea08a27167e1850749277
2015-08-06 11:42:40 -04:00
Geoff Mendal
e3d731c138 am 8c35777f: (-s ours) am 79aed477: (-s ours) am 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE
* commit '8c35777f45f925bc3b2600807a15d74fa43c20f6':
  Import translations. DO NOT MERGE
2015-08-06 04:42:23 +00:00
Geoff Mendal
8c35777f45 am 79aed477: (-s ours) am 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE
* commit '79aed4774745113f5b110fcfd82a3ee64ff6ecc1':
  Import translations. DO NOT MERGE
2015-08-06 04:38:14 +00:00
Geoff Mendal
919bcf72e7 am a7a0e552: (-s ours) am 870ba029: (-s ours) am 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translations. DO NOT MERGE
* commit 'a7a0e5526b20caa3107dd2ff69ed00ddcaa52d5e':
  Import translations. DO NOT MERGE
2015-08-06 04:33:27 +00:00
Geoff Mendal
79aed47747 am 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE
* commit '05facd935a44d882ca6f5e0ee7b3b1cffd1c0ad4':
  Import translations. DO NOT MERGE
2015-08-06 04:32:56 +00:00
Geoff Mendal
a7a0e5526b am 870ba029: (-s ours) am 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translations. DO NOT MERGE
* commit '870ba02933fa364660384944fa13ac0a94cab1b5':
  Import translations. DO NOT MERGE
2015-08-06 04:29:29 +00:00
Geoff Mendal
05facd935a am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE
* commit '18d8682802460074f4b0e628bae4d4051d542c77':
  Import translations. DO NOT MERGE
2015-08-06 04:24:45 +00:00
Geoff Mendal
870ba02933 am 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translations. DO NOT MERGE
* commit '40f6e9ab3ea41203d0ba1737713db58751e1995d':
  Import translations. DO NOT MERGE
2015-08-06 04:24:30 +00:00
Geoff Mendal
40f6e9ab3e am 90c22976: (-s ours) Import translations. DO NOT MERGE
* commit '90c2297645341f347f56b160f06551963c64d039':
  Import translations. DO NOT MERGE
2015-08-06 04:20:45 +00:00
Geoff Mendal
18d8682802 am 7930f872: (-s ours) Import translations. DO NOT MERGE
* commit '7930f872ad6b3f0e27c41d848131204eac0cd705':
  Import translations. DO NOT MERGE
2015-08-06 04:20:33 +00:00
Geoff Mendal
9acc740ed2 am 7930f872: (-s ours) Import translations. DO NOT MERGE
* commit '7930f872ad6b3f0e27c41d848131204eac0cd705':
  Import translations. DO NOT MERGE
2015-08-06 04:20:06 +00:00
Andres Morales
7bdffd85eb fix CC for work profiles
Bug: 22257554
Change-Id: I09f62956d01f91d3014d9fa250aaff68ab5e1a9b
2015-08-05 19:57:51 -07:00
Geoff Mendal
90c2297645 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 22390723
Change-Id: I2098bcc385398b9e2ac2be40f18e98819d52dc7c
2015-08-05 18:24:49 -07:00
Geoff Mendal
7930f872ad Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 22390723
Change-Id: Ifa5940a4053147c433ff717d920c6f724b53affa
2015-08-05 18:15:07 -07:00
Geoff Mendal
0112cb0897 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 22390723
Change-Id: I313c60b172c8d6694f577f87ce01e889d4b6da16
2015-08-05 18:05:28 -07:00
Jason Monk
31fe3b90c9 am cef52a74: am 854533a8: am 5b12cb77: am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list
* commit 'cef52a745a9ebb62f27fc6ecb8c24947b7916e4f':
  Hide show/hide system from battery optimizations list
2015-08-05 20:59:42 +00:00
Jason Monk
cef52a745a am 854533a8: am 5b12cb77: am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list
* commit '854533a82d5cfeac27e80b610544291c5be4fa39':
  Hide show/hide system from battery optimizations list
2015-08-05 20:52:19 +00:00
Sanket Padawe
94d65c3fcd am 38e0c9fb: am 95a524a4: am eb04b01b: am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '38e0c9fb5bdf120f6e8e2428bfbff2da048b4911':
  Check for special char when renaming device for Wi-Fi direct.
2015-08-05 20:44:51 +00:00
Jason Monk
854533a82d am 5b12cb77: am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list
* commit '5b12cb7712d85025c93ad941b0694916c0566a37':
  Hide show/hide system from battery optimizations list
2015-08-05 20:44:41 +00:00
Jason Monk
5b12cb7712 am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list
* commit '150e60ca9ad594d36aa12b425836a7d61b68501c':
  Hide show/hide system from battery optimizations list
2015-08-05 20:37:17 +00:00
Ajay Panicker
54fc9a4a01 am 21eff785: am e396c224: am f1ffec39: am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
* commit '21eff785a77c907724a9d44c06ff5c4c66204f3b':
  Implement Bluetooth settings factory reset (5/5)
2015-08-05 20:36:11 +00:00
Sanket Padawe
38e0c9fb5b am 95a524a4: am eb04b01b: am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '95a524a4ffd2da1873b9ac023f985afac4691b82':
  Check for special char when renaming device for Wi-Fi direct.
2015-08-05 20:33:11 +00:00
Jason Monk
aceedc73ae am 888673bd: Hide show/hide system from battery optimizations list
* commit '888673bd51acf9263163acfebdd0680358deabaa':
  Hide show/hide system from battery optimizations list
2015-08-05 20:31:58 +00:00
Jason Monk
150e60ca9a am 888673bd: Hide show/hide system from battery optimizations list
* commit '888673bd51acf9263163acfebdd0680358deabaa':
  Hide show/hide system from battery optimizations list
2015-08-05 20:30:40 +00:00
Sanket Padawe
95a524a4ff am eb04b01b: am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit 'eb04b01b3ffc44f6dec1a7d24228fcd4ab6116ee':
  Check for special char when renaming device for Wi-Fi direct.
2015-08-05 20:27:24 +00:00
Sanket Padawe
eb04b01b3f am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit 'ac02e250c1540c85c29e0ae753cb365c155c2968':
  Check for special char when renaming device for Wi-Fi direct.
2015-08-05 20:20:47 +00:00
Sanket Padawe
086dde011f am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '151612fb0de35fd2fadb096511f108b433100149':
  Check for special char when renaming device for Wi-Fi direct.
2015-08-05 20:13:14 +00:00
Sanket Padawe
ac02e250c1 am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '151612fb0de35fd2fadb096511f108b433100149':
  Check for special char when renaming device for Wi-Fi direct.
2015-08-05 20:12:00 +00:00