OSDN Git Service

android-x86/frameworks-base.git
9 years agofix CTS: AccessibilityEndToEndTest failing
Maxim Bogatov [Tue, 16 Jun 2015 22:15:49 +0000 (15:15 -0700)]
fix CTS: AccessibilityEndToEndTest failing

ViewGroup overrides class name population to
AccessibilityEvent. So className is always ViewGroup
for any ViewGroup inherited classes

b/21369265

Change-Id: I46095c21e523e05066c7f6ee395171d4725983ac

9 years agoMerge "QS icon sizes should be 24dp." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 20:14:48 +0000 (20:14 +0000)]
Merge "QS icon sizes should be 24dp." into mnc-dev

9 years agoQS icon sizes should be 24dp.
John Spurlock [Mon, 15 Jun 2015 19:45:38 +0000 (15:45 -0400)]
QS icon sizes should be 24dp.

Not 28dp.

Bug: 21118976
Change-Id: I9cc326d1333d85b783b85e3238a2a506bf3b55c0

9 years agoMerge "Limit shared element transition to shared elements and children." into mnc-dev
George Mount [Mon, 15 Jun 2015 19:43:55 +0000 (19:43 +0000)]
Merge "Limit shared element transition to shared elements and children." into mnc-dev

9 years agoMerge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev
Vladislav Kaznacheev [Mon, 15 Jun 2015 19:43:10 +0000 (19:43 +0000)]
Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev

9 years agoMerge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into...
Adam Powell [Mon, 15 Jun 2015 19:25:18 +0000 (19:25 +0000)]
Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev

9 years agoMerge "Only re-register callbacks if tuning changed" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 19:24:09 +0000 (19:24 +0000)]
Merge "Only re-register callbacks if tuning changed" into mnc-dev

9 years agoOnly re-register callbacks if tuning changed
Jason Monk [Mon, 15 Jun 2015 19:02:56 +0000 (15:02 -0400)]
Only re-register callbacks if tuning changed

We only need to get the state if the tuning has actually changed.
Currently we hit this every time we open QS which breaks the alpha
animation on the mobile icon.

Bug: 21791609
Change-Id: I3d77a2d0f81d2d7bed600ccd7a2d2c2b4a262db7

9 years agoMerge "Fix EmergencyCallback in NetworkController" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 19:16:35 +0000 (19:16 +0000)]
Merge "Fix EmergencyCallback in NetworkController" into mnc-dev

9 years agoMerge "Fix issue #21813831: Need API for asking to be added to power whitelist" into...
Dianne Hackborn [Mon, 15 Jun 2015 19:12:12 +0000 (19:12 +0000)]
Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev

9 years agoFix issue #21813831: Need API for asking to be added to power whitelist
Dianne Hackborn [Sat, 13 Jun 2015 01:11:41 +0000 (18:11 -0700)]
Fix issue #21813831: Need API for asking to be added to power whitelist

Add the API.  Clean up a few related things.

Change-Id: I190adad1812f36f6095b98a1001fedb94874e8b5

9 years agoMerge "Obtain handler from context in CaptioningManager" into mnc-dev
Alan Viverette [Mon, 15 Jun 2015 18:05:09 +0000 (18:05 +0000)]
Merge "Obtain handler from context in CaptioningManager" into mnc-dev

9 years agoMerge "Use HTTPS when fetching app link verification resources" into mnc-dev
Christopher Tate [Mon, 15 Jun 2015 17:56:16 +0000 (17:56 +0000)]
Merge "Use HTTPS when fetching app link verification resources" into mnc-dev

9 years agoMerge "Retry intent verification 3 times before failing." into mnc-dev
Joseph Wen [Mon, 15 Jun 2015 17:50:13 +0000 (17:50 +0000)]
Merge "Retry intent verification 3 times before failing." into mnc-dev

9 years agoMerge "Remove EcIesParameterSpec until it's needed." into mnc-dev
Alex Klyubin [Mon, 15 Jun 2015 17:45:45 +0000 (17:45 +0000)]
Merge "Remove EcIesParameterSpec until it's needed." into mnc-dev

9 years agoMerge "Document when self-signed certs have invalid signature." into mnc-dev
Alex Klyubin [Mon, 15 Jun 2015 17:43:45 +0000 (17:43 +0000)]
Merge "Document when self-signed certs have invalid signature." into mnc-dev

9 years agoRemove EcIesParameterSpec until it's needed.
Alex Klyubin [Mon, 15 Jun 2015 16:55:36 +0000 (09:55 -0700)]
Remove EcIesParameterSpec until it's needed.

This class was added in Android M to enable us to expose ECIES. ECIES
is not going to happen in Android M. I'm thus removing this unused
class until such time when it's needed.

Bug: 18088752
Change-Id: I16ab1bbd0b4334419c9a8f29d64661c150aa8d32

9 years agoMerge "Add adb shell telecom get-system-dialer" into mnc-dev
Yorke Lee [Mon, 15 Jun 2015 16:19:41 +0000 (16:19 +0000)]
Merge "Add adb shell telecom get-system-dialer" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 15 Jun 2015 16:15:45 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 16:14:54 +0000 (09:14 -0700)]
Import translations. DO NOT MERGE

Change-Id: I72bd7dadaaf60d676140eedd28f33db15c5bfeb6
Auto-generated-cl: translation import

9 years agoam fa794eb0: am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shado...
Diego Perez [Mon, 15 Jun 2015 15:48:29 +0000 (15:48 +0000)]
am fa794eb0: am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev

* commit 'fa794eb0025dbec6c1b90135495081d42f06bdaf':
  Fix for shadows on theme editor

9 years agoam 40a216d9: am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapsho...
Diego Perez [Mon, 15 Jun 2015 15:48:24 +0000 (15:48 +0000)]
am 40a216d9: am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev

* commit '40a216d95973bb897ee0d755ef260a616f176798':
  Fix GcSnapshot drawInLayer when clipping is used.

9 years agoam c6d33420: am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree...
Dirk Dougherty [Mon, 15 Jun 2015 15:48:14 +0000 (15:48 +0000)]
am c6d33420: am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs

* commit 'c6d3342064db4982298d0ebe79c8b974c57b99a7':
  Doc change: move ndk docs jd into main docs tree.

9 years agoam ecc50268: am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing...
Andrew Solovay [Mon, 15 Jun 2015 15:48:05 +0000 (15:48 +0000)]
am ecc50268: am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs

* commit 'ecc50268d72f0084a96bf98494229a294be10458':
  docs: Added AfW videos to "Android for Work" landing page

9 years agoam afb19e27: am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" into mnc...
Rich Slogar [Mon, 15 Jun 2015 15:47:49 +0000 (15:47 +0000)]
am afb19e27: am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs

* commit 'afb19e27ccc80415956c1b63ddb19e953a7c3f20':
  docs: sdk tools 24.3.2 download updates

9 years agoam ce5a79da: am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom...
Diego Perez [Mon, 15 Jun 2015 15:47:44 +0000 (15:47 +0000)]
am ce5a79da: am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev

* commit 'ce5a79dacfb152317429cb69c28fe8bb39c02f4c':
  New custom widgets library

9 years agoMerge "Add isFilterBitmap() overrides where appropriate" into mnc-dev
Chet Haase [Mon, 15 Jun 2015 15:45:55 +0000 (15:45 +0000)]
Merge "Add isFilterBitmap() overrides where appropriate" into mnc-dev

9 years agoMerge "resolved conflicts for merge of 5a53816b to mnc-dev" into mnc-dev
Diego Perez [Mon, 15 Jun 2015 15:44:12 +0000 (15:44 +0000)]
Merge "resolved conflicts for merge of 5a53816b to mnc-dev" into mnc-dev

9 years agoAdd isFilterBitmap() overrides where appropriate
Chet Haase [Sun, 14 Jun 2015 14:45:32 +0000 (07:45 -0700)]
Add isFilterBitmap() overrides where appropriate

Issue #21825791 add isFilterBitmap() override to appropriate Drawable subclasses

Change-Id: I5cbd72c034be79b0aa53815c7a5a8ea499e6e02d

9 years agoMerge "Don't try to get entries for uninstalled apps." into mnc-dev
Jason Monk [Mon, 15 Jun 2015 15:41:36 +0000 (15:41 +0000)]
Merge "Don't try to get entries for uninstalled apps." into mnc-dev

9 years agoDon't try to get entries for uninstalled apps.
Jason Monk [Mon, 15 Jun 2015 15:38:03 +0000 (11:38 -0400)]
Don't try to get entries for uninstalled apps.

Bug: 21837824
Change-Id: I6f7bbc309e9edf1db12476f55ab8be424739fae0

9 years agoresolved conflicts for merge of 5a53816b to mnc-dev
Diego Perez [Mon, 15 Jun 2015 15:17:08 +0000 (16:17 +0100)]
resolved conflicts for merge of 5a53816b to mnc-dev

Change-Id: Ice1ba8cb9793432e18635e77f4e3309f50bb7b3f

9 years agoRetry intent verification 3 times before failing.
Joseph Wen [Mon, 15 Jun 2015 14:36:03 +0000 (10:36 -0400)]
Retry intent verification 3 times before failing.

BUG=21596311

Change-Id: Ia98925a4310046ef4d8117afe0b278e6a414dac6

9 years agoam a8cff2ac: (-s ours) am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT...
Prashant Malani [Mon, 15 Jun 2015 14:30:35 +0000 (14:30 +0000)]
am a8cff2ac: (-s ours) am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev

* commit 'a8cff2acb7cc18d1cf123f45eb4e47e1ab876a20':
  DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"

9 years agoam 94476be6: (-s ours) am 88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashM...
Filip Gruszczynski [Mon, 15 Jun 2015 14:30:30 +0000 (14:30 +0000)]
am 94476be6: (-s ours) am 88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev

* commit '94476be6a4055d09413d51e489446bf220c440a6':
  DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes

9 years agoam d7959d30: (-s ours) am 265d053d: am 81babaa3: am 7ffde4a6: am e899576f: am 48b3845...
Leon Scroggins III [Mon, 15 Jun 2015 14:30:25 +0000 (14:30 +0000)]
am d7959d30: (-s ours) am 265d053d: am 81babaa3: am 7ffde4a6: am e899576f: am 48b38452: am a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes

* commit 'd7959d30b61962a905de6c5081dac6b2f7be65c1':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes

9 years agoam 8c9ae41b: (-s ours) am 303581be: resolved conflicts for merge of 3ff978a5 to cw...
Leon Scroggins III [Mon, 15 Jun 2015 14:30:20 +0000 (14:30 +0000)]
am 8c9ae41b: (-s ours) am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev

* commit '8c9ae41bc7188cfe929d0b4f31c18faf9f9a03f7':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes

9 years agoMerge "Fix invisible rotation tile" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 14:26:36 +0000 (14:26 +0000)]
Merge "Fix invisible rotation tile" into mnc-dev

9 years agoFix invisible rotation tile
Jason Monk [Mon, 15 Jun 2015 14:19:26 +0000 (10:19 -0400)]
Fix invisible rotation tile

Make sure we set the state at least once.

Bug: 21837219
Change-Id: Iabd0524f0c09fd3f7b895007204ddf49af19ea98

9 years agoMerge "Make references to ssid use a verbatim TtsSpan" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 14:14:50 +0000 (14:14 +0000)]
Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev

9 years agoMake references to ssid use a verbatim TtsSpan
Jason Monk [Mon, 15 Jun 2015 14:07:55 +0000 (10:07 -0400)]
Make references to ssid use a verbatim TtsSpan

Bug: 20059794
Change-Id: Id92ef11e78547e168f55515dea2fc28519871d6f

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 15 Jun 2015 13:53:09 +0000 (13:53 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 13:51:34 +0000 (08:51 -0500)]
Import translations. DO NOT MERGE

Change-Id: I2b7fd1100aca78ce28f084bcf94637ba1975b21e
Auto-generated-cl: translation import

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 15 Jun 2015 13:45:41 +0000 (13:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 15 Jun 2015 13:44:44 +0000 (13:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 13:43:30 +0000 (08:43 -0500)]
Import translations. DO NOT MERGE

Change-Id: Id021d13867abfcb10e4fb1a9754ae21052f66ffb
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 13:39:05 +0000 (08:39 -0500)]
Import translations. DO NOT MERGE

Change-Id: I7bb1d35595971e4d2ff83ba40c01524ed243d26d
Auto-generated-cl: translation import

9 years agoMerge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev
Paul Jensen [Mon, 15 Jun 2015 13:35:46 +0000 (13:35 +0000)]
Merge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev

9 years agoMerge "remove setLatestEventInfo from USB" into mnc-dev
Chris Wren [Mon, 15 Jun 2015 12:23:23 +0000 (12:23 +0000)]
Merge "remove setLatestEventInfo from USB" into mnc-dev

9 years agoam 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme...
Diego Perez [Mon, 15 Jun 2015 10:14:30 +0000 (10:14 +0000)]
am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev

* commit '2f7103565cf1732d6d1281195cfa49a1564751d7':
  Fix for shadows on theme editor

9 years agoam df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer...
Diego Perez [Mon, 15 Jun 2015 10:14:24 +0000 (10:14 +0000)]
am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev

* commit 'df6f63badfe2572284dad8e34f152fd1c24a873e':
  Fix GcSnapshot drawInLayer when clipping is used.

9 years agoam 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into...
Diego Perez [Mon, 15 Jun 2015 10:04:02 +0000 (10:04 +0000)]
am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev

* commit '13c06d6c91e67962b7ffdf92c56e3b01125e4a8d':
  Fix for shadows on theme editor

9 years agoam 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clippin...
Diego Perez [Mon, 15 Jun 2015 10:03:58 +0000 (10:03 +0000)]
am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev

* commit '2422011d867f4d4516605148641bbeb7d9c2501b':
  Fix GcSnapshot drawInLayer when clipping is used.

9 years agoam 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev
Diego Perez [Mon, 15 Jun 2015 09:50:58 +0000 (09:50 +0000)]
am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev

* commit '1f33bdad98dd5138f887642d39c9495e1d7df14b':
  Fix for shadows on theme editor

9 years agoam b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used...
Diego Perez [Mon, 15 Jun 2015 09:50:51 +0000 (09:50 +0000)]
am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev

* commit 'b2411c622cf9124f6af5f70d416adb179f9c88bb':
  Fix GcSnapshot drawInLayer when clipping is used.

9 years agoam 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev
Diego Perez [Mon, 15 Jun 2015 09:36:39 +0000 (09:36 +0000)]
am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev

* commit '5e50e00c663a5d0b11d1f41509e1fb4e56d166f1':
  Fix for shadows on theme editor

9 years agoam ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
Diego Perez [Mon, 15 Jun 2015 09:36:34 +0000 (09:36 +0000)]
am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev

* commit 'ead59b0d479c3a911be87261b523255e8e51f76a':
  Fix GcSnapshot drawInLayer when clipping is used.

9 years agoMerge "Fix for shadows on theme editor" into lmp-mr1-dev
Diego Perez [Mon, 15 Jun 2015 08:34:56 +0000 (08:34 +0000)]
Merge "Fix for shadows on theme editor" into lmp-mr1-dev

9 years agoMerge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
Diego Perez [Mon, 15 Jun 2015 08:34:01 +0000 (08:34 +0000)]
Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev

9 years agoRevert "Make VPA.setInterpolator(null) unset the interpolator."
Vladislav Kaznacheev [Mon, 15 Jun 2015 06:58:59 +0000 (06:58 +0000)]
Revert "Make VPA.setInterpolator(null) unset the interpolator."

This reverts commit 8cebf3a098eeff1f4b2359c4a3abdaf0e4dc494f.

Bug: 21804709
Change-Id: I4b3c2c4721b8e7dd5cb38c806bdd078344b09799

9 years agoMaybe make strings happy?
Jeff Sharkey [Mon, 15 Jun 2015 04:18:10 +0000 (21:18 -0700)]
Maybe make strings happy?

Bug: 21805255
Change-Id: I2e299a83b449aadc8e9a523fc4bbbf6f843f121d

9 years agoStart using new storage strings.
Jeff Sharkey [Mon, 15 Jun 2015 03:58:54 +0000 (20:58 -0700)]
Start using new storage strings.

We have language for "unsupported" devices, and we're letting the
user snooze missing private volumes.

Bug: 21666225
Change-Id: I0bc17e6b854946036f02df5b4953b4344fa85a1f

9 years agoMerge "Remove bookmarks provider and associated permissions - framework" into mnc-dev
Svetoslav [Sun, 14 Jun 2015 20:00:59 +0000 (20:00 +0000)]
Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev

9 years agoMerge "Clear runtime permissions on package data reset." into mnc-dev
Svet Ganov [Sun, 14 Jun 2015 03:22:06 +0000 (03:22 +0000)]
Merge "Clear runtime permissions on package data reset." into mnc-dev

9 years agoClear runtime permissions on package data reset.
Svet Ganov [Sun, 14 Jun 2015 03:10:36 +0000 (20:10 -0700)]
Clear runtime permissions on package data reset.

bug:21817488

Change-Id: I7c51fee5206e3bcb79951f237a71862f0752a709

9 years agoMake AppOpsManager#permissionToOp API public
Svet Ganov [Sun, 14 Jun 2015 00:31:29 +0000 (17:31 -0700)]
Make AppOpsManager#permissionToOp API public

We need this API to implement permission checker API
in the support lib that takes into account both app
ops and permissions.

bug:21277214

Change-Id: I684fc002bb71ec5e1cd2994098faa0d2036297ac

9 years agoMerge "UsbDeviceManager: Modify default function handling" into mnc-dev
Nick Kralevich [Sat, 13 Jun 2015 03:12:46 +0000 (03:12 +0000)]
Merge "UsbDeviceManager: Modify default function handling" into mnc-dev

9 years agoam 4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into mnc-previ...
Dirk Dougherty [Sat, 13 Jun 2015 02:57:04 +0000 (02:57 +0000)]
am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs

* commit '4decc115ae4fc846fffda238569d6c55451a63af':
  Doc change: move ndk docs jd into main docs tree.

9 years agoMerge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs
Dirk Dougherty [Sat, 13 Jun 2015 02:43:41 +0000 (02:43 +0000)]
Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs

9 years agoMerge "Improve LockPatternView accessibility" into mnc-dev
Jim Miller [Sat, 13 Jun 2015 01:10:20 +0000 (01:10 +0000)]
Merge "Improve LockPatternView accessibility" into mnc-dev

9 years agoam 16c31a77: (-s ours) am 49717697: am 34c7bd7c: am 74e04083: am 07264d93: am 18fb1c9...
Svetoslav [Sat, 13 Jun 2015 01:04:02 +0000 (01:04 +0000)]
am 16c31a77: (-s ours) am 49717697: am 34c7bd7c: am 74e04083: am 07264d93: am 18fb1c92: (-s ours) am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity.

* commit '16c31a77f75a30189a221043ad3ce73ca1610559':
  DO NOT MERGE Don't take flags when creating app widget config activity.

9 years agoMerge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev
Makoto Onuki [Sat, 13 Jun 2015 00:28:17 +0000 (00:28 +0000)]
Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev

9 years agoMerge "Fix dark mode for custom views" into mnc-dev
Jorim Jaggi [Sat, 13 Jun 2015 00:27:05 +0000 (00:27 +0000)]
Merge "Fix dark mode for custom views" into mnc-dev

9 years agoUsbDeviceManager: Modify default function handling
Nick Kralevich [Sat, 13 Jun 2015 00:19:12 +0000 (17:19 -0700)]
UsbDeviceManager: Modify default function handling

When adb is enabled, there's no need to also enable MTP mode.
ADB mode enabled is sufficient to get connect messages from
the kernel driver.

This change modifies getDefaultFunctions() to return adb mode
if adb is enabled, but mtp when it's not enabled. Also stop
using "none" mode as the default. "none" should only be used
when toggling the driver.

Bug: 21429947
Change-Id: I767491417c6c69a120fcf4f3d6ec0c73311a1a60

9 years agoFix ArrayIndexOutOfBoundsException in Transport.query
Makoto Onuki [Sat, 13 Jun 2015 00:14:57 +0000 (17:14 -0700)]
Fix ArrayIndexOutOfBoundsException in Transport.query

The bug was that it used getCount() instead of getColumnCount().

Bug 21727804

Change-Id: I3ed6ed3be60c2cb25316340f588f993bac70f52b

9 years agoMerge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev
Makoto Onuki [Fri, 12 Jun 2015 23:56:09 +0000 (23:56 +0000)]
Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev

9 years agoMerge "Fix negative inactiveTime on creating a new user" into mnc-dev
Amith Yamasani [Fri, 12 Jun 2015 23:38:24 +0000 (23:38 +0000)]
Merge "Fix negative inactiveTime on creating a new user" into mnc-dev

9 years agoFix negative inactiveTime on creating a new user
Amith Yamasani [Fri, 12 Jun 2015 23:35:17 +0000 (16:35 -0700)]
Fix negative inactiveTime on creating a new user

Initialize the beginIdleTime to 0 rather than current time.

Bug: 21699099
Change-Id: Ib94a9198c4e80aea5d9de68c5cf5d6f8cfc79e0a

9 years agoMerge "Fix rounding width." into mnc-dev
Ruben Brunk [Fri, 12 Jun 2015 23:34:49 +0000 (23:34 +0000)]
Merge "Fix rounding width." into mnc-dev

9 years agoMerge "App Standby: Convert constants to Settings.Global" into mnc-dev
Adam Lesinski [Fri, 12 Jun 2015 23:20:18 +0000 (23:20 +0000)]
Merge "App Standby: Convert constants to Settings.Global" into mnc-dev

9 years agoMerge "More useful extras in disk/volume broadcasts." into mnc-dev
Jeff Sharkey [Fri, 12 Jun 2015 23:19:32 +0000 (23:19 +0000)]
Merge "More useful extras in disk/volume broadcasts." into mnc-dev

9 years agoApp Standby: Convert constants to Settings.Global
Adam Lesinski [Fri, 12 Jun 2015 01:16:41 +0000 (18:16 -0700)]
App Standby: Convert constants to Settings.Global

Use settings instead of hardcoded constants, and listen for their changes.

Bug:21640379
Change-Id: Id8305bb234f93f7c64c1a5e82e26b31504624324

9 years agoMerge "BatteryStatsHelper: Fix some lost power" into mnc-dev
Adam Lesinski [Fri, 12 Jun 2015 23:17:46 +0000 (23:17 +0000)]
Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev

9 years agoMore useful extras in disk/volume broadcasts.
Jeff Sharkey [Fri, 12 Jun 2015 23:16:56 +0000 (16:16 -0700)]
More useful extras in disk/volume broadcasts.

Change-Id: I594166cff332aaf72b2b6357ac6ed3e6e42cbc49

9 years agoFix rounding width.
Ruben Brunk [Fri, 12 Jun 2015 23:16:42 +0000 (16:16 -0700)]
Fix rounding width.

Bug: 19930700
Change-Id: Ia2a1f85325e2c82e4d1ebe56aae696a207287cb7

9 years agoMerge "BatteryStats: Wifi energy data is sometimes wrong" into mnc-dev
Adam Lesinski [Fri, 12 Jun 2015 23:16:07 +0000 (23:16 +0000)]
Merge "BatteryStats: Wifi energy data is sometimes wrong" into mnc-dev

9 years agoBatteryStatsHelper: Fix some lost power
Adam Lesinski [Fri, 12 Jun 2015 23:12:07 +0000 (16:12 -0700)]
BatteryStatsHelper: Fix some lost power

Looks like we were losing some power calculations from the CPU side of Bluetooth and
WiFi if there was no controller activity ocurring.

Also add finer breakdown of power to BatteryStats dumpsys for WiFi and Bluetooth.

Change-Id: Ic3ce3e4e3b854f17f9a32fd4bdc47a8ea74ca439

9 years agoAdd StorageEventListener.onDiskDestroyed()
Makoto Onuki [Fri, 12 Jun 2015 23:10:25 +0000 (16:10 -0700)]
Add StorageEventListener.onDiskDestroyed()

Bug 21336042

Change-Id: I226cf205191dd302ff8d5156f9ae0fe8fc5b2c2b

9 years agoMerge "Put WebViews with on a HW layer if stencil/shader clipping is needed" into...
Chris Craik [Fri, 12 Jun 2015 22:46:19 +0000 (22:46 +0000)]
Merge "Put WebViews with on a HW layer if stencil/shader clipping is needed" into mnc-dev

9 years agoMerge "Don't use upgrade-key-sets check when scanning during boot." into mnc-dev
dcashman [Fri, 12 Jun 2015 22:21:58 +0000 (22:21 +0000)]
Merge "Don't use upgrade-key-sets check when scanning during boot." into mnc-dev

9 years agoMerge "Fix legacy disconnect callback." into mnc-dev
Ruben Brunk [Fri, 12 Jun 2015 22:21:52 +0000 (22:21 +0000)]
Merge "Fix legacy disconnect callback." into mnc-dev

9 years agoDoc change: move ndk docs jd into main docs tree.
Dirk Dougherty [Fri, 12 Jun 2015 01:59:34 +0000 (18:59 -0700)]
Doc change: move ndk docs jd into main docs tree.

Change-Id: I5c1ac7645dc68c28da97f46babcab5926c38dbea

9 years agoBatteryStats: Wifi energy data is sometimes wrong
Adam Lesinski [Fri, 12 Jun 2015 22:18:06 +0000 (15:18 -0700)]
BatteryStats: Wifi energy data is sometimes wrong

Wifi energy data sometimes reports negative values. The bug
is filed, but in the meanwhile, batterystats calculations
are way off due to strange values.

Now we ignore invalid data, and sample again later.
Bug:21613534

Change-Id: I3c5c1385e15d85346e6fd3a2737cb58ca706ab74

9 years agoMerge "Fixing no first "device added" notification." into mnc-dev
Paul McLean [Fri, 12 Jun 2015 22:07:48 +0000 (22:07 +0000)]
Merge "Fixing no first "device added" notification." into mnc-dev

9 years agoFixing no first "device added" notification.
Paul McLean [Wed, 10 Jun 2015 15:21:27 +0000 (08:21 -0700)]
Fixing no first "device added" notification.

bug: 21674851

Change-Id: I3b2ed1cf00342471a5c70f2aecc832480d7e06fd

9 years agoOnly read foreground attr for FrameLayouts for targetSdkVersion < M
Adam Powell [Fri, 12 Jun 2015 21:54:49 +0000 (14:54 -0700)]
Only read foreground attr for FrameLayouts for targetSdkVersion < M

Now that the android:foreground attribute is supported for all views
it turns out some existing apps were previously setting foreground or
applying styles with a foreground to unsupporting views even though
the values being set were not drawables. While this was silently
ignored before, now it results in app crashes.

The most expedient fix is to only support foreground on
non-FrameLayout views if the app sets targetSdkVersion to M or newer.

Bug 21646309

Change-Id: I8937f44988866e86e640555f4bbc5dd5b2e1cce1

9 years agoMerge "Removing screen artifacts afer orientation change in sleep mode" into mnc-dev
Stefan Kuhne [Fri, 12 Jun 2015 21:54:23 +0000 (21:54 +0000)]
Merge "Removing screen artifacts afer orientation change in sleep mode" into mnc-dev

9 years agoMerge "MidiDeviceServer: Fix race condition in setting device server's mDeviceInfo...
Mike Lockwood [Fri, 12 Jun 2015 21:51:38 +0000 (21:51 +0000)]
Merge "MidiDeviceServer: Fix race condition in setting device server's mDeviceInfo" into mnc-dev

9 years agoLabel work profile notification badge for a11y
Adrian Roos [Fri, 12 Jun 2015 21:26:58 +0000 (14:26 -0700)]
Label work profile notification badge for a11y

Bug: 21165217
Change-Id: I9d326332af0780c34dfd5cba182ff74a2bc34950

9 years agoMerge "audioservice: remove BT SCO device when service is disconnected" into mnc-dev
Eric Laurent [Fri, 12 Jun 2015 21:42:40 +0000 (21:42 +0000)]
Merge "audioservice: remove BT SCO device when service is disconnected" into mnc-dev