OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 1c855178: am 775a097f: am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into...
Jinsuk Kim [Tue, 25 Mar 2014 22:59:02 +0000 (22:59 +0000)]
am 1c855178: am 775a097f: am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev

* commit '1c855178e497f7ba788dadb87167f1e6735d10cb':
  Add HdmiCecManager

10 years agoam 76c30ce3: Merge "Rework Outline API, remove isolatedZVolume remnants"
Chris Craik [Tue, 25 Mar 2014 22:58:59 +0000 (22:58 +0000)]
am 76c30ce3: Merge "Rework Outline API, remove isolatedZVolume remnants"

* commit '76c30ce3c1d8f1a818502aaea2c42c84d6bd3f92':
  Rework Outline API, remove isolatedZVolume remnants

10 years agoam f114a5c4: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs"
Craig Mautner [Tue, 25 Mar 2014 22:58:56 +0000 (22:58 +0000)]
am f114a5c4: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs"

* commit 'f114a5c4d123af574dbae89befc3be61a01d1382':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs

10 years agoam 43111e89: Merge "Battery stats: wake locks, radio active, cleanup."
Dianne Hackborn [Tue, 25 Mar 2014 22:58:53 +0000 (22:58 +0000)]
am 43111e89: Merge "Battery stats: wake locks, radio active, cleanup."

* commit '43111e897be9f79ababb0ecf99f155695416d956':
  Battery stats: wake locks, radio active, cleanup.

10 years agoam 48a5dbd3: Update current.txt for offset attributes.
Will Haldean Brown [Tue, 25 Mar 2014 22:58:49 +0000 (22:58 +0000)]
am 48a5dbd3: Update current.txt for offset attributes.

* commit '48a5dbd3cc5dd8a919983455757dc4c7b82500ab':
  Update current.txt for offset attributes.

10 years agoam 370cd467: am 87eac093: am 5771d425: am 5b2e92e3: am 529d47ac: am e9863dbe: Merge...
quddusc [Tue, 25 Mar 2014 22:58:45 +0000 (22:58 +0000)]
am 370cd467: am 87eac093: am 5771d425: am 5b2e92e3: am 529d47ac: am e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs

* commit '370cd4677b8ee6c8b97291b02fb0c28fd275965e':
  docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.

10 years agoam 0d828311: am ce6307d3: am 3ee70ca4: am 9c1eaeb0: am ff2599f9: am 0802b4fb: Merge...
quddusc [Tue, 25 Mar 2014 22:58:40 +0000 (22:58 +0000)]
am 0d828311: am ce6307d3: am 3ee70ca4: am 9c1eaeb0: am ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs

* commit '0d828311ba0bc40245bc5a20a15258d8621f0245':
  docs: Added Javadoc for Gcore Jarlsberg release.

10 years agoam 4c01eccb: am 38fc02d4: am d9e5761a: am 04ea3ca0: am 50ac19e9: am ba126c09: Disable...
Selim Cinek [Tue, 25 Mar 2014 22:58:37 +0000 (22:58 +0000)]
am 4c01eccb: am 38fc02d4: am d9e5761a: am 04ea3ca0: am 50ac19e9: am ba126c09: Disable Set Wallpaper button while loading image

* commit '4c01eccb0c06fb83532cad00cbf9a4b47b6dc1f8':
  Disable Set Wallpaper button while loading image

10 years agoam 87f738d2: am 51e93804: am 05e4dc96: am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge...
Chad Brubaker [Tue, 25 Mar 2014 22:58:33 +0000 (22:58 +0000)]
am 87f738d2: am 51e93804: am 05e4dc96: am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev

* commit '87f738d2787444854cd15695b599b84b25027167':
  Fix support for simultaneous VPN tuns

10 years agoam ff3bb2fe: am 7f623d6b: am 9506e84b: am c7726147: am 1fce89d9: am de4e7b49: Merge...
Chad Brubaker [Tue, 25 Mar 2014 22:58:30 +0000 (22:58 +0000)]
am ff3bb2fe: am 7f623d6b: am 9506e84b: am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev

* commit 'ff3bb2fe95a7d0158f5a456368eb7fa91069bc23':
  Include the interface for clearDnsInterfaceForUidRange

10 years agoam b7fe3363: am 1575e1a1: (-s ours) am 419b17ec: am 1d77a874: am 588300cb: am 2e92965...
Ricardo Cervera [Tue, 25 Mar 2014 22:58:26 +0000 (22:58 +0000)]
am b7fe3363: am 1575e1a1: (-s ours) am 419b17ec: am 1d77a874: am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs

* commit 'b7fe33633b49924c35751d4e5796f8add4ad623c':
  docs: Added new sensor types. Bug: 10674725

10 years agoam 8ed3b587: Merge "add more dump info for heads up notifications"
Chris Wren [Tue, 25 Mar 2014 22:58:22 +0000 (22:58 +0000)]
am 8ed3b587: Merge "add more dump info for heads up notifications"

* commit '8ed3b587f00ccb1b4264d2ee3590af32464428c9':
  add more dump info for heads up notifications

10 years agoam 1e1f4d70: am 02e99e27: am ae316643: am aff40e25: am fc603ca6: am abf701e6: Merge...
John Reck [Tue, 25 Mar 2014 22:58:19 +0000 (22:58 +0000)]
am 1e1f4d70: am 02e99e27: am ae316643: am aff40e25: am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev

* commit '1e1f4d705edaad3700b49c730bc8a22c522cb46b':
  Eliminate mHasAlpha

10 years agoam 48600b95: Merge "Fix issue #13564072: Back button no longer dismisses IME after...
Dianne Hackborn [Tue, 25 Mar 2014 22:58:16 +0000 (22:58 +0000)]
am 48600b95: Merge "Fix issue #13564072: Back button no longer dismisses IME after voice usage"

* commit '48600b95cad8d49772ca5634a317b893d2346f42':
  Fix issue #13564072: Back button no longer dismisses IME after voice usage

10 years agoam 7d867342: Merge "Get rid of not specifying a user errors in bluetooth."
Dianne Hackborn [Tue, 25 Mar 2014 22:58:11 +0000 (22:58 +0000)]
am 7d867342: Merge "Get rid of not specifying a user errors in bluetooth."

* commit '7d86734297bf6c2f71404498567cc92576591b8c':
  Get rid of not specifying a user errors in bluetooth.

10 years agoam 1d22bd19: am 8ae2ce76: am 7bde0fc7: am 2270ac96: am 8114c3d0: am 1a70f391: Merge...
Unsuk Jung [Tue, 25 Mar 2014 22:58:07 +0000 (22:58 +0000)]
am 1d22bd19: am 8ae2ce76: am 7bde0fc7: am 2270ac96: am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev

* commit '1d22bd1986ced3c5396dea83d2d04f84457953ee':
  Change wallpaper sizing

10 years agoam bdb78d82: am ede2a729: am ccd55a92: am f8c78b50: Update current.txt to include...
Will Haldean Brown [Tue, 25 Mar 2014 22:58:04 +0000 (22:58 +0000)]
am bdb78d82: am ede2a729: am ccd55a92: am f8c78b50: Update current.txt to include windowSwipeToDismiss

* commit 'bdb78d8261c61e8b1c30af7ff2a39cc91026aa02':
  Update current.txt to include windowSwipeToDismiss

10 years agoam f96bfe86: am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to...
Alex Klyubin [Tue, 25 Mar 2014 22:58:00 +0000 (22:58 +0000)]
am f96bfe86: am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."

* commit 'f96bfe86a68bfd0491a76cf6dfa515dc58f027bb':
  Adjust to the change in the private SSLParameterImpl API.

10 years agoam 6640f6be: am b8846c81: am cf0c4a59: am 4868da52: am c620ec36: am 3f523222: Merge...
Jeff Sharkey [Tue, 25 Mar 2014 22:57:57 +0000 (22:57 +0000)]
am 6640f6be: am b8846c81: am cf0c4a59: am 4868da52: am c620ec36: am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev

* commit '6640f6be412e7454bfa7d457670e83aba46ea28c':
  Lock down MANAGE_DOCUMENTS permission.

10 years agoam 02893315: am d3e33cc2: am aa0fa8eb: am cedbfad4: Fix link in documentation for...
Will Haldean Brown [Tue, 25 Mar 2014 22:57:54 +0000 (22:57 +0000)]
am 02893315: am d3e33cc2: am aa0fa8eb: am cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS.

* commit '0289331500457837f8ec20eea42f7bbbc2c3f479':
  Fix link in documentation for SWIPE_TO_DISMISS.

10 years agoam 125f2155: am e3d4f6c1: (-s ours) am 8f2c3252: am 496e8178: Merge "Make windowSwipe...
Will Haldean Brown [Tue, 25 Mar 2014 22:57:51 +0000 (22:57 +0000)]
am 125f2155: am e3d4f6c1: (-s ours) am 8f2c3252: am 496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev

* commit '125f2155bedf37841d7c9a9b59fb2680e41cfcef':
  Make windowSwipeToDismiss a public attribute.

10 years agoam 70d78bbe: Make windowSwipeToDismiss a public attribute.
Will Haldean Brown [Tue, 25 Mar 2014 22:57:48 +0000 (22:57 +0000)]
am 70d78bbe: Make windowSwipeToDismiss a public attribute.

* commit '70d78bbeecc491ebb0a30ee650d2445145992514':
  Make windowSwipeToDismiss a public attribute.

10 years agoam fea8d956: Merge "Fix null ActivityOptions when starting an Activity in a new Process."
George Mount [Tue, 25 Mar 2014 22:57:45 +0000 (22:57 +0000)]
am fea8d956: Merge "Fix null ActivityOptions when starting an Activity in a new Process."

* commit 'fea8d956649589f1cfd378571cc9ad61a92cd480':
  Fix null ActivityOptions when starting an Activity in a new Process.

10 years agoam 07e1b900: Merge "Fix problem on Animator with a start delay."
George Mount [Tue, 25 Mar 2014 22:57:42 +0000 (22:57 +0000)]
am 07e1b900: Merge "Fix problem on Animator with a start delay."

* commit '07e1b9002a51032a7dc782178d3c29d3417ab266':
  Fix problem on Animator with a start delay.

10 years agoam 7638b1f3: Merge "Do not reset language in case of the TTS service reconnect."
Przemyslaw Szczepaniak [Tue, 25 Mar 2014 22:57:39 +0000 (22:57 +0000)]
am 7638b1f3: Merge "Do not reset language in case of the TTS service reconnect."

* commit '7638b1f3b56d8176e401a4067b18749682635f0c':
  Do not reset language in case of the TTS service reconnect.

10 years agoam a73b0c54: Merge "Fix log spam from View.toString()."
Mathew Inwood [Tue, 25 Mar 2014 22:57:36 +0000 (22:57 +0000)]
am a73b0c54: Merge "Fix log spam from View.toString()."

* commit 'a73b0c54b3f8c00028ff9b39aa1e0f5556d7c6f2':
  Fix log spam from View.toString().

10 years agoam 296f1a91: Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks.""
Craig Mautner [Tue, 25 Mar 2014 22:57:33 +0000 (22:57 +0000)]
am 296f1a91: Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks.""

* commit '296f1a9130cc5d5339ab1d1c3cfc7324920acf8a':
  Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."

10 years agoam 61ada5d3: Merge "Add Activity methods for icons and labels."
Craig Mautner [Tue, 25 Mar 2014 22:57:29 +0000 (22:57 +0000)]
am 61ada5d3: Merge "Add Activity methods for icons and labels."

* commit '61ada5d330e10a738ba5f085cae5b9b339895d19':
  Add Activity methods for icons and labels.

10 years agoam 9ae0c8ff: Merge "Add notification category for recommendations."
John Spurlock [Tue, 25 Mar 2014 22:57:26 +0000 (22:57 +0000)]
am 9ae0c8ff: Merge "Add notification category for recommendations."

* commit '9ae0c8ffba5ab50fb02d319a00e56fe42960cb4a':
  Add notification category for recommendations.

10 years agoam e9c9c441: Merge "Battery stats: track actually running time"
Dianne Hackborn [Tue, 25 Mar 2014 22:57:23 +0000 (22:57 +0000)]
am e9c9c441: Merge "Battery stats: track actually running time"

* commit 'e9c9c441346586e26eccc0523fcf12f5158e53f7':
  Battery stats: track actually running time

10 years agoam 18a65ad0: Merge "Cap the size of app-defined permission trees"
Christopher Tate [Tue, 25 Mar 2014 22:57:20 +0000 (22:57 +0000)]
am 18a65ad0: Merge "Cap the size of app-defined permission trees"

* commit '18a65ad09d9a245266874015e5aacb05d868a534':
  Cap the size of app-defined permission trees

10 years agoam e9c77aee: Merge "Fixing crash with multiple touch pointers"
Winson Chung [Tue, 25 Mar 2014 22:57:18 +0000 (22:57 +0000)]
am e9c77aee: Merge "Fixing crash with multiple touch pointers"

* commit 'e9c77aee60fbb781db916d32fe1db81e1d973f8f':
  Fixing crash with multiple touch pointers

10 years agoam cde7086b: Merge "Downgrade expedited to normal on reschedule."
Matthew Williams [Tue, 25 Mar 2014 22:57:15 +0000 (22:57 +0000)]
am cde7086b: Merge "Downgrade expedited to normal on reschedule."

* commit 'cde7086b900fd192a8e389f62ab5007d351d86b8':
  Downgrade expedited to normal on reschedule.

10 years agoam 717e0f5d: Merge "Don\'t prompt at boot if we already did that when decrypting"
Paul Lawrence [Tue, 25 Mar 2014 22:57:11 +0000 (22:57 +0000)]
am 717e0f5d: Merge "Don\'t prompt at boot if we already did that when decrypting"

* commit '717e0f5db7161ddfff98f21fe1cdb2a3b1a6c8b7':
  Don't prompt at boot if we already did that when decrypting

10 years agoam a7efb93c: am a10958f1: am cfba284a: am d73e66cc: Fix broken build
Jinsuk Kim [Tue, 25 Mar 2014 22:57:08 +0000 (22:57 +0000)]
am a7efb93c: am a10958f1: am cfba284a: am d73e66cc: Fix broken build

* commit 'a7efb93c1b4e717049b106312ff353cd95c74f0e':
  Fix broken build

10 years agoam 8a60ded0: Merge "resolved conflicts for merge of a67e34c8 to master"
Colin Cross [Tue, 25 Mar 2014 22:57:03 +0000 (22:57 +0000)]
am 8a60ded0: Merge "resolved conflicts for merge of a67e34c8 to master"

* commit '8a60ded02614bc8358f89aa9b7cf3f8e7b1383a2':
  Add HDMI-CEC service

10 years agoam caf94773: Merge "Convert a attach/detach functor in ViewRootImpl to x64"
Bo Liu [Tue, 25 Mar 2014 22:56:59 +0000 (22:56 +0000)]
am caf94773: Merge "Convert a attach/detach functor in ViewRootImpl to x64"

* commit 'caf947737d3e94d2f5d839ec1fa951df7937fdb2':
  Convert a attach/detach functor in ViewRootImpl to x64

10 years agoam fb40d78c: Merge "Catch exceptions if Exif is malformed"
Adam Cohen [Tue, 25 Mar 2014 22:56:57 +0000 (22:56 +0000)]
am fb40d78c: Merge "Catch exceptions if Exif is malformed"

* commit 'fb40d78c57711585c9eaed467601bf3adb4f60f9':
  Catch exceptions if Exif is malformed

10 years agoam 146af201: Merge "Catching security exception when activity destroyed"
Adam Cohen [Tue, 25 Mar 2014 22:56:54 +0000 (22:56 +0000)]
am 146af201: Merge "Catching security exception when activity destroyed"

* commit '146af201d380cffa6a540fd0d52590bd9d30b614':
  Catching security exception when activity destroyed

10 years agoam 3daafcd7: Merge "Annotate framework vibrate calls with stream hints."
John Spurlock [Tue, 25 Mar 2014 22:56:51 +0000 (22:56 +0000)]
am 3daafcd7: Merge "Annotate framework vibrate calls with stream hints."

* commit '3daafcd7bab6e3ace72396576529e3049ab4c066':
  Annotate framework vibrate calls with stream hints.

10 years agoam a4c1ccf3: Merge "Disable Set Wallpaper button while loading image"
Selim Cinek [Tue, 25 Mar 2014 22:56:48 +0000 (22:56 +0000)]
am a4c1ccf3: Merge "Disable Set Wallpaper button while loading image"

* commit 'a4c1ccf3e045accd321be4d4c7d2ba1941a49ab4':
  Disable Set Wallpaper button while loading image

10 years agoam f7ad8557: Apply FLAG_SHOW_WHEN_LOCKED within tasks.
Craig Mautner [Tue, 25 Mar 2014 22:56:45 +0000 (22:56 +0000)]
am f7ad8557: Apply FLAG_SHOW_WHEN_LOCKED within tasks.

* commit 'f7ad855718dc576a1618a54035b82e92356aa0d8':
  Apply FLAG_SHOW_WHEN_LOCKED within tasks.

10 years agoMerge "Import translations. DO NOT MERGE" into master-lockscreen-dev
Baligh Uddin [Tue, 25 Mar 2014 18:56:29 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev

10 years agoam 775a097f: am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
Jinsuk Kim [Mon, 24 Mar 2014 21:25:21 +0000 (21:25 +0000)]
am 775a097f: am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev

* commit '775a097f01a349548d2124ae9d7dd562c72eaa27':
  Add HdmiCecManager

10 years agoMerge "Rework Outline API, remove isolatedZVolume remnants"
Chris Craik [Mon, 24 Mar 2014 21:22:35 +0000 (21:22 +0000)]
Merge "Rework Outline API, remove isolatedZVolume remnants"

10 years agoMerge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs"
Craig Mautner [Mon, 24 Mar 2014 20:52:13 +0000 (20:52 +0000)]
Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs"

10 years agoMerge "Battery stats: wake locks, radio active, cleanup."
Dianne Hackborn [Mon, 24 Mar 2014 20:42:30 +0000 (20:42 +0000)]
Merge "Battery stats: wake locks, radio active, cleanup."

10 years agoBattery stats: wake locks, radio active, cleanup.
Dianne Hackborn [Mon, 24 Mar 2014 20:36:46 +0000 (13:36 -0700)]
Battery stats: wake locks, radio active, cleanup.

- Improve wake lock work source updates to also update the current
  history tag, in case the new work source gets recorded in the
  history.

- Fix bug in recording radio active time that was not distributing
  any time to apps.

- No longer hold a wake lock while dispatching data conn active call,
  since it comes with its own timestamp.

- Fix issue where the top app was not being cleared while the screen
  was off.

- Remove obsolete STATS_LAST stats type.

- Fix bug that was not clearing the total run time when resetting
  the stats.

Change-Id: Iabe17a9edf34f762374ae09fcffb8a819cf72e30

10 years agoUpdate current.txt for offset attributes.
Will Haldean Brown [Mon, 24 Mar 2014 20:23:42 +0000 (13:23 -0700)]
Update current.txt for offset attributes.

Change-Id: I0f88a6f327edfc207c081e424e3c97edd1451c90

10 years agoam 87eac093: am 5771d425: am 5b2e92e3: am 529d47ac: am e9863dbe: Merge "docs: Added...
quddusc [Mon, 24 Mar 2014 19:36:50 +0000 (19:36 +0000)]
am 87eac093: am 5771d425: am 5b2e92e3: am 529d47ac: am e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs

* commit '87eac09358a49473549fa30e4acbf93c66b8915e':
  docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.

10 years agoam ce6307d3: am 3ee70ca4: am 9c1eaeb0: am ff2599f9: am 0802b4fb: Merge "docs: Added...
quddusc [Mon, 24 Mar 2014 19:36:45 +0000 (19:36 +0000)]
am ce6307d3: am 3ee70ca4: am 9c1eaeb0: am ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs

* commit 'ce6307d3c84ebf200e35cabf70cf49712ac14e04':
  docs: Added Javadoc for Gcore Jarlsberg release.

10 years agoam 38fc02d4: am d9e5761a: am 04ea3ca0: am 50ac19e9: am ba126c09: Disable Set Wallpape...
Selim Cinek [Mon, 24 Mar 2014 19:36:14 +0000 (19:36 +0000)]
am 38fc02d4: am d9e5761a: am 04ea3ca0: am 50ac19e9: am ba126c09: Disable Set Wallpaper button while loading image

* commit '38fc02d4efa9e943ab38306d466c5fe2786f1bb7':
  Disable Set Wallpaper button while loading image

10 years agoam 51e93804: am 05e4dc96: am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support...
Chad Brubaker [Mon, 24 Mar 2014 19:35:25 +0000 (19:35 +0000)]
am 51e93804: am 05e4dc96: am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev

* commit '51e938041e72f29c4e776a8627ea9d8a70d62728':
  Fix support for simultaneous VPN tuns

10 years agoam 7f623d6b: am 9506e84b: am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the...
Chad Brubaker [Mon, 24 Mar 2014 19:35:20 +0000 (19:35 +0000)]
am 7f623d6b: am 9506e84b: am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev

* commit '7f623d6b9459bc982c49f0a74aa2c9911f8e1dd8':
  Include the interface for clearDnsInterfaceForUidRange

10 years agoam 1575e1a1: (-s ours) am 419b17ec: am 1d77a874: am 588300cb: am 2e929658: Merge...
Ricardo Cervera [Mon, 24 Mar 2014 19:35:11 +0000 (19:35 +0000)]
am 1575e1a1: (-s ours) am 419b17ec: am 1d77a874: am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs

* commit '1575e1a1f5c6a0e1d870af88cba8d54023dfbcab':
  docs: Added new sensor types. Bug: 10674725

10 years agoMerge "add more dump info for heads up notifications"
Chris Wren [Mon, 24 Mar 2014 18:57:06 +0000 (18:57 +0000)]
Merge "add more dump info for heads up notifications"

10 years agoam 02e99e27: am ae316643: am aff40e25: am fc603ca6: am abf701e6: Merge "Eliminate...
John Reck [Mon, 24 Mar 2014 18:44:01 +0000 (18:44 +0000)]
am 02e99e27: am ae316643: am aff40e25: am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev

* commit '02e99e272dbfedf5d9ba1ae91fa2b83cab5b3d07':
  Eliminate mHasAlpha

10 years agoMerge "Fix issue #13564072: Back button no longer dismisses IME after voice usage"
Dianne Hackborn [Mon, 24 Mar 2014 18:37:50 +0000 (18:37 +0000)]
Merge "Fix issue #13564072: Back button no longer dismisses IME after voice usage"

10 years agoMerge "Get rid of not specifying a user errors in bluetooth."
Dianne Hackborn [Mon, 24 Mar 2014 18:37:18 +0000 (18:37 +0000)]
Merge "Get rid of not specifying a user errors in bluetooth."

10 years agoRework Outline API, remove isolatedZVolume remnants
Chris Craik [Thu, 20 Mar 2014 19:44:20 +0000 (12:44 -0700)]
Rework Outline API, remove isolatedZVolume remnants

Change-Id: I30c2fe832dcb98fa6329b1a595b3d3aafbdcad6b

10 years agoFix issue #13564072: Back button no longer dismisses IME after voice usage
Dianne Hackborn [Mon, 24 Mar 2014 18:27:18 +0000 (11:27 -0700)]
Fix issue #13564072: Back button no longer dismisses IME after voice usage

Calling identity wasn't being cleared in an incoming code path.

Change-Id: Ib32060a91bf81531de049fafde69835b5382a25f

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 24 Mar 2014 17:35:45 +0000 (10:35 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam 8ae2ce76: am 7bde0fc7: am 2270ac96: am 8114c3d0: am 1a70f391: Merge "Change wallpa...
Unsuk Jung [Mon, 24 Mar 2014 17:34:22 +0000 (17:34 +0000)]
am 8ae2ce76: am 7bde0fc7: am 2270ac96: am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev

* commit '8ae2ce76e3d44f9b25f8121c693a1e21fef3bbe0':
  Change wallpaper sizing

10 years agoam ede2a729: am ccd55a92: am f8c78b50: Update current.txt to include windowSwipeToDismiss
Will Haldean Brown [Mon, 24 Mar 2014 17:34:18 +0000 (17:34 +0000)]
am ede2a729: am ccd55a92: am f8c78b50: Update current.txt to include windowSwipeToDismiss

* commit 'ede2a729c394461e5b3ea674e4762e7e6feed81d':
  Update current.txt to include windowSwipeToDismiss

10 years agoam 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in...
Alex Klyubin [Mon, 24 Mar 2014 17:34:11 +0000 (17:34 +0000)]
am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."

* commit '7ae93b1d0cd1eb43b5fc8248dfc2703608a461f3':
  Adjust to the change in the private SSLParameterImpl API.

10 years agoam b8846c81: am cf0c4a59: am 4868da52: am c620ec36: am 3f523222: Merge "Lock down...
Jeff Sharkey [Mon, 24 Mar 2014 17:34:02 +0000 (17:34 +0000)]
am b8846c81: am cf0c4a59: am 4868da52: am c620ec36: am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev

* commit 'b8846c819e43535250b004dde593892fa305b7e7':
  Lock down MANAGE_DOCUMENTS permission.

10 years agoam d3e33cc2: am aa0fa8eb: am cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS.
Will Haldean Brown [Mon, 24 Mar 2014 17:33:58 +0000 (17:33 +0000)]
am d3e33cc2: am aa0fa8eb: am cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS.

* commit 'd3e33cc25d638cced9c17822db21e6c32e00f461':
  Fix link in documentation for SWIPE_TO_DISMISS.

10 years agoam e3d4f6c1: (-s ours) am 8f2c3252: am 496e8178: Merge "Make windowSwipeToDismiss...
Will Haldean Brown [Mon, 24 Mar 2014 17:33:55 +0000 (17:33 +0000)]
am e3d4f6c1: (-s ours) am 8f2c3252: am 496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev

* commit 'e3d4f6c19bb21dd20d95446def9a8872ecab2721':
  Make windowSwipeToDismiss a public attribute.

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 24 Mar 2014 17:24:12 +0000 (10:24 -0700)]
Import translations. DO NOT MERGE

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

10 years agoMake windowSwipeToDismiss a public attribute.
Will Haldean Brown [Thu, 20 Mar 2014 23:31:48 +0000 (16:31 -0700)]
Make windowSwipeToDismiss a public attribute.

resolved conflicts for merge of e3d4f6c1 to master

Bug: 13348970
Change-Id: I695139376fc7f38b3438ab38659ca15490ce8f7c

10 years agoMerge "Fix null ActivityOptions when starting an Activity in a new Process."
George Mount [Mon, 24 Mar 2014 16:47:08 +0000 (16:47 +0000)]
Merge "Fix null ActivityOptions when starting an Activity in a new Process."

10 years agoMerge "Fix problem on Animator with a start delay."
George Mount [Mon, 24 Mar 2014 16:46:59 +0000 (16:46 +0000)]
Merge "Fix problem on Animator with a start delay."

10 years agoam 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
Jinsuk Kim [Mon, 24 Mar 2014 12:34:15 +0000 (12:34 +0000)]
am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev

* commit '3c34e5dbbb99d3d66f71eea5db6e001cc5495263':
  Add HdmiCecManager

10 years agoam c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
Jinsuk Kim [Mon, 24 Mar 2014 12:26:51 +0000 (12:26 +0000)]
am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev

* commit 'c01e1aeb0d86bd626684c97d709d4a8e995fddfb':
  Add HdmiCecManager

10 years agoMerge "Do not reset language in case of the TTS service reconnect."
Przemyslaw Szczepaniak [Mon, 24 Mar 2014 10:08:36 +0000 (10:08 +0000)]
Merge "Do not reset language in case of the TTS service reconnect."

10 years agoMerge "Fix log spam from View.toString()."
Mathew Inwood [Mon, 24 Mar 2014 09:46:22 +0000 (09:46 +0000)]
Merge "Fix log spam from View.toString()."

10 years agoMerge "Add HdmiCecManager" into klp-modular-dev
Jinsuk Kim [Sun, 23 Mar 2014 23:24:44 +0000 (23:24 +0000)]
Merge "Add HdmiCecManager" into klp-modular-dev

10 years agoAdd HdmiCecManager
Jinsuk Kim [Fri, 21 Mar 2014 07:25:13 +0000 (16:25 +0900)]
Add HdmiCecManager

Introduces HdmiCecManager/HdmiCecClient to provide apps/system components
with the way to access HdmiCecService via Context.getSystemService(HDMI_CEC_SERVICE).

Change-Id: I39da071a328074a4b7b049947943688bd7779c26

10 years agoMerge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks.""
Craig Mautner [Sun, 23 Mar 2014 01:20:41 +0000 (01:20 +0000)]
Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks.""

10 years agoRevert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."
Craig Mautner [Sun, 23 Mar 2014 00:10:33 +0000 (00:10 +0000)]
Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."

This reverts commit f7ad855718dc576a1618a54035b82e92356aa0d8.

After careful consideration this would prove to be a security leak to leave it in. Tasks could deliberately launch dialog activities that don't want to be seen in an unsecure setting. These would then be visible over the task background.

Change-Id: Ia7e984bc9616573af6c7772f6ea0f2dd588bb85d

10 years agoMerge "Add Activity methods for icons and labels."
Craig Mautner [Sat, 22 Mar 2014 23:44:37 +0000 (23:44 +0000)]
Merge "Add Activity methods for icons and labels."

10 years agoAdd Activity methods for icons and labels.
Craig Mautner [Fri, 21 Mar 2014 16:34:07 +0000 (09:34 -0700)]
Add Activity methods for icons and labels.

New Activity methods setRecentsLabel(CharSequence) and
setRecentsIcon(Bitmap) have been added. The topmost
activity with either of these set will be returned in
RecentTaskInfo members activityLabel and activityIcon.

Fixes bug 13562992.

Change-Id: Ic15d1d27b733b892a2a940063b105ac48f1ffee5

10 years agoam 5771d425: am 5b2e92e3: am 529d47ac: am e9863dbe: Merge "docs: Added feature highli...
quddusc [Sat, 22 Mar 2014 09:41:12 +0000 (09:41 +0000)]
am 5771d425: am 5b2e92e3: am 529d47ac: am e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs

* commit '5771d42544ddc46f82c1b793d361df30c6fc90bf':
  docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.

10 years agoam 3ee70ca4: am 9c1eaeb0: am ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for...
quddusc [Sat, 22 Mar 2014 09:41:08 +0000 (09:41 +0000)]
am 3ee70ca4: am 9c1eaeb0: am ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs

* commit '3ee70ca452b3f0bf9482b6c18d18b9c03be07422':
  docs: Added Javadoc for Gcore Jarlsberg release.

10 years agoam 5b2e92e3: am 529d47ac: am e9863dbe: Merge "docs: Added feature highlights and...
quddusc [Sat, 22 Mar 2014 09:30:56 +0000 (09:30 +0000)]
am 5b2e92e3: am 529d47ac: am e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs

* commit '5b2e92e37b41b1497b240d41df471081c9dfdc56':
  docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.

10 years agoam 9c1eaeb0: am ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg...
quddusc [Sat, 22 Mar 2014 09:30:42 +0000 (09:30 +0000)]
am 9c1eaeb0: am ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs

* commit '9c1eaeb0b4f942b2163175c846e1c08ed4b14cbf':
  docs: Added Javadoc for Gcore Jarlsberg release.

10 years agoam 529d47ac: am e9863dbe: Merge "docs: Added feature highlights and related resources...
quddusc [Sat, 22 Mar 2014 04:09:04 +0000 (04:09 +0000)]
am 529d47ac: am e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs

* commit '529d47ace907c9d961e2c1fb2e4e68ff24833e72':
  docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.

10 years agoam ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release...
quddusc [Sat, 22 Mar 2014 04:08:59 +0000 (04:08 +0000)]
am ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs

* commit 'ff2599f9b2f25179cad9631181216f2d24255901':
  docs: Added Javadoc for Gcore Jarlsberg release.

10 years agoMerge "Add notification category for recommendations."
John Spurlock [Sat, 22 Mar 2014 01:35:46 +0000 (01:35 +0000)]
Merge "Add notification category for recommendations."

10 years agoAdd notification category for recommendations.
John Spurlock [Fri, 21 Mar 2014 17:30:57 +0000 (13:30 -0400)]
Add notification category for recommendations.

Change-Id: I3718b8273c3f901aee1b2c2cdc4fcdae25fadcad

10 years agoMerge "Battery stats: track actually running time"
Dianne Hackborn [Sat, 22 Mar 2014 00:26:19 +0000 (00:26 +0000)]
Merge "Battery stats: track actually running time"

10 years agoam e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsber...
quddusc [Sat, 22 Mar 2014 00:01:20 +0000 (00:01 +0000)]
am e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs

* commit 'e9863dbe0665d5ce6dd46d673034a488b7637aff':
  docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.

10 years agoam 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
quddusc [Sat, 22 Mar 2014 00:01:16 +0000 (00:01 +0000)]
am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs

* commit '0802b4fb391eecf37626d3d57f5e07eeb32a3185':
  docs: Added Javadoc for Gcore Jarlsberg release.

10 years agoMerge "docs: Added feature highlights and related resources for Jarlsberg to Google...
quddusc [Fri, 21 Mar 2014 23:55:42 +0000 (23:55 +0000)]
Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs

10 years agoMerge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
quddusc [Fri, 21 Mar 2014 23:55:34 +0000 (23:55 +0000)]
Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs

10 years agodocs: Added feature highlights and related resources for Jarlsberg to Google Play...
quddusc [Thu, 20 Mar 2014 21:31:35 +0000 (14:31 -0700)]
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.

Change-Id: Idc5dc716aa92c752b8dcd1967958d9d46521dfa6

10 years agoMerge "Cap the size of app-defined permission trees"
Christopher Tate [Fri, 21 Mar 2014 23:32:58 +0000 (23:32 +0000)]
Merge "Cap the size of app-defined permission trees"

10 years agoFix null ActivityOptions when starting an Activity in a new Process.
George Mount [Thu, 20 Mar 2014 16:38:23 +0000 (09:38 -0700)]
Fix null ActivityOptions when starting an Activity in a new Process.

Bug 13563265

Change-Id: Ie56cd6d55f13dbf68bafb82ab4bd6b27fde60df6

10 years agoBattery stats: track actually running time
Dianne Hackborn [Fri, 21 Mar 2014 18:07:11 +0000 (11:07 -0700)]
Battery stats: track actually running time

Use the uptime while creating the battery stats history to
generate a new event indicating when the CPU is actually running.
We can do this in combination with the new event reporting when
the CPU comes awake, looking at the difference between the
uptime and elapsed time at that point to determine when it last
when to sleep.

Also use this information to generate a new set of aggregated
states, the uptime caused by each wake reason.

Finally use new radio down timestamp to adjust the times we
compute for radio use.  Note that this information is not (yet)
being used to adjust how these are recorded in the history.

Change-Id: I723b3b526c8e7d64de0cac9d1193e04132d5a3e4

10 years agoFix problem on Animator with a start delay.
George Mount [Fri, 21 Mar 2014 23:13:37 +0000 (16:13 -0700)]
Fix problem on Animator with a start delay.

Bug 13589060

Change-Id: I05b9421fa141466bdbfe19f1bd5d993fa23982cb