OSDN Git Service

android-x86/frameworks-base.git
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 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 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 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 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 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 agoAlways send VIEW_CLICKED event from AdapterView.performItemClick()
Alan Viverette [Mon, 1 Jun 2015 23:41:42 +0000 (16:41 -0700)]
Always send VIEW_CLICKED event from AdapterView.performItemClick()

This makes it consistent with View.performClick().

Bug: 19574976
Change-Id: I00b222d56aa6fac03c2e6ead0604ee2ff3a6969d

9 years agoRemove ViewAssistStructure and use the frameworks data structure
Selim Gurun [Mon, 1 Jun 2015 23:26:10 +0000 (16:26 -0700)]
Remove ViewAssistStructure and use the frameworks data structure

As part of the API rename from ViewAssistStructure to ViewStructure,
we added a temporary workaround to prevent build breakage. Remove
the temporary workaround since the current unbundled webview package
implements the updated  onProvideVirtualStructure API.

Change-Id: I13a5b8dee3e856eb585de53a0750bd52c7a909a7

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

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

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

9 years agoam c45d6c30: Merge "Translucent bars in landscape" into mnc-dev
Adrian Roos [Mon, 1 Jun 2015 23:28:58 +0000 (23:28 +0000)]
am c45d6c30: Merge "Translucent bars in landscape" into mnc-dev

* commit 'c45d6c30a58062af05d8232fd0f020e3f854bb8a':
  Translucent bars in landscape

9 years agoam 346222f9: Merge "LayoutLib: Skip classes from java package." into mnc-dev
Deepanshu Gupta [Mon, 1 Jun 2015 23:28:53 +0000 (23:28 +0000)]
am 346222f9: Merge "LayoutLib: Skip classes from java package." into mnc-dev

* commit '346222f90a723787e2625329a75ec0dfc35a3f4d':
  LayoutLib: Skip classes from java package.

9 years agoam 7ef93d15: Merge "Skip warnings for some unresolved references." into mnc-dev
Deepanshu Gupta [Mon, 1 Jun 2015 23:28:48 +0000 (23:28 +0000)]
am 7ef93d15: Merge "Skip warnings for some unresolved references." into mnc-dev

* commit '7ef93d157344b07e17715b0fa6e69a4d97154dfa':
  Skip warnings for some unresolved references.

9 years agoMerge "Translucent bars in landscape" into mnc-dev
Adrian Roos [Mon, 1 Jun 2015 23:25:33 +0000 (23:25 +0000)]
Merge "Translucent bars in landscape" into mnc-dev

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

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

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

* commit 'a2956f6e059e8565a0f6d48ea3c85cc827bffdb4':
  Camera2: Add tangential distortion coefficients

9 years agoam 0a44e64a: am 9d28852f: Merge "Remove separate light/dark animated vector drawables...
Andrew Flynn [Mon, 1 Jun 2015 23:21:55 +0000 (23:21 +0000)]
am 0a44e64a: am 9d28852f: Merge "Remove separate light/dark animated vector drawables" into mnc-dev

* commit '0a44e64a8299277f58d29bfae94bb7db6e78cb86':
  Remove separate light/dark animated vector drawables

9 years agoam e63136a3: am 8c1e287b: Merge "Fix RenderScript copy tracing sections" into mnc-dev
Chris Craik [Mon, 1 Jun 2015 23:21:50 +0000 (23:21 +0000)]
am e63136a3: am 8c1e287b: Merge "Fix RenderScript copy tracing sections" into mnc-dev

* commit 'e63136a36ec6e5f22d53654c85b8b3eb0b19cb27':
  Fix RenderScript copy tracing sections

9 years agoam 133b107d: am 65b7485d: am 2b95561d: docs: Fixed typo for confirm credentials secti...
Quddus Chong [Mon, 1 Jun 2015 23:21:40 +0000 (23:21 +0000)]
am 133b107d: am 65b7485d: am 2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug: 21444273

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

9 years agoam c85cd734: Merge "Don\'t focus view for invalid task index." into mnc-dev
Winson Chung [Mon, 1 Jun 2015 23:21:35 +0000 (23:21 +0000)]
am c85cd734: Merge "Don\'t focus view for invalid task index." into mnc-dev

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

9 years agoMerge "LayoutLib: Skip classes from java package." into mnc-dev
Deepanshu Gupta [Mon, 1 Jun 2015 23:20:11 +0000 (23:20 +0000)]
Merge "LayoutLib: Skip classes from java package." into mnc-dev

9 years agoMerge "Skip warnings for some unresolved references." into mnc-dev
Deepanshu Gupta [Mon, 1 Jun 2015 23:20:03 +0000 (23:20 +0000)]
Merge "Skip warnings for some unresolved references." into mnc-dev

9 years agoam 65b7485d: am 2b95561d: docs: Fixed typo for confirm credentials section in the...
Quddus Chong [Mon, 1 Jun 2015 23:11:47 +0000 (23:11 +0000)]
am 65b7485d: am 2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug: 21444273

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

9 years agoMerge "Don't focus view for invalid task index." into mnc-dev
Winson Chung [Mon, 1 Jun 2015 23:07:36 +0000 (23:07 +0000)]
Merge "Don't focus view for invalid task index." into mnc-dev

9 years agoDon't focus view for invalid task index.
Winson Chung [Mon, 1 Jun 2015 23:02:58 +0000 (16:02 -0700)]
Don't focus view for invalid task index.

Bug: 21322861
Change-Id: I7b8397d18b488bd8f459e578b64d6e82e4f1437d

9 years agoTranslucent bars in landscape
Adrian Roos [Wed, 27 May 2015 01:30:37 +0000 (18:30 -0700)]
Translucent bars in landscape

Bug: 18739556
Change-Id: Ib9602a9d1f09e6bd6c1306927990676120dff012

9 years agoam dc49d5f8: Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev
Adam Powell [Mon, 1 Jun 2015 22:40:22 +0000 (22:40 +0000)]
am dc49d5f8: Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev

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

9 years agoam 29780eec: Merge "Cleanup Video API javadoc." into mnc-dev
Tyler Gunn [Mon, 1 Jun 2015 22:40:17 +0000 (22:40 +0000)]
am 29780eec: Merge "Cleanup Video API javadoc." into mnc-dev

* commit '29780eecd06bddcd33692c06075f8c5390b88357':
  Cleanup Video API javadoc.

9 years agoam 0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev
Tyler Gunn [Mon, 1 Jun 2015 22:40:13 +0000 (22:40 +0000)]
am 0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev

* commit '0feb9c9cf947deb893f5a400489ecf7e48626281':
  IMS: Conference fixes

9 years agoam 9ed0c410: Merge "Update VoiceInteractionService from API review." into mnc-dev
Dianne Hackborn [Mon, 1 Jun 2015 22:40:07 +0000 (22:40 +0000)]
am 9ed0c410: Merge "Update VoiceInteractionService from API review." into mnc-dev

* commit '9ed0c4109df27c0956f97b7a074c0b67daa0ebd8':
  Update VoiceInteractionService from API review.

9 years agoMerge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev
Adam Powell [Mon, 1 Jun 2015 22:37:37 +0000 (22:37 +0000)]
Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev

9 years agoMerge "Cleanup Video API javadoc." into mnc-dev
Tyler Gunn [Mon, 1 Jun 2015 22:35:28 +0000 (22:35 +0000)]
Merge "Cleanup Video API javadoc." into mnc-dev

9 years agoMerge "IMS: Conference fixes" into mnc-dev
Tyler Gunn [Mon, 1 Jun 2015 22:33:57 +0000 (22:33 +0000)]
Merge "IMS: Conference fixes" into mnc-dev

9 years agoMerge "Update VoiceInteractionService from API review." into mnc-dev
Dianne Hackborn [Mon, 1 Jun 2015 22:28:44 +0000 (22:28 +0000)]
Merge "Update VoiceInteractionService from API review." into mnc-dev

9 years agoam e1c68765: Merge "ActionBar menu text should look like Button" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 22:15:08 +0000 (22:15 +0000)]
am e1c68765: Merge "ActionBar menu text should look like Button" into mnc-dev

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

9 years agoam fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor""" into...
Raph Levien [Mon, 1 Jun 2015 22:10:07 +0000 (22:10 +0000)]
am fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev

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

9 years agoam e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 22:10:02 +0000 (22:10 +0000)]
am e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev

* commit 'e0e5c1cf1965302fcf177eaade372313504ea53a':
  Clean up AbsListView constructor

9 years agoam eb8a51f3: Merge "MediaPlayer: trigger onError instead of exception on stale native...
Robert Shih [Mon, 1 Jun 2015 22:09:57 +0000 (22:09 +0000)]
am eb8a51f3: Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev

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

9 years agoMerge "ActionBar menu text should look like Button" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 22:08:27 +0000 (22:08 +0000)]
Merge "ActionBar menu text should look like Button" into mnc-dev

9 years agoMerge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev
Raph Levien [Mon, 1 Jun 2015 21:41:58 +0000 (21:41 +0000)]
Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev

9 years agoMerge "Clean up AbsListView constructor" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 21:56:34 +0000 (21:56 +0000)]
Merge "Clean up AbsListView constructor" into mnc-dev

9 years agoMerge "MediaPlayer: trigger onError instead of exception on stale native notification...
Robert Shih [Mon, 1 Jun 2015 21:55:49 +0000 (21:55 +0000)]
Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev

9 years agoIMS: Conference fixes
Tyler Gunn [Mon, 1 Jun 2015 21:29:11 +0000 (14:29 -0700)]
IMS: Conference fixes

- Set phoneaccount to Conference
- Handle conference call in DIALING state

Change-Id: I549bf664724473f0d5d4450cbc8d96f7b534f43a
Bug: 21376607

9 years agoLayoutLib: Skip classes from java package.
Deepanshu Gupta [Mon, 1 Jun 2015 21:21:24 +0000 (14:21 -0700)]
LayoutLib: Skip classes from java package.

Classes in "java" package can't be defined at runtime anyway. No use
including them in LayoutLib.

Change-Id: I7e7c46f0d74e32c893b23093828569b4fa5e3a73

9 years agoam bdd500ec: Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev
Abodunrinwa Toki [Mon, 1 Jun 2015 21:42:27 +0000 (21:42 +0000)]
am bdd500ec: Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev

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

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

* commit '14438d122c1e7ab88a6169bca13a35d50e76e91e':
  Camera2: Add tangential distortion coefficients

9 years agoam 9d28852f: Merge "Remove separate light/dark animated vector drawables" into mnc-dev
Andrew Flynn [Mon, 1 Jun 2015 21:42:08 +0000 (21:42 +0000)]
am 9d28852f: Merge "Remove separate light/dark animated vector drawables" into mnc-dev

* commit '9d28852f6108b20266de0282f4bf858e679316b7':
  Remove separate light/dark animated vector drawables

9 years agoam 8c1e287b: Merge "Fix RenderScript copy tracing sections" into mnc-dev
Chris Craik [Mon, 1 Jun 2015 21:41:40 +0000 (21:41 +0000)]
am 8c1e287b: Merge "Fix RenderScript copy tracing sections" into mnc-dev

* commit '8c1e287bf801d98cbaa6df904524625c3935fdd0':
  Fix RenderScript copy tracing sections

9 years agoSkip warnings for some unresolved references.
Deepanshu Gupta [Wed, 27 May 2015 19:35:56 +0000 (12:35 -0700)]
Skip warnings for some unresolved references.

Some applications rename the newer RTL attributes to the older
attributes in order to target RTL locales, but not need to include two
attributes everywhere it's needed. For example, iosched renames
paddingStart to paddingLeft (among other attributes) for API 17 and
above. This leads to hundreds of warnings about missing attributes.
This change suppresses such warnings.

Also, skip adding unresolved attributes to the typed array. This is more
in line with the actual implementation on device, and prevents
unexpected warnings/errors/crashes later.

Change-Id: Iee616fa6295aa9731ede0cf9dcd6dd2bd1fe8f20

9 years agoRevert "Revert "Use getRunAdvance to position cursor""
Raph Levien [Mon, 1 Jun 2015 21:34:47 +0000 (14:34 -0700)]
Revert "Revert "Use getRunAdvance to position cursor""

This reverts commit 5730c974800a0ffed59a041d9e249a5c42e417db.

9 years agoam 2b95561d: docs: Fixed typo for confirm credentials section in the API Overview...
Quddus Chong [Mon, 1 Jun 2015 21:31:23 +0000 (21:31 +0000)]
am 2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug: 21444273

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

9 years agoMerge "Fix FloatingToolbar look and animation for RTL." into mnc-dev
Abodunrinwa Toki [Mon, 1 Jun 2015 21:31:19 +0000 (21:31 +0000)]
Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev

9 years agoMerge "Camera2: Add tangential distortion coefficients" into mnc-dev
Eino-Ville Talvala [Mon, 1 Jun 2015 21:26:01 +0000 (21:26 +0000)]
Merge "Camera2: Add tangential distortion coefficients" into mnc-dev

9 years agodocs: Fixed typo for confirm credentials section in the API Overview.
Quddus Chong [Mon, 1 Jun 2015 21:05:12 +0000 (14:05 -0700)]
docs: Fixed typo for confirm credentials section in the API Overview.
bug: 21444273

Change-Id: I01700e95227e5f7c09a5d6428877087d7ff0121a

9 years agoMerge "Remove separate light/dark animated vector drawables" into mnc-dev
Andrew Flynn [Mon, 1 Jun 2015 21:11:51 +0000 (21:11 +0000)]
Merge "Remove separate light/dark animated vector drawables" into mnc-dev

9 years agoMerge "Fix RenderScript copy tracing sections" into mnc-dev
Chris Craik [Mon, 1 Jun 2015 20:58:01 +0000 (20:58 +0000)]
Merge "Fix RenderScript copy tracing sections" into mnc-dev

9 years agoMediaPlayer: trigger onError instead of exception on stale native notifications
Robert Shih [Thu, 28 May 2015 01:11:44 +0000 (18:11 -0700)]
MediaPlayer: trigger onError instead of exception on stale native notifications

This change also reverted commit 2c838fbd87ad5685c0008b419ea02421159b9b70,
"MediaPlayer: add mPreparing to weed out unwanted prepared messages".

Bug: 21266735
Change-Id: I392342519420bee2fde1fe1915c51d24101ca27d

9 years agoRemove separate light/dark animated vector drawables
Andrew Flynn [Mon, 1 Jun 2015 20:34:21 +0000 (16:34 -0400)]
Remove separate light/dark animated vector drawables

Now that AnimatedVectorDrawables can use themed animations, SysUI no longer
needs to track separate AVDs for the carrier network change icons.

Bug: 21118142
Change-Id: Ifb6d7b5e7e3de85c10bc13183b4142fd2e6714b6

9 years agoam 598d143a: am 88fb1453: Merge "DO NOT MERGE Fix bug regarding the comparator sorts...
Chris Tate [Mon, 1 Jun 2015 20:27:42 +0000 (20:27 +0000)]
am 598d143a: am 88fb1453: Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev

* commit '598d143a0e0b211e3929a355afbffb7719404f1a':
  DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order.

9 years agoam 587ae867: am b0db15c6: Merge "Next alarm clock updates." into mnc-dev
John Spurlock [Mon, 1 Jun 2015 20:27:37 +0000 (20:27 +0000)]
am 587ae867: am b0db15c6: Merge "Next alarm clock updates." into mnc-dev

* commit '587ae8679d425bc18771a07622279c566e590db3':
  Next alarm clock updates.

9 years agoam 19390a64: am 78b16987: Merge "Change colors of AVD test" into mnc-dev
Andrew Flynn [Mon, 1 Jun 2015 20:27:32 +0000 (20:27 +0000)]
am 19390a64: am 78b16987: Merge "Change colors of AVD test" into mnc-dev

* commit '19390a6458ed14ed35d5d7c36dbfd1c58bee1b90':
  Change colors of AVD test

9 years agoam 88fb1453: Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into...
Chris Tate [Mon, 1 Jun 2015 20:20:54 +0000 (20:20 +0000)]
am 88fb1453: Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev

* commit '88fb14532421f049614c34120c706c26a9af6bbd':
  DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order.

9 years agoam b0db15c6: Merge "Next alarm clock updates." into mnc-dev
John Spurlock [Mon, 1 Jun 2015 20:13:03 +0000 (20:13 +0000)]
am b0db15c6: Merge "Next alarm clock updates." into mnc-dev

* commit 'b0db15c6d99ab5f9d8a7bd6a44fc097a5f61edca':
  Next alarm clock updates.

9 years agoam 78b16987: Merge "Change colors of AVD test" into mnc-dev
Andrew Flynn [Mon, 1 Jun 2015 20:12:53 +0000 (20:12 +0000)]
am 78b16987: Merge "Change colors of AVD test" into mnc-dev

* commit '78b16987dfb044c8adbb19d2cd206a8aaeb6e850':
  Change colors of AVD test

9 years agoMerge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing...
Chris Tate [Mon, 1 Jun 2015 20:11:56 +0000 (20:11 +0000)]
Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev

9 years agoMerge "Next alarm clock updates." into mnc-dev
John Spurlock [Mon, 1 Jun 2015 20:07:38 +0000 (20:07 +0000)]
Merge "Next alarm clock updates." into mnc-dev

9 years agoam c73314bc: am cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into...
Raph Levien [Mon, 1 Jun 2015 20:06:24 +0000 (20:06 +0000)]
am c73314bc: am cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev

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

9 years agoam eeee276b: am 061e2bbf: Merge "Be more careful with mAccessPoints usage" into mnc-dev
Jason Monk [Mon, 1 Jun 2015 20:06:19 +0000 (20:06 +0000)]
am eeee276b: am 061e2bbf: Merge "Be more careful with mAccessPoints usage" into mnc-dev

* commit 'eeee276b31260425098b321ddd089c6e005b6583':
  Be more careful with mAccessPoints usage