OSDN Git Service

android-x86/frameworks-base.git
9 years agoam a4d66f39: Merge "Synchronize Theme.Material and Theme.Material light attributes...
Alan Viverette [Fri, 29 May 2015 02:23:07 +0000 (02:23 +0000)]
am a4d66f39: Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev

* commit 'a4d66f3933d2369a87e7c3d36e69244ff2029e74':
  Synchronize Theme.Material and Theme.Material light attributes

9 years agoam 0d889cde: Merge "CountryDetector no longer requires location permissions." into...
Makoto Onuki [Fri, 29 May 2015 02:23:01 +0000 (02:23 +0000)]
am 0d889cde: Merge "CountryDetector no longer requires location permissions." into mnc-dev

* commit '0d889cdeb78410cd4cb7f05d7fa4820985f0d679':
  CountryDetector no longer requires location permissions.

9 years agoam 5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev
Yohei Yukawa [Fri, 29 May 2015 02:22:52 +0000 (02:22 +0000)]
am 5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev

* commit '5176b5451a8447de3ff86712a95efd6af93aa556':
  Rely on IMM#focusOut() to close input session.

9 years agoam 19d9d0ca: Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev
Brian Attwell [Fri, 29 May 2015 02:22:46 +0000 (02:22 +0000)]
am 19d9d0ca: Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev

* commit '19d9d0ca2e95eca34e8f7b28023aa10f15d82f88':
  Rename "end" to "endExclusive" in addPhoneTtsSpan

9 years agoam 3c436cb9: Merge "Postpone AnimatedVectorDrawable animator inflation until applyThe...
Alan Viverette [Fri, 29 May 2015 02:22:41 +0000 (02:22 +0000)]
am 3c436cb9: Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev

* commit '3c436cb99f1cc0db82e342fb9dc145fd524f5029':
  Postpone AnimatedVectorDrawable animator inflation until applyTheme()

9 years agoam a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery...
Andres Morales [Fri, 29 May 2015 02:22:33 +0000 (02:22 +0000)]
am a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev

* commit 'a5705a4ada8e719ebf73ed757c514b74785e7ae3':
  [partition checking] re-enable bootimage/bootloader, add recovery

9 years agoMerge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev
Alan Viverette [Thu, 28 May 2015 23:55:30 +0000 (23:55 +0000)]
Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev

9 years agoMerge "CountryDetector no longer requires location permissions." into mnc-dev
Makoto Onuki [Thu, 28 May 2015 23:54:08 +0000 (23:54 +0000)]
Merge "CountryDetector no longer requires location permissions." into mnc-dev

9 years agoMerge "Rely on IMM#focusOut() to close input session." into mnc-dev
Yohei Yukawa [Thu, 28 May 2015 23:52:49 +0000 (23:52 +0000)]
Merge "Rely on IMM#focusOut() to close input session." into mnc-dev

9 years agoSynchronize Theme.Material and Theme.Material light attributes
Alan Viverette [Thu, 28 May 2015 23:52:29 +0000 (16:52 -0700)]
Synchronize Theme.Material and Theme.Material light attributes

Adds a few attributes that were missing from either theme, ensures all
the attributes match up so that it's easier to scan through for errors.

Bug: 21490615
Change-Id: Iabfed8f61a7bc121e618164dee4121c41e82db09

9 years agoMerge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev
Brian Attwell [Thu, 28 May 2015 23:43:39 +0000 (23:43 +0000)]
Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev

9 years agoMerge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into...
Alan Viverette [Thu, 28 May 2015 23:43:22 +0000 (23:43 +0000)]
Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev

9 years agoMerge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev
Andres Morales [Thu, 28 May 2015 23:41:03 +0000 (23:41 +0000)]
Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev

9 years agoam 85b883ca: Merge "Clear the inset of previous IME when necessary." into mnc-dev
Yohei Yukawa [Thu, 28 May 2015 23:35:28 +0000 (23:35 +0000)]
am 85b883ca: Merge "Clear the inset of previous IME when necessary." into mnc-dev

* commit '85b883cae410bd2b8e1dc5c34265ed253d758e86':
  Clear the inset of previous IME when necessary.

9 years agoRename "end" to "endExclusive" in addPhoneTtsSpan
Brian Attwell [Thu, 28 May 2015 23:23:37 +0000 (16:23 -0700)]
Rename "end" to "endExclusive" in addPhoneTtsSpan

Bug: 21209482
Change-Id: If505acecf5ca398560a9a23ea23ff8dd741e4025

9 years agoMerge "Clear the inset of previous IME when necessary." into mnc-dev
Yohei Yukawa [Thu, 28 May 2015 23:20:11 +0000 (23:20 +0000)]
Merge "Clear the inset of previous IME when necessary." into mnc-dev

9 years agoam 7cb0925e: Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev
Santos Cordon [Thu, 28 May 2015 23:18:34 +0000 (23:18 +0000)]
am 7cb0925e: Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev

* commit '7cb0925e7e89a415a101f83e32d4f5e51f768ffd':
  Add extras to Connections/Calls. (1/3)

9 years agoam ff0c25ce: Merge "Cleaning up logging in TelephonyManager." into mnc-dev
Amit Mahajan [Thu, 28 May 2015 23:18:29 +0000 (23:18 +0000)]
am ff0c25ce: Merge "Cleaning up logging in TelephonyManager." into mnc-dev

* commit 'ff0c25ce3174bd4f76256e413beb81f6eb501da9':
  Cleaning up logging in TelephonyManager.

9 years agoam 36756947: am c397dde1: am 92451a97: Merge "Docs: A few minor corrections: deleted...
David Friedman [Thu, 28 May 2015 23:18:24 +0000 (23:18 +0000)]
am 36756947: am c397dde1: am 92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs

* commit '3675694775d69712a2c9d5ee1d39dd2a5127cc86':
  Docs: A few minor corrections: deleted obsolete sentences, fixed references.

9 years agoMerge "Add extras to Connections/Calls. (1/3)" into mnc-dev
Santos Cordon [Thu, 28 May 2015 23:06:15 +0000 (23:06 +0000)]
Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev

9 years agoMerge "Cleaning up logging in TelephonyManager." into mnc-dev
Amit Mahajan [Thu, 28 May 2015 23:05:27 +0000 (23:05 +0000)]
Merge "Cleaning up logging in TelephonyManager." into mnc-dev

9 years agoam a9ac8354: Merge "Clean up calls to Rect.intersect()" into mnc-dev
Doris Liu [Thu, 28 May 2015 22:57:22 +0000 (22:57 +0000)]
am a9ac8354: Merge "Clean up calls to Rect.intersect()" into mnc-dev

* commit 'a9ac835437f45c7f7f3fc53f56aec2d53390fa72':
  Clean up calls to Rect.intersect()

9 years agoam 626f0dc7: Merge "Deprecations are warnings not errors" into mnc-dev
Glenn Kasten [Thu, 28 May 2015 22:57:17 +0000 (22:57 +0000)]
am 626f0dc7: Merge "Deprecations are warnings not errors" into mnc-dev

* commit '626f0dc73bc1007d16688eddf29ea58ec26f424e':
  Deprecations are warnings not errors

9 years agoam da28c868: Merge "Fix round cap approximation to understand scale" into mnc-dev
Chris Craik [Thu, 28 May 2015 22:57:08 +0000 (22:57 +0000)]
am da28c868: Merge "Fix round cap approximation to understand scale" into mnc-dev

* commit 'da28c8681a6868d188431aed626abe9bd6da2502':
  Fix round cap approximation to understand scale

9 years agoam b3af4f43: am 9ffbf9bd: am ed8c6295: Merge "Docs: Fixes a broken link and a typo...
David Friedman [Thu, 28 May 2015 22:57:03 +0000 (22:57 +0000)]
am b3af4f43: am 9ffbf9bd: am ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs

* commit 'b3af4f43d747d214c834ff824fd3116d4728b817':
  Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.

9 years agoam 2f9f8a38: am 01c4d8d3: am dcfa7556: docs: Fixed training TOC formatting and broken...
Quddus Chong [Thu, 28 May 2015 22:56:59 +0000 (22:56 +0000)]
am 2f9f8a38: am 01c4d8d3: am dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.

* commit '2f9f8a38f1d669f3e4a43c087a98c3464c1ad947':
  docs: Fixed training TOC formatting and broken link in TV training landing.

9 years agoam c7cbdd11: Merge "Don\'t kill process with active service/receiver when task is...
Wale Ogunwale [Thu, 28 May 2015 22:56:53 +0000 (22:56 +0000)]
am c7cbdd11: Merge "Don\'t kill process with active service/receiver when task is removed." into mnc-dev

* commit 'c7cbdd11c322daa3a3c7acbf7e457c3ccf34c4d3':
  Don't kill process with active service/receiver when task is removed.

9 years agoam 2df124b8: Merge "Fix build" into mnc-dev
Chris Craik [Thu, 28 May 2015 22:56:47 +0000 (22:56 +0000)]
am 2df124b8: Merge "Fix build" into mnc-dev

* commit '2df124b8547c4ba7a2b0c9903f21811583f74184':
  Fix build

9 years agoam 4562f0bc: Merge "Fix drawable CTS breakages" into mnc-dev
Alan Viverette [Thu, 28 May 2015 22:56:43 +0000 (22:56 +0000)]
am 4562f0bc: Merge "Fix drawable CTS breakages" into mnc-dev

* commit '4562f0bc898317887f82d62472a3bbbe7b4517f3':
  Fix drawable CTS breakages

9 years agoam c397dde1: am 92451a97: Merge "Docs: A few minor corrections: deleted obsolete...
David Friedman [Thu, 28 May 2015 22:54:29 +0000 (22:54 +0000)]
am c397dde1: am 92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs

* commit 'c397dde17960f2308ecc3ef0b5143c95df8e160c':
  Docs: A few minor corrections: deleted obsolete sentences, fixed references.

9 years agoClear the inset of previous IME when necessary.
Yohei Yukawa [Thu, 28 May 2015 01:54:18 +0000 (18:54 -0700)]
Clear the inset of previous IME when necessary.

In the following scenario, the system continues keeping the previous
IME's inset in the display until the new IME shows its window.
1. an IME shows its software keyboard with reporting non-empty inset.
2. the user switches to another IME, which does not show the software
   keyboard when it is selected (e.g., because the physical keyboard
   is connected.)

This CL tries to address above situation by introducing a new state
flag IMMS#mShouldClearInsetOfPreviousIme to clear the previous IME's
inset when necessary.

Bug: 15922840
Change-Id: Ib04967f39b2529251e4835c42e9f99dba2cf43f2

9 years agoMerge "Clean up calls to Rect.intersect()" into mnc-dev
Doris Liu [Thu, 28 May 2015 22:51:41 +0000 (22:51 +0000)]
Merge "Clean up calls to Rect.intersect()" into mnc-dev

9 years agoMerge "Deprecations are warnings not errors" into mnc-dev
Glenn Kasten [Thu, 28 May 2015 22:51:15 +0000 (22:51 +0000)]
Merge "Deprecations are warnings not errors" into mnc-dev

9 years agoMerge "Fix round cap approximation to understand scale" into mnc-dev
Chris Craik [Thu, 28 May 2015 22:50:02 +0000 (22:50 +0000)]
Merge "Fix round cap approximation to understand scale" into mnc-dev

9 years agoam 9ffbf9bd: am ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsole...
David Friedman [Thu, 28 May 2015 22:40:16 +0000 (22:40 +0000)]
am 9ffbf9bd: am ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs

* commit '9ffbf9bd9b40487b7edacdf0c790714f080494c4':
  Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.

9 years agoam 01c4d8d3: am dcfa7556: docs: Fixed training TOC formatting and broken link in...
Quddus Chong [Thu, 28 May 2015 22:40:01 +0000 (22:40 +0000)]
am 01c4d8d3: am dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.

* commit '01c4d8d357aef661d15ef770986e35be324c6d03':
  docs: Fixed training TOC formatting and broken link in TV training landing.

9 years agoClean up calls to Rect.intersect()
Doris Liu [Thu, 28 May 2015 22:35:52 +0000 (15:35 -0700)]
Clean up calls to Rect.intersect()

This CL checks for the return value for Rect.intersect() for whether
there is actually an intersection before taking the return intersected
rect. In the case of no intersection (Rect.intersect() returns false),
an empty rect will be used as the intersection.

bug: 7368679
Change-Id: Ibda3bfd662f8ca83cb5662748d9be250243b72b2

9 years agoMerge "Don't kill process with active service/receiver when task is removed." into...
Wale Ogunwale [Thu, 28 May 2015 22:38:02 +0000 (22:38 +0000)]
Merge "Don't kill process with active service/receiver when task is removed." into mnc-dev

9 years agoMerge "Fix build" into mnc-dev
Chris Craik [Thu, 28 May 2015 22:34:53 +0000 (22:34 +0000)]
Merge "Fix build" into mnc-dev

9 years agoFix build
Chris Craik [Thu, 28 May 2015 22:33:40 +0000 (15:33 -0700)]
Fix build

Change-Id: I7ee28c474aa821eb598f719723d87416a41537b9

9 years agoMerge "Fix drawable CTS breakages" into mnc-dev
Alan Viverette [Thu, 28 May 2015 22:33:30 +0000 (22:33 +0000)]
Merge "Fix drawable CTS breakages" into mnc-dev

9 years agoam 92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed...
David Friedman [Thu, 28 May 2015 22:33:22 +0000 (22:33 +0000)]
am 92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs

* commit '92451a97271d014ab10ca4685beae728d53601b4':
  Docs: A few minor corrections: deleted obsolete sentences, fixed references.

9 years agoMerge "Docs: A few minor corrections: deleted obsolete sentences, fixed references...
David Friedman [Thu, 28 May 2015 22:16:19 +0000 (22:16 +0000)]
Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs

9 years agoam ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence...
David Friedman [Thu, 28 May 2015 22:09:15 +0000 (22:09 +0000)]
am ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs

* commit 'ed8c62955aa6512fb4e929e59893c774ae894358':
  Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.

9 years agoam 1cd7e4c3: Merge "Use path intersection instead of saveLayer+mesh to mask projected...
Chris Craik [Thu, 28 May 2015 22:08:39 +0000 (22:08 +0000)]
am 1cd7e4c3: Merge "Use path intersection instead of saveLayer+mesh to mask projected ripples" into mnc-dev

* commit '1cd7e4c3d0216cfb9a8a685ca8cf6f0d740a9dff':
  Use path intersection instead of saveLayer+mesh to mask projected ripples

9 years agoam 5cd795a9: Merge "Fix NPE in BridgeContext.obtainStyledAttributes()" into mnc-dev
Deepanshu Gupta [Thu, 28 May 2015 22:08:34 +0000 (22:08 +0000)]
am 5cd795a9: Merge "Fix NPE in BridgeContext.obtainStyledAttributes()" into mnc-dev

* commit '5cd795a9094eb02c983751ecabca6f24b0a01c58':
  Fix NPE in BridgeContext.obtainStyledAttributes()

9 years agoam 1421583b: Merge "Fix BridgeTypedArray.getType()" into mnc-dev
Deepanshu Gupta [Thu, 28 May 2015 22:08:30 +0000 (22:08 +0000)]
am 1421583b: Merge "Fix BridgeTypedArray.getType()" into mnc-dev

* commit '1421583bca78ed1d2e22d091d64ae72352c4a9f5':
  Fix BridgeTypedArray.getType()

9 years agoMerge "Use path intersection instead of saveLayer+mesh to mask projected ripples...
Chris Craik [Thu, 28 May 2015 22:03:06 +0000 (22:03 +0000)]
Merge "Use path intersection instead of saveLayer+mesh to mask projected ripples" into mnc-dev

9 years agoMerge "Fix NPE in BridgeContext.obtainStyledAttributes()" into mnc-dev
Deepanshu Gupta [Thu, 28 May 2015 21:59:08 +0000 (21:59 +0000)]
Merge "Fix NPE in BridgeContext.obtainStyledAttributes()" into mnc-dev

9 years agoam dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.
Quddus Chong [Thu, 28 May 2015 21:59:02 +0000 (21:59 +0000)]
am dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.

* commit 'dcfa755616504fb4443f4d79d936f30c3742d77a':
  docs: Fixed training TOC formatting and broken link in TV training landing.

9 years agoMerge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into...
David Friedman [Thu, 28 May 2015 21:58:57 +0000 (21:58 +0000)]
Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs

9 years agoMerge "Fix BridgeTypedArray.getType()" into mnc-dev
Deepanshu Gupta [Thu, 28 May 2015 21:58:56 +0000 (21:58 +0000)]
Merge "Fix BridgeTypedArray.getType()" into mnc-dev

9 years agoFix NPE in BridgeContext.obtainStyledAttributes()
Deepanshu Gupta [Thu, 28 May 2015 19:33:04 +0000 (12:33 -0700)]
Fix NPE in BridgeContext.obtainStyledAttributes()

Replace direct member access with getter that checks for nullness.

Change-Id: I4a56a0ee903ae7d8c89b91d74b128302e1965586

9 years agoFix BridgeTypedArray.getType()
Deepanshu Gupta [Wed, 27 May 2015 23:57:10 +0000 (16:57 -0700)]
Fix BridgeTypedArray.getType()

Also includes some fixes for BridgeTypedArray.getInt() - when value is a
color, when value is an octal int, when value is true/false.

Bug: http://b.android.com/162438
Change-Id: I0b985ea3437be8018d0e116e7a599843cc7aacd6

9 years agoam 165102f3: Merge "Wait for uncrypt to finish before rebooting" into mnc-dev
Tao Bao [Thu, 28 May 2015 21:51:44 +0000 (21:51 +0000)]
am 165102f3: Merge "Wait for uncrypt to finish before rebooting" into mnc-dev

* commit '165102f350e08bd186b25b90dd8a42aad8975890':
  Wait for uncrypt to finish before rebooting

9 years agoam 4573dddc: Merge "Add new API to set URI on AssistContent." into mnc-dev
Dianne Hackborn [Thu, 28 May 2015 21:51:37 +0000 (21:51 +0000)]
am 4573dddc: Merge "Add new API to set URI on AssistContent." into mnc-dev

* commit '4573dddcce3f232d2eeb20bfe0e204e15a9416e9':
  Add new API to set URI on AssistContent.

9 years agoMerge "Wait for uncrypt to finish before rebooting" into mnc-dev
Tao Bao [Thu, 28 May 2015 21:48:27 +0000 (21:48 +0000)]
Merge "Wait for uncrypt to finish before rebooting" into mnc-dev

9 years agodocs: Fixed training TOC formatting and broken link in TV training landing.
Quddus Chong [Thu, 28 May 2015 21:31:29 +0000 (14:31 -0700)]
docs: Fixed training TOC formatting and broken link in TV training landing.

Change-Id: Ie159a1e5d3d84bfc20b2e2f0f5d4973d3880876d

9 years agoam bf7fe1e0: Merge "Update asan/app_process." into mnc-dev
Evgenii Stepanov [Thu, 28 May 2015 21:36:13 +0000 (21:36 +0000)]
am bf7fe1e0: Merge "Update asan/app_process." into mnc-dev

* commit 'bf7fe1e051fefc5e6c1b96411a842b0305a9192c':
  Update asan/app_process.

9 years agoam 0e591ef2: am 7138643f: am d5db0f63: Merge "docs: Misc. fixes for M Preview docs...
Quddus Chong [Thu, 28 May 2015 21:36:09 +0000 (21:36 +0000)]
am 0e591ef2: am 7138643f: am d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs

* commit '0e591ef26ae060bf1d47ffdd02b23b5da416fad7':
  docs: Misc. fixes for M Preview docs.

9 years agoMerge "Add new API to set URI on AssistContent." into mnc-dev
Dianne Hackborn [Thu, 28 May 2015 21:35:40 +0000 (21:35 +0000)]
Merge "Add new API to set URI on AssistContent." into mnc-dev

9 years agoMerge "Update asan/app_process." into mnc-dev
Evgenii Stepanov [Thu, 28 May 2015 21:30:56 +0000 (21:30 +0000)]
Merge "Update asan/app_process." into mnc-dev

9 years agoam 7138643f: am d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc...
Quddus Chong [Thu, 28 May 2015 21:20:18 +0000 (21:20 +0000)]
am 7138643f: am d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs

* commit '7138643f4185d402ac216cfcfe3c871c860bf84e':
  docs: Misc. fixes for M Preview docs.

9 years agoam aa47d8d9: Merge "Revert "Revert "Remove debugging and skip InputMethod windows...
Olawale Ogunwale [Thu, 28 May 2015 21:12:17 +0000 (21:12 +0000)]
am aa47d8d9: Merge "Revert "Revert "Remove debugging and skip InputMethod windows""" into mnc-dev

* commit 'aa47d8d97600e439c73cdbdcc47db44e71831ea6':
  Revert "Revert "Remove debugging and skip InputMethod windows""

9 years agoam d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs
Quddus Chong [Thu, 28 May 2015 21:05:02 +0000 (21:05 +0000)]
am d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs

* commit 'd5db0f63b4cf03294c2871eb3bf9d3b944700788':
  docs: Misc. fixes for M Preview docs.

9 years agoMerge "Revert "Revert "Remove debugging and skip InputMethod windows""" into mnc-dev
Olawale Ogunwale [Thu, 28 May 2015 20:59:09 +0000 (20:59 +0000)]
Merge "Revert "Revert "Remove debugging and skip InputMethod windows""" into mnc-dev

9 years agoDocs: A few minor corrections: deleted obsolete sentences, fixed references.
David Friedman [Thu, 28 May 2015 20:57:33 +0000 (13:57 -0700)]
Docs: A few minor corrections: deleted obsolete sentences, fixed references.

Change-Id: I39c5c060f41cc501ef595e136fa2376232ea108d

9 years agoFix drawable CTS breakages
Alan Viverette [Thu, 28 May 2015 00:18:57 +0000 (17:18 -0700)]
Fix drawable CTS breakages

1. ClipDrawable.getOpacity() now correctly respects the current level
2. DrawableWrapper checks the contained drawable's changing config even
   if it doesn't have a constant state
3. DrawableWrapper gives priority to the last valid child drawable
   rather than the drawable attribute

Bug: 21406104
Change-Id: I442fe90d0a3865bfdc6b2d14a7358178310dde02

9 years agoMerge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs
Quddus Chong [Thu, 28 May 2015 20:47:14 +0000 (20:47 +0000)]
Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs

9 years agoam 517f3ee4: Merge "Backup/restore notification policy." into mnc-dev
John Spurlock [Thu, 28 May 2015 20:39:44 +0000 (20:39 +0000)]
am 517f3ee4: Merge "Backup/restore notification policy." into mnc-dev

* commit '517f3ee41afb7713f1fc6fa37a6f3a6efa97a020':
  Backup/restore notification policy.

9 years agoam 057d9397: Merge "Fix ScrollView\'s EdgeEffect to respect clipToPadding flag" into...
Doris Liu [Thu, 28 May 2015 20:39:39 +0000 (20:39 +0000)]
am 057d9397: Merge "Fix ScrollView\'s EdgeEffect to respect clipToPadding flag" into mnc-dev

* commit '057d93971a5415a989ec5c8a8b0437ee12b6604f':
  Fix ScrollView's EdgeEffect to respect clipToPadding flag

9 years agoam 6ac0c8c5: lock device orientation during app compatibility test
Guang Zhu [Thu, 28 May 2015 20:39:33 +0000 (20:39 +0000)]
am 6ac0c8c5: lock device orientation during app compatibility test

* commit '6ac0c8c5faaa2fdf56a533a6a3452d53850809ee':
  lock device orientation during app compatibility test

9 years agoMerge "Backup/restore notification policy." into mnc-dev
John Spurlock [Thu, 28 May 2015 20:34:17 +0000 (20:34 +0000)]
Merge "Backup/restore notification policy." into mnc-dev

9 years agoMerge "Fix ScrollView's EdgeEffect to respect clipToPadding flag" into mnc-dev
Doris Liu [Thu, 28 May 2015 20:33:11 +0000 (20:33 +0000)]
Merge "Fix ScrollView's EdgeEffect to respect clipToPadding flag" into mnc-dev

9 years agoFix ScrollView's EdgeEffect to respect clipToPadding flag
Doris Liu [Thu, 28 May 2015 17:18:46 +0000 (10:18 -0700)]
Fix ScrollView's EdgeEffect to respect clipToPadding flag

bug: 19126514
Change-Id: I21fe4fd3e2f1240ee31c51f9deac7f285ffe2408

9 years agolock device orientation during app compatibility test
Guang Zhu [Thu, 28 May 2015 20:22:28 +0000 (13:22 -0700)]
lock device orientation during app compatibility test

Devices on test benches are usually held sideways, which leads to app
rotation during launch. While it's useful to identify such issue from an
app perspective, the app compatibility test should be isolated from such
noise for the purpose of the testing for basic level of compatibility.

Change-Id: I403f96e5d8512ca6a17b05a83d69f4b02f760a32

9 years agoDocs: Fixes a broken link and a typo; deletes obsolete sentence/link.
David Friedman [Thu, 28 May 2015 20:25:32 +0000 (13:25 -0700)]
Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.

Change-Id: I78d719f48f795f0477e4a08920ddb05fce48b5fc

9 years agoBackup/restore notification policy.
John Spurlock [Thu, 28 May 2015 15:24:10 +0000 (11:24 -0400)]
Backup/restore notification policy.

 - Include zen + ranking config in the backup payload.
 - Owner user only for now.
 - For the most part, reuse existing policy file structure
   as the payload format, but elide items that do not survive
   across devices (info for secondary users, uids).
 - Also elide the manual zen rule, if set.
 - During restore, keep ranking info for uninstalled apps
   in purgatory until the apps exist.

Bug: 17755700
Change-Id: Iadf71a43cd0efd44fe9a0a29874d60666b6d2076

9 years agodocs: Misc. fixes for M Preview docs.
Quddus Chong [Thu, 28 May 2015 17:13:14 +0000 (10:13 -0700)]
docs: Misc. fixes for M Preview docs.

Change-Id: I816bb18d0110a4a7e585fe727471c2356a93caac

9 years agoam 3aeb5f84: am 2836b863: am f33da518: Merge "Introduce indirection for base micro...
Bryce Lee [Thu, 28 May 2015 20:15:44 +0000 (20:15 +0000)]
am 3aeb5f84: am 2836b863: am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev

* commit '3aeb5f848eee2c6de9bb49c9dcc7ca5127ef7c1e':
  Introduce indirection for base micro themes.

9 years agoam 8a179cab: Merge "BatteryStats: Output per-app wifi controller distribution" into...
Adam Lesinski [Thu, 28 May 2015 20:15:39 +0000 (20:15 +0000)]
am 8a179cab: Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev

* commit '8a179cab7971782900f5b4a872f4f432c7d17987':
  BatteryStats: Output per-app wifi controller distribution

9 years agoam 2836b863: am f33da518: Merge "Introduce indirection for base micro themes." into...
Bryce Lee [Thu, 28 May 2015 20:07:57 +0000 (20:07 +0000)]
am 2836b863: am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev

* commit '2836b863fb2aa593d19ffdcaacb8e9fd84dabb12':
  Introduce indirection for base micro themes.

9 years agoMerge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev
Adam Lesinski [Thu, 28 May 2015 20:04:16 +0000 (20:04 +0000)]
Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev

9 years agoam f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev
Bryce Lee [Thu, 28 May 2015 19:52:17 +0000 (19:52 +0000)]
am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev

* commit 'f33da5188d5d1d66c1697a84358f334018e9f905':
  Introduce indirection for base micro themes.

9 years agoBatteryStats: Output per-app wifi controller distribution
Adam Lesinski [Thu, 28 May 2015 18:38:12 +0000 (11:38 -0700)]
BatteryStats: Output per-app wifi controller distribution

Currently we only output this data on checkin, adding the output
to dumpsys as well.

Change-Id: I649474b576d7341bbf54ff95c0b0e6fed367bcb0

9 years agoUpdate asan/app_process.
Evgenii Stepanov [Thu, 7 May 2015 17:55:59 +0000 (10:55 -0700)]
Update asan/app_process.

Build both 32 and 64-bit versions and don't limit it to eng.

Change-Id: I5d6cc8005291100d5fe0f1385e8a0b4ba5f4d630
(cherry picked from commit e740b17d2400ed0db17d1f7fce4f052bbbf808ab)

9 years agoMerge "Introduce indirection for base micro themes." into cw-d-mr1-dev
Bryce Lee [Thu, 28 May 2015 19:39:44 +0000 (19:39 +0000)]
Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev

9 years agoam e9ac8174: am dd6ccfd0: am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview...
David Friedman [Thu, 28 May 2015 19:36:56 +0000 (19:36 +0000)]
am e9ac8174: am dd6ccfd0: am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs

* commit 'e9ac81745ef0c5f0d96a2c9dfcf2f84a86ccf85d':
  Docs: Quick typo fix.

9 years agoam dd054f50: am 15afeaa9: am 2429cc41: docs: Fix bad heading link for doze-standby
Luan Nguyen [Thu, 28 May 2015 19:36:51 +0000 (19:36 +0000)]
am dd054f50: am 15afeaa9: am 2429cc41: docs: Fix bad heading link for doze-standby

* commit 'dd054f505b42c295baaca375d22c737fcb0fcb92':
  docs: Fix bad heading link for doze-standby

9 years agoam dd6ccfd0: am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs
David Friedman [Thu, 28 May 2015 19:20:19 +0000 (19:20 +0000)]
am dd6ccfd0: am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs

* commit 'dd6ccfd0d97c7a794793cd465be029310efa67ea':
  Docs: Quick typo fix.

9 years agoam 15afeaa9: am 2429cc41: docs: Fix bad heading link for doze-standby
Luan Nguyen [Thu, 28 May 2015 19:20:13 +0000 (19:20 +0000)]
am 15afeaa9: am 2429cc41: docs: Fix bad heading link for doze-standby

* commit '15afeaa99f6da12f6237a2b24fdd544b298bf589':
  docs: Fix bad heading link for doze-standby

9 years agoam 08ecf676: Merge "Bug fix and documentation clarification" into mnc-dev
Peng Xu [Thu, 28 May 2015 19:15:31 +0000 (19:15 +0000)]
am 08ecf676: Merge "Bug fix and documentation clarification" into mnc-dev

* commit '08ecf676e655ba7a86744f63045290d1e331c0f6':
  Bug fix and documentation clarification

9 years agoam e0e8570d: am 46e58a17: am c8bcfe28: Merge "docs: Fix broken links on M Preview...
Joe Fernandez [Thu, 28 May 2015 19:15:26 +0000 (19:15 +0000)]
am e0e8570d: am 46e58a17: am c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-preview-docs

* commit 'e0e8570d591cd833f9950c4ac0de8ca425c47f95':
  docs: Fix broken links on M Preview.

9 years agoam 587748cd: am a21ff962: am c5d3758e: docs: Remove api-changes.html and references
Luan Nguyen [Thu, 28 May 2015 19:15:20 +0000 (19:15 +0000)]
am 587748cd: am a21ff962: am c5d3758e: docs: Remove api-changes.html and references

* commit '587748cdf78fe0149fef6a0e0ed9099ab804cb1c':
  docs: Remove api-changes.html and references

9 years agoam 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs
David Friedman [Thu, 28 May 2015 19:03:28 +0000 (19:03 +0000)]
am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs

* commit '8bf833e40f403f5f40233bf7c68778b2401c5673':
  Docs: Quick typo fix.

9 years agoam 2429cc41: docs: Fix bad heading link for doze-standby
Luan Nguyen [Thu, 28 May 2015 19:03:21 +0000 (19:03 +0000)]
am 2429cc41: docs: Fix bad heading link for doze-standby

* commit '2429cc419794a06866670675a5e5b3d7a746dd6b':
  docs: Fix bad heading link for doze-standby

9 years agoMerge "Docs: Quick typo fix." into mnc-preview-docs
David Friedman [Thu, 28 May 2015 18:59:46 +0000 (18:59 +0000)]
Merge "Docs: Quick typo fix." into mnc-preview-docs

9 years agoMerge "Bug fix and documentation clarification" into mnc-dev
Peng Xu [Thu, 28 May 2015 18:57:45 +0000 (18:57 +0000)]
Merge "Bug fix and documentation clarification" into mnc-dev

9 years agoam 46e58a17: am c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-previ...
Joe Fernandez [Thu, 28 May 2015 18:54:43 +0000 (18:54 +0000)]
am 46e58a17: am c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-preview-docs

* commit '46e58a17890f9013f2d3714607c4c835df3638e0':
  docs: Fix broken links on M Preview.

9 years agoam 319213ee: am 52454e38: am bb7877c4: Docs: IO quick fix--commenting out part of...
David Friedman [Thu, 28 May 2015 18:54:40 +0000 (18:54 +0000)]
am 319213ee: am 52454e38: am bb7877c4: Docs: IO quick fix--commenting out part of script.

* commit '319213eea1438bfa348a4099b5e1d6d8f92d0c4d':
  Docs: IO quick fix--commenting out part of script.