OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 5db96899: am 4e915dff: am 168bfef1: Merge "pass a defensive copy of DhcpResults...
Erik Kline [Tue, 2 Jun 2015 19:23:21 +0000 (19:23 +0000)]
am 5db96899: am 4e915dff: am 168bfef1: Merge "pass a defensive copy of DhcpResults" into mnc-dev

* commit '5db968996c4b22d4952d171dd7ece76c4f0b4af1':
  pass a defensive copy of DhcpResults

9 years agoam caa7391f: (-s ours) am 2590a679: am 417820bb: am 65f6996a: (-s ours) am eb4bd19e...
Jeff Brown [Tue, 2 Jun 2015 19:23:12 +0000 (19:23 +0000)]
am caa7391f: (-s ours) am 2590a679: am 417820bb: am 65f6996a: (-s ours) am eb4bd19e: Terminate loop properly when cursor window is full. DO NOT MERGE

* commit 'caa7391f82dcb89334a53e91e6d640e6d60e15e2':
  Terminate loop properly when cursor window is full. DO NOT MERGE

9 years agoam 59a13c46: am ac00438d: am 708f57f4: Un-hide connectGatt() variant with selective...
Andre Eisenbach [Tue, 2 Jun 2015 19:23:05 +0000 (19:23 +0000)]
am 59a13c46: am ac00438d: am 708f57f4: Un-hide connectGatt() variant with selective transport

* commit '59a13c46ceef126a19476078e28205f456c9003f':
  Un-hide connectGatt() variant with selective transport

9 years agoam 8b2cf646: am cf4a301f: am 11df5b66: Merge "Track camera and flashlight usage in...
Ruben Brunk [Tue, 2 Jun 2015 19:22:59 +0000 (19:22 +0000)]
am 8b2cf646: am cf4a301f: am 11df5b66: Merge "Track camera and flashlight usage in battery stats." into mnc-dev

* commit '8b2cf64630074d89dbf336741cecf3a54d3ddd2d':
  Track camera and flashlight usage in battery stats.

9 years agoam 0d7e1e05: am 44499ecc: am 082138cd: am 348d0a68: am 7af35669: docs: Added Javadocs...
Quddus Chong [Tue, 2 Jun 2015 19:22:53 +0000 (19:22 +0000)]
am 0d7e1e05: am 44499ecc: am 082138cd: am 348d0a68: am 7af35669: docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922

* commit '0d7e1e05c736d497e94220d5c171fb423d2f090a':
  docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922

9 years agoam ffb1e45e: am ca15c039: am 405e895c: Merge "Fix issue related selecting of "Contact...
Sanket Padawe [Tue, 2 Jun 2015 19:22:45 +0000 (19:22 +0000)]
am ffb1e45e: am ca15c039: am 405e895c: Merge "Fix issue related selecting of "Contact sharing" in BT Settings." into mnc-dev

* commit 'ffb1e45e810bdf46dc35331661cd64f846b748da':
  Fix issue related selecting of "Contact sharing" in BT Settings.

9 years agoam 9ebf7522: am 8ed46d3f: am a0b77dd5: Merge "Fix TextView ActionMode overflow finish...
Clara Bayarri [Tue, 2 Jun 2015 19:22:40 +0000 (19:22 +0000)]
am 9ebf7522: am 8ed46d3f: am a0b77dd5: Merge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev

* commit '9ebf7522895589d7bc9d6508c100ef8a26d42c9f':
  Fix TextView ActionMode overflow finishes the ActionMode

9 years agoam dc1630e4: am 4ebfd76a: am d63a1776: Merge "Make Text Selection Action Mode seconda...
Clara Bayarri [Tue, 2 Jun 2015 19:22:34 +0000 (19:22 +0000)]
am dc1630e4: am 4ebfd76a: am d63a1776: Merge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev

* commit 'dc1630e45334b72a337e4dcb31fce453aa0fd3e1':
  Make Text Selection Action Mode secondary items IF_ROOM

9 years agoam 3fe0c565: am 3e033267: am fa3f17f1: Merge "Don\'t take the compatibility path...
Adam Powell [Tue, 2 Jun 2015 19:22:28 +0000 (19:22 +0000)]
am 3fe0c565: am 3e033267: am fa3f17f1: Merge "Don\'t take the compatibility path for non-primary ActionModes" into mnc-dev

* commit '3fe0c56559e305e0dabb899f171f5ef4996ddcae':
  Don't take the compatibility path for non-primary ActionModes

9 years agoam f53f3c24: am fcec13f0: am 4982e7b4: Merge "Don\'t add real children for a view...
Svetoslav [Tue, 2 Jun 2015 19:22:23 +0000 (19:22 +0000)]
am f53f3c24: am fcec13f0: am 4982e7b4: Merge "Don\'t add real children for a view with a node provider" into mnc-dev

* commit 'f53f3c24324967e1eb055b0944a2f11acfcfe625':
  Don't add real children for a view with a node provider

9 years agoam b17e96de: am a60e4b08: am 03a7c4c6: Fix shared drawable state
Jorim Jaggi [Tue, 2 Jun 2015 19:22:15 +0000 (19:22 +0000)]
am b17e96de: am a60e4b08: am 03a7c4c6: Fix shared drawable state

* commit 'b17e96de98f16d9322ccca7457ee9c8197b416c9':
  Fix shared drawable state

9 years agoam 5d8e4aba: am bbf5b460: am acbe426b: Merge "Add accidentally deleted strings."...
Svetoslav [Tue, 2 Jun 2015 19:22:09 +0000 (19:22 +0000)]
am 5d8e4aba: am bbf5b460: am acbe426b: Merge "Add accidentally deleted strings." into mnc-dev

* commit '5d8e4abaf3775627cd8451254e56b0e439c291c2':
  Add accidentally deleted strings.

9 years agoam 5c40b533: am e94bc219: am 8a6d511d: Merge "Remove ViewAssistStructure and use...
Selim Gurun [Tue, 2 Jun 2015 19:22:02 +0000 (19:22 +0000)]
am 5c40b533: am e94bc219: am 8a6d511d: Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev

* commit '5c40b53370f111fb82d9d82f6bfac8e2a16ffd6e':
  Remove ViewAssistStructure and use the frameworks data structure

9 years agoam 1a92fc59: am bbc27621: am b0f94ae5: Merge "Always send VIEW_CLICKED event from...
Alan Viverette [Tue, 2 Jun 2015 19:21:57 +0000 (19:21 +0000)]
am 1a92fc59: am bbc27621: am b0f94ae5: Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev

* commit '1a92fc592b76519cf746b7d4f9ed2878163ebbbb':
  Always send VIEW_CLICKED event from AdapterView.performItemClick()

9 years agoam 742b4eb8: am 56650141: am 717a2d09: Merge "Camera2: Remove isLoggable" into mnc-dev
Eino-Ville Talvala [Tue, 2 Jun 2015 19:21:47 +0000 (19:21 +0000)]
am 742b4eb8: am 56650141: am 717a2d09: Merge "Camera2: Remove isLoggable" into mnc-dev

* commit '742b4eb890926c0d05ad04dc860bff95ce8e0bf3':
  Camera2: Remove isLoggable

9 years agoam fab99fd8: am 17fa101c: am 0505f7f2: Merge "Terminate loop properly when cursor...
Jeff Brown [Tue, 2 Jun 2015 19:21:41 +0000 (19:21 +0000)]
am fab99fd8: am 17fa101c: am 0505f7f2: Merge "Terminate loop properly when cursor window is full." into mnc-dev

* commit 'fab99fd899cfd6fdd2ca44bbbb2a47b3aee4c0ad':
  Terminate loop properly when cursor window is full.

9 years agoam 97e5851a: am c474645a: am c45d6c30: Merge "Translucent bars in landscape" into...
Adrian Roos [Tue, 2 Jun 2015 19:21:34 +0000 (19:21 +0000)]
am 97e5851a: am c474645a: am c45d6c30: Merge "Translucent bars in landscape" into mnc-dev

* commit '97e5851aec4b753befe0e1f085b2e9b8f8089c97':
  Translucent bars in landscape

9 years agoam ed40a4f3: am ef0647b6: am 346222f9: Merge "LayoutLib: Skip classes from java packa...
Deepanshu Gupta [Tue, 2 Jun 2015 19:21:26 +0000 (19:21 +0000)]
am ed40a4f3: am ef0647b6: am 346222f9: Merge "LayoutLib: Skip classes from java package." into mnc-dev

* commit 'ed40a4f38dc56afb229ee6bdc3e9b453cf46f954':
  LayoutLib: Skip classes from java package.

9 years agoam 604fab3c: am d61ff1cf: am 7ef93d15: Merge "Skip warnings for some unresolved refer...
Deepanshu Gupta [Tue, 2 Jun 2015 19:21:18 +0000 (19:21 +0000)]
am 604fab3c: am d61ff1cf: am 7ef93d15: Merge "Skip warnings for some unresolved references." into mnc-dev

* commit '604fab3c4c0440f1a3fe1620202b33882b87112d':
  Skip warnings for some unresolved references.

9 years agoam f64d85b4: am e2c09c2f: am 133b107d: am 65b7485d: am 2b95561d: docs: Fixed typo...
Quddus Chong [Tue, 2 Jun 2015 19:21:10 +0000 (19:21 +0000)]
am f64d85b4: am e2c09c2f: am 133b107d: am 65b7485d: am 2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug: 21444273

* commit 'f64d85b4d271cda3454aa244eb43868f7f7ecb4f':

9 years agoam 49e76757: am c50bb5b4: am c85cd734: Merge "Don\'t focus view for invalid task...
Winson Chung [Tue, 2 Jun 2015 19:21:03 +0000 (19:21 +0000)]
am 49e76757: am c50bb5b4: am c85cd734: Merge "Don\'t focus view for invalid task index." into mnc-dev

* commit '49e7675745cac3b38d2bbce18d09347e23e8515f':
  Don't focus view for invalid task index.

9 years agoam a974b09c: am ecb6be7d: am dc49d5f8: Merge "Fix one-action choosers with EXTRA_INIT...
Adam Powell [Tue, 2 Jun 2015 19:20:56 +0000 (19:20 +0000)]
am a974b09c: am ecb6be7d: am dc49d5f8: Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev

* commit 'a974b09c67228d8bab3cfbe91f7e38bae0323c81':
  Fix one-action choosers with EXTRA_INITIAL_INTENTS

9 years agoam 00055784: am 6b725182: am 29780eec: Merge "Cleanup Video API javadoc." into mnc-dev
Tyler Gunn [Tue, 2 Jun 2015 19:20:51 +0000 (19:20 +0000)]
am 00055784: am 6b725182: am 29780eec: Merge "Cleanup Video API javadoc." into mnc-dev

* commit '0005578446f25632e2a01096f732a5b9d0aaf575':
  Cleanup Video API javadoc.

9 years agoam ddd1dafd: am 2f395f32: am 0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev
Tyler Gunn [Tue, 2 Jun 2015 19:20:44 +0000 (19:20 +0000)]
am ddd1dafd: am 2f395f32: am 0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev

* commit 'ddd1dafd26ec61613003f766d515c700d9fb11f2':
  IMS: Conference fixes

9 years agoam 4f57deb9: am 0d69c19d: am 9ed0c410: Merge "Update VoiceInteractionService from...
Dianne Hackborn [Tue, 2 Jun 2015 19:20:33 +0000 (19:20 +0000)]
am 4f57deb9: am 0d69c19d: am 9ed0c410: Merge "Update VoiceInteractionService from API review." into mnc-dev

* commit '4f57deb99025c6d625ffb17eba92190670a26f67':
  Update VoiceInteractionService from API review.

9 years agoam cff4394d: am 27e104d5: am e1c68765: Merge "ActionBar menu text should look like...
Alan Viverette [Tue, 2 Jun 2015 19:20:27 +0000 (19:20 +0000)]
am cff4394d: am 27e104d5: am e1c68765: Merge "ActionBar menu text should look like Button" into mnc-dev

* commit 'cff4394db1ad467f058828cd013ca29065fab1f4':
  ActionBar menu text should look like Button

9 years agoam 7689a967: am dcab9a13: am fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to...
Raph Levien [Tue, 2 Jun 2015 19:20:21 +0000 (19:20 +0000)]
am 7689a967: am dcab9a13: am fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev

* commit '7689a967a76a8ddd827be9efd8b2b1b6c60f8648':
  Revert "Revert "Use getRunAdvance to position cursor""

9 years agoam 9a5b45c1: am 49ceab84: am e0e5c1cf: Merge "Clean up AbsListView constructor" into...
Alan Viverette [Tue, 2 Jun 2015 19:20:15 +0000 (19:20 +0000)]
am 9a5b45c1: am 49ceab84: am e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev

* commit '9a5b45c1e1e91f00fed6d84876a670f5278f934f':
  Clean up AbsListView constructor

9 years agoam e7a9ba99: am 8fe47569: am eb8a51f3: Merge "MediaPlayer: trigger onError instead...
Robert Shih [Tue, 2 Jun 2015 19:20:09 +0000 (19:20 +0000)]
am e7a9ba99: am 8fe47569: am eb8a51f3: Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev

* commit 'e7a9ba9934a6d6ef13ca2f072a41bf342d8c4ac0':
  MediaPlayer: trigger onError instead of exception on stale native notifications

9 years agoam 4e915dff: am 168bfef1: Merge "pass a defensive copy of DhcpResults" into mnc-dev
Erik Kline [Tue, 2 Jun 2015 14:24:29 +0000 (14:24 +0000)]
am 4e915dff: am 168bfef1: Merge "pass a defensive copy of DhcpResults" into mnc-dev

* commit '4e915dff5b09f92546f1b9113aa6dcb66498eca9':
  pass a defensive copy of DhcpResults

9 years agoam 2590a679: am 417820bb: am 65f6996a: (-s ours) am eb4bd19e: Terminate loop properly...
Jeff Brown [Tue, 2 Jun 2015 14:24:20 +0000 (14:24 +0000)]
am 2590a679: am 417820bb: am 65f6996a: (-s ours) am eb4bd19e: Terminate loop properly when cursor window is full. DO NOT MERGE

* commit '2590a679f60a874928ca2b6c25670ef600bed5cd':
  Terminate loop properly when cursor window is full. DO NOT MERGE

9 years agoam ac00438d: am 708f57f4: Un-hide connectGatt() variant with selective transport
Andre Eisenbach [Tue, 2 Jun 2015 14:24:10 +0000 (14:24 +0000)]
am ac00438d: am 708f57f4: Un-hide connectGatt() variant with selective transport

* commit 'ac00438d00e42f49b1d278bbd0d632e7caeef137':
  Un-hide connectGatt() variant with selective transport

9 years agoam cf4a301f: am 11df5b66: Merge "Track camera and flashlight usage in battery stats...
Ruben Brunk [Tue, 2 Jun 2015 14:24:01 +0000 (14:24 +0000)]
am cf4a301f: am 11df5b66: Merge "Track camera and flashlight usage in battery stats." into mnc-dev

* commit 'cf4a301fa94f71e46cccbceeb8e8e9910eeb714a':
  Track camera and flashlight usage in battery stats.

9 years agoam 44499ecc: am 082138cd: am 348d0a68: am 7af35669: docs: Added Javadocs for Testing...
Quddus Chong [Tue, 2 Jun 2015 14:23:53 +0000 (14:23 +0000)]
am 44499ecc: am 082138cd: am 348d0a68: am 7af35669: docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922

* commit '44499ecc056805f65deed38a6ecce0aa08a90200':
  docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922

9 years agoam ca15c039: am 405e895c: Merge "Fix issue related selecting of "Contact sharing...
Sanket Padawe [Tue, 2 Jun 2015 14:23:48 +0000 (14:23 +0000)]
am ca15c039: am 405e895c: Merge "Fix issue related selecting of "Contact sharing" in BT Settings." into mnc-dev

* commit 'ca15c039d064edceb1b9194f30533fc9e679040e':
  Fix issue related selecting of "Contact sharing" in BT Settings.

9 years agoam 8ed46d3f: am a0b77dd5: Merge "Fix TextView ActionMode overflow finishes the Action...
Clara Bayarri [Tue, 2 Jun 2015 14:23:44 +0000 (14:23 +0000)]
am 8ed46d3f: am a0b77dd5: Merge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev

* commit '8ed46d3f0a3a30414b178b41ea7160bac46ea3d7':
  Fix TextView ActionMode overflow finishes the ActionMode

9 years agoam 4ebfd76a: am d63a1776: Merge "Make Text Selection Action Mode secondary items...
Clara Bayarri [Tue, 2 Jun 2015 14:23:39 +0000 (14:23 +0000)]
am 4ebfd76a: am d63a1776: Merge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev

* commit '4ebfd76a8975cd90edea06343d6a6aba586712b5':
  Make Text Selection Action Mode secondary items IF_ROOM

9 years agoam 3e033267: am fa3f17f1: Merge "Don\'t take the compatibility path for non-primary...
Adam Powell [Tue, 2 Jun 2015 14:23:32 +0000 (14:23 +0000)]
am 3e033267: am fa3f17f1: Merge "Don\'t take the compatibility path for non-primary ActionModes" into mnc-dev

* commit '3e03326719f7e4481c3204e834bc1c8fbdfd3466':
  Don't take the compatibility path for non-primary ActionModes

9 years agoam fcec13f0: am 4982e7b4: Merge "Don\'t add real children for a view with a node...
Svetoslav [Tue, 2 Jun 2015 14:23:14 +0000 (14:23 +0000)]
am fcec13f0: am 4982e7b4: Merge "Don\'t add real children for a view with a node provider" into mnc-dev

* commit 'fcec13f095186f95bd8483d7ea226944e8913cb4':
  Don't add real children for a view with a node provider

9 years agoam a60e4b08: am 03a7c4c6: Fix shared drawable state
Jorim Jaggi [Tue, 2 Jun 2015 14:23:03 +0000 (14:23 +0000)]
am a60e4b08: am 03a7c4c6: Fix shared drawable state

* commit 'a60e4b08a0e7d536c930f5455f568d75b558e396':
  Fix shared drawable state

9 years agoam bbf5b460: am acbe426b: Merge "Add accidentally deleted strings." into mnc-dev
Svetoslav [Tue, 2 Jun 2015 14:22:52 +0000 (14:22 +0000)]
am bbf5b460: am acbe426b: Merge "Add accidentally deleted strings." into mnc-dev

* commit 'bbf5b4600bdbcf48656a6fb30b4d9518e722b733':
  Add accidentally deleted strings.

9 years agoam e94bc219: am 8a6d511d: Merge "Remove ViewAssistStructure and use the frameworks...
Selim Gurun [Tue, 2 Jun 2015 14:22:47 +0000 (14:22 +0000)]
am e94bc219: am 8a6d511d: Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev

* commit 'e94bc219668b99c010f86bf4742b0b3d477e9d0b':
  Remove ViewAssistStructure and use the frameworks data structure

9 years agoam bbc27621: am b0f94ae5: Merge "Always send VIEW_CLICKED event from AdapterView...
Alan Viverette [Tue, 2 Jun 2015 14:22:40 +0000 (14:22 +0000)]
am bbc27621: am b0f94ae5: Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev

* commit 'bbc27621b5cb9eee66b254c08a22fd8b148b7b39':
  Always send VIEW_CLICKED event from AdapterView.performItemClick()

9 years agoam 56650141: am 717a2d09: Merge "Camera2: Remove isLoggable" into mnc-dev
Eino-Ville Talvala [Tue, 2 Jun 2015 14:22:35 +0000 (14:22 +0000)]
am 56650141: am 717a2d09: Merge "Camera2: Remove isLoggable" into mnc-dev

* commit '5665014117a322bdec630adc38cb296195e9086b':
  Camera2: Remove isLoggable

9 years agoam 17fa101c: am 0505f7f2: Merge "Terminate loop properly when cursor window is full...
Jeff Brown [Tue, 2 Jun 2015 14:22:27 +0000 (14:22 +0000)]
am 17fa101c: am 0505f7f2: Merge "Terminate loop properly when cursor window is full." into mnc-dev

* commit '17fa101c3744dc0834b86f0841cf29bbfd1f6f29':
  Terminate loop properly when cursor window is full.

9 years agoam c474645a: am c45d6c30: Merge "Translucent bars in landscape" into mnc-dev
Adrian Roos [Tue, 2 Jun 2015 14:22:20 +0000 (14:22 +0000)]
am c474645a: am c45d6c30: Merge "Translucent bars in landscape" into mnc-dev

* commit 'c474645ab8555ce1226f5f72a8a9fafe18965bbf':
  Translucent bars in landscape

9 years agoam ef0647b6: am 346222f9: Merge "LayoutLib: Skip classes from java package." into...
Deepanshu Gupta [Tue, 2 Jun 2015 14:22:13 +0000 (14:22 +0000)]
am ef0647b6: am 346222f9: Merge "LayoutLib: Skip classes from java package." into mnc-dev

* commit 'ef0647b625c82b64e0ee4e1ea197697cd793c7cf':
  LayoutLib: Skip classes from java package.

9 years agoam d61ff1cf: am 7ef93d15: Merge "Skip warnings for some unresolved references." into...
Deepanshu Gupta [Tue, 2 Jun 2015 14:22:08 +0000 (14:22 +0000)]
am d61ff1cf: am 7ef93d15: Merge "Skip warnings for some unresolved references." into mnc-dev

* commit 'd61ff1cf099c16cf38d095e6e401d92f9205b78f':
  Skip warnings for some unresolved references.

9 years agoam e2c09c2f: am 133b107d: am 65b7485d: am 2b95561d: docs: Fixed typo for confirm...
Quddus Chong [Tue, 2 Jun 2015 14:22:03 +0000 (14:22 +0000)]
am e2c09c2f: am 133b107d: am 65b7485d: am 2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug: 21444273

* commit 'e2c09c2f975c187af3270bc36f2b92019339f74a':
  docs: Fixed typo for confirm credentials section in the API Overview. bug: 21444273

9 years agoam c50bb5b4: am c85cd734: Merge "Don\'t focus view for invalid task index." into...
Winson Chung [Tue, 2 Jun 2015 14:21:57 +0000 (14:21 +0000)]
am c50bb5b4: am c85cd734: Merge "Don\'t focus view for invalid task index." into mnc-dev

* commit 'c50bb5b46255b0e1d7426401ef6c4f4381e8159e':
  Don't focus view for invalid task index.

9 years agoam ecb6be7d: am dc49d5f8: Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS...
Adam Powell [Tue, 2 Jun 2015 14:21:46 +0000 (14:21 +0000)]
am ecb6be7d: am dc49d5f8: Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev

* commit 'ecb6be7d2889c2bb09179239817578fbb465bc99':
  Fix one-action choosers with EXTRA_INITIAL_INTENTS

9 years agoam 6b725182: am 29780eec: Merge "Cleanup Video API javadoc." into mnc-dev
Tyler Gunn [Tue, 2 Jun 2015 14:21:40 +0000 (14:21 +0000)]
am 6b725182: am 29780eec: Merge "Cleanup Video API javadoc." into mnc-dev

* commit '6b725182f58af150922a10a880c06f26c223acb9':
  Cleanup Video API javadoc.

9 years agoam 2f395f32: am 0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev
Tyler Gunn [Tue, 2 Jun 2015 14:21:33 +0000 (14:21 +0000)]
am 2f395f32: am 0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev

* commit '2f395f3233092032be55e4148edc7b8cb3d0697b':
  IMS: Conference fixes

9 years agoam 0d69c19d: am 9ed0c410: Merge "Update VoiceInteractionService from API review....
Dianne Hackborn [Tue, 2 Jun 2015 14:21:28 +0000 (14:21 +0000)]
am 0d69c19d: am 9ed0c410: Merge "Update VoiceInteractionService from API review." into mnc-dev

* commit '0d69c19dcdc3df11c28d3981b086c40e94d860be':
  Update VoiceInteractionService from API review.

9 years agoam 27e104d5: am e1c68765: Merge "ActionBar menu text should look like Button" into...
Alan Viverette [Tue, 2 Jun 2015 14:21:13 +0000 (14:21 +0000)]
am 27e104d5: am e1c68765: Merge "ActionBar menu text should look like Button" into mnc-dev

* commit '27e104d56fc115c940429998c10d4bc7519f2f2d':
  ActionBar menu text should look like Button

9 years agoam dcab9a13: am fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor...
Raph Levien [Tue, 2 Jun 2015 14:21:07 +0000 (14:21 +0000)]
am dcab9a13: am fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev

* commit 'dcab9a13f7220d4e29ecc18526ee17ccbd3b1b9f':
  Revert "Revert "Use getRunAdvance to position cursor""

9 years agoam 49ceab84: am e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev
Alan Viverette [Tue, 2 Jun 2015 14:21:01 +0000 (14:21 +0000)]
am 49ceab84: am e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev

* commit '49ceab843872ea562d8deefc54ff86bf6dc3ba5f':
  Clean up AbsListView constructor

9 years agoam 8fe47569: am eb8a51f3: Merge "MediaPlayer: trigger onError instead of exception...
Robert Shih [Tue, 2 Jun 2015 14:20:55 +0000 (14:20 +0000)]
am 8fe47569: am eb8a51f3: Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev

* commit '8fe47569912ffa5b98d9b092e63b7b1f0cd5f69b':
  MediaPlayer: trigger onError instead of exception on stale native notifications

9 years agoMerge "Fix text on move notifications and toasts."
Ben Kwa [Tue, 2 Jun 2015 14:20:35 +0000 (14:20 +0000)]
Merge "Fix text on move notifications and toasts."

9 years agoam 168bfef1: Merge "pass a defensive copy of DhcpResults" into mnc-dev
Erik Kline [Tue, 2 Jun 2015 07:55:46 +0000 (07:55 +0000)]
am 168bfef1: Merge "pass a defensive copy of DhcpResults" into mnc-dev

* commit '168bfef182b8e631c93404f4e9e9c0176aa66ece':
  pass a defensive copy of DhcpResults

9 years agoMerge "pass a defensive copy of DhcpResults" into mnc-dev
Erik Kline [Tue, 2 Jun 2015 07:42:53 +0000 (07:42 +0000)]
Merge "pass a defensive copy of DhcpResults" into mnc-dev

9 years agopass a defensive copy of DhcpResults
Erik Kline [Tue, 2 Jun 2015 06:51:45 +0000 (15:51 +0900)]
pass a defensive copy of DhcpResults

Also: correct state transition handling in DhcpBoundState#enter().

Bug: 20451261
Change-Id: I3be50f6b1b3fae179d6fff7ca8ae1d687caa3221

9 years agoam 417820bb: am 65f6996a: (-s ours) am eb4bd19e: Terminate loop properly when cursor...
Jeff Brown [Tue, 2 Jun 2015 03:56:32 +0000 (03:56 +0000)]
am 417820bb: am 65f6996a: (-s ours) am eb4bd19e: Terminate loop properly when cursor window is full. DO NOT MERGE

* commit '417820bb60d2daeb9238a8b6a50a6155abf60b2d':
  Terminate loop properly when cursor window is full. DO NOT MERGE

9 years agoam 65f6996a: (-s ours) am eb4bd19e: Terminate loop properly when cursor window is...
Jeff Brown [Tue, 2 Jun 2015 03:45:27 +0000 (03:45 +0000)]
am 65f6996a: (-s ours) am eb4bd19e: Terminate loop properly when cursor window is full. DO NOT MERGE

* commit '65f6996add7fe38000b5e28675b70064cec31837':
  Terminate loop properly when cursor window is full. DO NOT MERGE

9 years agoam eb4bd19e: Terminate loop properly when cursor window is full. DO NOT MERGE
Jeff Brown [Tue, 2 Jun 2015 03:33:31 +0000 (03:33 +0000)]
am eb4bd19e: Terminate loop properly when cursor window is full. DO NOT MERGE

* commit 'eb4bd19ef09b2c277347b08c4a050f01f686c9c2':
  Terminate loop properly when cursor window is full. DO NOT MERGE

9 years agoam 708f57f4: Un-hide connectGatt() variant with selective transport
Andre Eisenbach [Tue, 2 Jun 2015 02:38:48 +0000 (02:38 +0000)]
am 708f57f4: Un-hide connectGatt() variant with selective transport

* commit '708f57f4dc34587cd9a0b507fda20555a94c4755':
  Un-hide connectGatt() variant with selective transport

9 years agoUn-hide connectGatt() variant with selective transport
Andre Eisenbach [Thu, 14 May 2015 21:48:00 +0000 (14:48 -0700)]
Un-hide connectGatt() variant with selective transport

Change-Id: I1d3c512160de2bd68550faf243bb151d5cf7f3c9

9 years agoam 11df5b66: Merge "Track camera and flashlight usage in battery stats." into mnc-dev
Ruben Brunk [Tue, 2 Jun 2015 01:57:03 +0000 (01:57 +0000)]
am 11df5b66: Merge "Track camera and flashlight usage in battery stats." into mnc-dev

* commit '11df5b66ef621c4d67f5b4980e879784de43fd70':
  Track camera and flashlight usage in battery stats.

9 years agoMerge "Track camera and flashlight usage in battery stats." into mnc-dev
Ruben Brunk [Tue, 2 Jun 2015 01:48:21 +0000 (01:48 +0000)]
Merge "Track camera and flashlight usage in battery stats." into mnc-dev

9 years agoam 082138cd: am 348d0a68: am 7af35669: docs: Added Javadocs for Testing Support Libra...
Quddus Chong [Tue, 2 Jun 2015 01:37:59 +0000 (01:37 +0000)]
am 082138cd: am 348d0a68: am 7af35669: docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922

* commit '082138cd1cfbd6251c71df0cf955381e9c703652':
  docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922

9 years agoam 405e895c: Merge "Fix issue related selecting of "Contact sharing" in BT Settings...
Sanket Padawe [Tue, 2 Jun 2015 01:25:52 +0000 (01:25 +0000)]
am 405e895c: Merge "Fix issue related selecting of "Contact sharing" in BT Settings." into mnc-dev

* commit '405e895c987b556f0e23b953215d770de6a43c78':
  Fix issue related selecting of "Contact sharing" in BT Settings.

9 years agoam a0b77dd5: Merge "Fix TextView ActionMode overflow finishes the ActionMode" into...
Clara Bayarri [Tue, 2 Jun 2015 01:25:47 +0000 (01:25 +0000)]
am a0b77dd5: Merge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev

* commit 'a0b77dd5e2a6011291810db392be0981ed73aa97':
  Fix TextView ActionMode overflow finishes the ActionMode

9 years agoam d63a1776: Merge "Make Text Selection Action Mode secondary items IF_ROOM" into...
Clara Bayarri [Tue, 2 Jun 2015 01:25:42 +0000 (01:25 +0000)]
am d63a1776: Merge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev

* commit 'd63a177670a5f459f3380daff32e4561b0d5d26c':
  Make Text Selection Action Mode secondary items IF_ROOM

9 years agoam 348d0a68: am 7af35669: docs: Added Javadocs for Testing Support Library v0.3 and...
Quddus Chong [Tue, 2 Jun 2015 01:25:21 +0000 (01:25 +0000)]
am 348d0a68: am 7af35669: docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922

* commit '348d0a68ad317877061f23da512144b0e4c2dc7c':
  docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922

9 years agoMerge "Fix issue related selecting of "Contact sharing" in BT Settings." into mnc-dev
Sanket Padawe [Tue, 2 Jun 2015 01:20:25 +0000 (01:20 +0000)]
Merge "Fix issue related selecting of "Contact sharing" in BT Settings." into mnc-dev

9 years agoMerge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev
Clara Bayarri [Tue, 2 Jun 2015 01:15:44 +0000 (01:15 +0000)]
Merge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev

9 years agoMerge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev
Clara Bayarri [Tue, 2 Jun 2015 01:15:02 +0000 (01:15 +0000)]
Merge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev

9 years agoam fa3f17f1: Merge "Don\'t take the compatibility path for non-primary ActionModes...
Adam Powell [Tue, 2 Jun 2015 01:13:34 +0000 (01:13 +0000)]
am fa3f17f1: Merge "Don\'t take the compatibility path for non-primary ActionModes" into mnc-dev

* commit 'fa3f17f117c6ce04e60b2e38b22e2c1c6ec34072':
  Don't take the compatibility path for non-primary ActionModes

9 years agoam 7af35669: docs: Added Javadocs for Testing Support Library v0.3 and updated the...
Quddus Chong [Tue, 2 Jun 2015 01:07:57 +0000 (01:07 +0000)]
am 7af35669: docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922

* commit '7af3566912b0e014cfd1704acdeb31a0a7cca0d3':
  docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922

9 years agoMerge "Don't take the compatibility path for non-primary ActionModes" into mnc-dev
Adam Powell [Tue, 2 Jun 2015 01:00:05 +0000 (01:00 +0000)]
Merge "Don't take the compatibility path for non-primary ActionModes" into mnc-dev

9 years agoam 4982e7b4: Merge "Don\'t add real children for a view with a node provider" into...
Svetoslav [Tue, 2 Jun 2015 00:30:00 +0000 (00:30 +0000)]
am 4982e7b4: Merge "Don\'t add real children for a view with a node provider" into mnc-dev

* commit '4982e7b4dce8afe2a5490ac6a6630039946b782f':
  Don't add real children for a view with a node provider

9 years agoMerge "Don't add real children for a view with a node provider" into mnc-dev
Svetoslav [Tue, 2 Jun 2015 00:22:38 +0000 (00:22 +0000)]
Merge "Don't add real children for a view with a node provider" into mnc-dev

9 years agoDon't add real children for a view with a node provider
Svetoslav [Tue, 2 Jun 2015 00:21:59 +0000 (17:21 -0700)]
Don't add real children for a view with a node provider

Change-Id: I1dd43fa5ff93e8eb76e2c7587fb13cd1ef097678

9 years agodocs: Added Javadocs for Testing Support Library v0.3 and updated
Quddus Chong [Wed, 27 May 2015 23:07:54 +0000 (16:07 -0700)]
docs: Added Javadocs for Testing Support Library v0.3 and updated
the corresponding setup instructions.
bug: 21442922

Change-Id: I7374e8102fc95377e83db738ab7ff20510e04faa

9 years agoam 03a7c4c6: Fix shared drawable state
Jorim Jaggi [Tue, 2 Jun 2015 00:09:46 +0000 (00:09 +0000)]
am 03a7c4c6: Fix shared drawable state

* commit '03a7c4c6d4f30416b3fa6e9018f098c0fa41bbd5':
  Fix shared drawable state

9 years agoTerminate loop properly when cursor window is full. DO NOT MERGE
Jeff Brown [Sat, 30 May 2015 01:48:38 +0000 (18:48 -0700)]
Terminate loop properly when cursor window is full. DO NOT MERGE

The existing code exits the column-filling loop immediately but
may continue to try to fill rows.  Ordinarily this should fail
too but it's possible for the process to continue and then
blow up a little later.  Fixed this problem by exiting the row-
filling loop promptly.

Bug: 21406130
Change-Id: Ifab59188d5d1b40f3c1f5c97604dd48da71bf37b
(cherry picked from commit bb8c841e909a2fb967db2ad3b9f8b058f9b849e8)

9 years agoFix shared drawable state
Jorim Jaggi [Mon, 1 Jun 2015 23:25:39 +0000 (16:25 -0700)]
Fix shared drawable state

Not calling mutate here had a side-effect making the icon in the
status bar untintable in SysUI.

Bug: 21566007
Change-Id: Ifb78c81ba7f04d496f14031ef635a6e964e6280e

9 years agoam acbe426b: Merge "Add accidentally deleted strings." into mnc-dev
Svetoslav [Mon, 1 Jun 2015 23:56:49 +0000 (23:56 +0000)]
am acbe426b: Merge "Add accidentally deleted strings." into mnc-dev

* commit 'acbe426bbc126575e588d3cbd6bd09ee194e6dd0':
  Add accidentally deleted strings.

9 years agoam 8a6d511d: Merge "Remove ViewAssistStructure and use the frameworks data structure...
Selim Gurun [Mon, 1 Jun 2015 23:56:45 +0000 (23:56 +0000)]
am 8a6d511d: Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev

* commit '8a6d511dad3bb38f8cd1ec4557927bc6f307d4ed':
  Remove ViewAssistStructure and use the frameworks data structure

9 years agoam b0f94ae5: Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick...
Alan Viverette [Mon, 1 Jun 2015 23:56:40 +0000 (23:56 +0000)]
am b0f94ae5: Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev

* commit 'b0f94ae5d2eec2bb4a0bd1b60eb3db75417c1f8f':
  Always send VIEW_CLICKED event from AdapterView.performItemClick()

9 years agoam 717a2d09: Merge "Camera2: Remove isLoggable" into mnc-dev
Eino-Ville Talvala [Mon, 1 Jun 2015 23:56:34 +0000 (23:56 +0000)]
am 717a2d09: Merge "Camera2: Remove isLoggable" into mnc-dev

* commit '717a2d09fa2bb8ffb89e9e602ae97056736da4b0':
  Camera2: Remove isLoggable

9 years agoTrack camera and flashlight usage in battery stats.
Ruben Brunk [Wed, 27 May 2015 00:32:16 +0000 (17:32 -0700)]
Track camera and flashlight usage in battery stats.

Bug: 15986092

Change-Id: Idf03981271721c44fd43327d5d90cf6f3fecfacb

9 years agoMerge "Add accidentally deleted strings." into mnc-dev
Svetoslav [Mon, 1 Jun 2015 23:53:54 +0000 (23:53 +0000)]
Merge "Add accidentally deleted strings." into mnc-dev

9 years agoMerge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev
Selim Gurun [Mon, 1 Jun 2015 23:53:06 +0000 (23:53 +0000)]
Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev

9 years agoMerge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 23:52:35 +0000 (23:52 +0000)]
Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev

9 years agoAdd accidentally deleted strings.
Svetoslav [Mon, 1 Jun 2015 23:51:11 +0000 (16:51 -0700)]
Add accidentally deleted strings.

Change-Id: I16d7c151b46c076bfdccb1ff0b2bcb0934eedf93

9 years agoMerge "Camera2: Remove isLoggable" into mnc-dev
Eino-Ville Talvala [Mon, 1 Jun 2015 23:47:31 +0000 (23:47 +0000)]
Merge "Camera2: Remove isLoggable" into mnc-dev

9 years agoam 0505f7f2: Merge "Terminate loop properly when cursor window is full." into mnc-dev
Jeff Brown [Mon, 1 Jun 2015 23:43:24 +0000 (23:43 +0000)]
am 0505f7f2: Merge "Terminate loop properly when cursor window is full." into mnc-dev

* commit '0505f7f2b5a2e45884a97eeb75c35086a7560c69':
  Terminate loop properly when cursor window is full.

9 years agoam 4af95ede: am d9b74249: am bdd500ec: Merge "Fix FloatingToolbar look and animation...
Abodunrinwa Toki [Mon, 1 Jun 2015 23:43:05 +0000 (23:43 +0000)]
am 4af95ede: am d9b74249: am bdd500ec: Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev

* commit '4af95ede5bec291975221eb55d9c9c492d772acd':
  Fix FloatingToolbar look and animation for RTL.

9 years agoam 0c421419: am a2956f6e: am 14438d12: Merge "Camera2: Add tangential distortion...
Eino-Ville Talvala [Mon, 1 Jun 2015 23:42:59 +0000 (23:42 +0000)]
am 0c421419: am a2956f6e: am 14438d12: Merge "Camera2: Add tangential distortion coefficients" into mnc-dev

* commit '0c4214191fa93ff3c628a8461d6bd6ef2bb54d3a':
  Camera2: Add tangential distortion coefficients