OSDN Git Service

android-x86/frameworks-base.git
9 years agoAdd percentiles
John Reck [Fri, 6 Mar 2015 22:40:50 +0000 (14:40 -0800)]
Add percentiles

Change-Id: Ieb6badd177bb6f67dda199dfcb3e0f483c8c4e59

9 years agoFix build. getAlingment should not be public
Yigit Boyar [Thu, 5 Mar 2015 22:39:38 +0000 (14:39 -0800)]
Fix build. getAlingment should not be public

Change-Id: I4abde1ddc78367795601215106388d6eb535cbca

9 years agoMerge "Handle null epicenters in EpicenterClipReveal."
George Mount [Thu, 5 Mar 2015 22:33:08 +0000 (22:33 +0000)]
Merge "Handle null epicenters in EpicenterClipReveal."

9 years agoHandle null epicenters in EpicenterClipReveal.
George Mount [Thu, 5 Mar 2015 22:09:33 +0000 (14:09 -0800)]
Handle null epicenters in EpicenterClipReveal.

Bug 19617067

Change-Id: Ie288288f7a8e0c95ed07d8beb40b78f80048fa98

9 years agoMerge "AudioService: Add current stream devices to dumpsys output."
John Spurlock [Thu, 5 Mar 2015 22:12:46 +0000 (22:12 +0000)]
Merge "AudioService: Add current stream devices to dumpsys output."

9 years agoFix some weight bugs in grid layout
Yigit Boyar [Thu, 5 Mar 2015 21:59:56 +0000 (13:59 -0800)]
Fix some weight bugs in grid layout

This CL also changes how GONE views are considered.
Previously, they would still participate in weight calculations.
Now, they are ignored.

Bug: 19546781

Sub bugs:

Bug: 19571249
Bug: 19571653
Bug: 19571319
Bug: 19571841
Change-Id: I7344f757d3a76be98bb92660f07d2a0cafa9ac12

9 years agoemove uncessary include for SkPorterDuff.h (Part 2)
Derek Sollenberger [Thu, 5 Mar 2015 21:26:39 +0000 (16:26 -0500)]
emove uncessary include for SkPorterDuff.h (Part 2)

Change-Id: I4d29d65a2e8eaf26b1cde6a525703be248bce63d

9 years agoMerge "Add JNI StaticLayout.Builder"
Raph Levien [Thu, 5 Mar 2015 21:26:31 +0000 (21:26 +0000)]
Merge "Add JNI StaticLayout.Builder"

9 years agoRemove uncessary include for SkPorterDuff.h
Derek Sollenberger [Thu, 5 Mar 2015 21:20:35 +0000 (16:20 -0500)]
Remove uncessary include for SkPorterDuff.h

Change-Id: Ibcbed5dd2dc327821fc26e87191185f0069c9911

9 years agoam f02b1abc: am 2847fc99: am cfb0978f: am bc669e3f: am dad1cbeb: am 9f485e97: am...
Rich Slogar [Thu, 5 Mar 2015 20:11:26 +0000 (20:11 +0000)]
am f02b1abc: am 2847fc99: am cfb0978f: am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix

* commit 'f02b1abc2726692dd69f10c1c9e7fa69ccc4ab63':
  docs: sdk tools date fix

9 years agoam 2847fc99: am cfb0978f: am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs...
Rich Slogar [Thu, 5 Mar 2015 20:05:31 +0000 (20:05 +0000)]
am 2847fc99: am cfb0978f: am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix

* commit '2847fc9912715027492bdae8567cd896b7ba8f9f':
  docs: sdk tools date fix

9 years agoam cfb0978f: am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools...
Rich Slogar [Thu, 5 Mar 2015 19:59:55 +0000 (19:59 +0000)]
am cfb0978f: am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix

* commit 'cfb0978fd9a6bf8fa06dee061df03fccf20fabc4':
  docs: sdk tools date fix

9 years agoam bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:52:05 +0000 (19:52 +0000)]
am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix

* commit 'bc669e3f555519f641102b759a04a01ac5c10cad':
  docs: sdk tools date fix

9 years agoam dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:46:12 +0000 (19:46 +0000)]
am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix

* commit 'dad1cbebfabf421efc90d366d9c4fd67becf930f':
  docs: sdk tools date fix

9 years agoam 9f485e97: am 4aba69a8: docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:39:47 +0000 (19:39 +0000)]
am 9f485e97: am 4aba69a8: docs: sdk tools date fix

* commit '9f485e971e06dad399dd70712787f4c30da9515e':
  docs: sdk tools date fix

9 years agoMerge "Revert "Cleanup Bitmap JNI""
Chad Jones [Thu, 5 Mar 2015 19:35:14 +0000 (19:35 +0000)]
Merge "Revert "Cleanup Bitmap JNI""

9 years agoRevert "Cleanup Bitmap JNI"
Chad Jones [Thu, 5 Mar 2015 19:34:26 +0000 (19:34 +0000)]
Revert "Cleanup Bitmap JNI"

This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7.

Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a

9 years agoam 4aba69a8: docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:33:56 +0000 (19:33 +0000)]
am 4aba69a8: docs: sdk tools date fix

* commit '4aba69a8a7f58541ce76429252dd0c9650b40f35':
  docs: sdk tools date fix

9 years agoMerge "Prioritize regular names over phonetic names. P1"
Brian Attwell [Thu, 5 Mar 2015 19:26:36 +0000 (19:26 +0000)]
Merge "Prioritize regular names over phonetic names. P1"

9 years agodocs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:24:45 +0000 (11:24 -0800)]
docs: sdk tools date fix

Change-Id: Ieb0a5193a5bbf7efd1e5852be4b0db421d08db14

9 years agoAudioService: Add current stream devices to dumpsys output.
John Spurlock [Thu, 5 Mar 2015 18:58:00 +0000 (13:58 -0500)]
AudioService: Add current stream devices to dumpsys output.

Change-Id: I57ed785154d8d75ac0f189a479252a725e80bd5a

9 years agoMerge "Made AM package debug log more configurable."
Wale Ogunwale [Thu, 5 Mar 2015 18:51:32 +0000 (18:51 +0000)]
Merge "Made AM package debug log more configurable."

9 years agoMerge "Cleanup Bitmap JNI"
John Reck [Thu, 5 Mar 2015 18:12:34 +0000 (18:12 +0000)]
Merge "Cleanup Bitmap JNI"

9 years agoAdd JNI StaticLayout.Builder
Raph Levien [Tue, 3 Mar 2015 00:29:23 +0000 (16:29 -0800)]
Add JNI StaticLayout.Builder

This patch adds a native C++ Builder object for StaticLayout to
complement the Java one introduced in a previous patch.

The Builder object contains state used in constructing a layout, as well
as temporary buffers, to avoid having to allocate such. In particular,
it holds a break iterator, so avoids the cost of constructing that in
the common case of a single locale.

Change-Id: I1125103b7ccf00b8674c1586c3ea8d5d915fdd5b

9 years agoCleanup Bitmap JNI
John Reck [Wed, 4 Mar 2015 16:36:12 +0000 (08:36 -0800)]
Cleanup Bitmap JNI

Fix a bunch of places where mNativeBitmap was being
poked at directly, switch them either to the NDK API
or to GraphicsJNI where it made sense

Change-Id: I6b3df3712d6497cba828c2d3012e725cb4ebb64d

9 years agoMerge "Add security check for clearDeviceInitializer in the service."
Julia Reynolds [Thu, 5 Mar 2015 17:52:20 +0000 (17:52 +0000)]
Merge "Add security check for clearDeviceInitializer in the service."

9 years agoam ecb48c16: am 9c0ba24f: am 6695b992: Merge "Frameworks/base: Add removeAll for...
Andreas Gampe [Thu, 5 Mar 2015 17:41:14 +0000 (17:41 +0000)]
am ecb48c16: am 9c0ba24f: am 6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"

* commit 'ecb48c16b7839bdcda84ac0ba7c61248b814eb71':
  Frameworks/base: Add removeAll for ArraySet

9 years agoMerge "Fix push shader to native"
Chris Craik [Thu, 5 Mar 2015 17:37:44 +0000 (17:37 +0000)]
Merge "Fix push shader to native"

9 years agoam 9c0ba24f: am 6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"
Andreas Gampe [Thu, 5 Mar 2015 17:33:13 +0000 (17:33 +0000)]
am 9c0ba24f: am 6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"

* commit '9c0ba24f3b54fa7916626f3d76ec6818d78ca47e':
  Frameworks/base: Add removeAll for ArraySet

9 years agoFix push shader to native
Chris Craik [Thu, 5 Mar 2015 17:32:19 +0000 (09:32 -0800)]
Fix push shader to native

bug:19586908
Change-Id: Ie6205bc76667222f2df2da60a27244988f3a2b3b

9 years agoam 6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"
Andreas Gampe [Thu, 5 Mar 2015 17:15:58 +0000 (17:15 +0000)]
am 6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"

* commit '6695b9920d15f8d9a17d6b0c66b863d1c2e38584':
  Frameworks/base: Add removeAll for ArraySet

9 years agoMerge "Frameworks/base: Add removeAll for ArraySet"
Andreas Gampe [Thu, 5 Mar 2015 17:10:30 +0000 (17:10 +0000)]
Merge "Frameworks/base: Add removeAll for ArraySet"

9 years agoAdd security check for clearDeviceInitializer in the service.
Julia Reynolds [Thu, 5 Mar 2015 15:06:41 +0000 (10:06 -0500)]
Add security check for clearDeviceInitializer in the service.

Bug: 19230954
Change-Id: I5c648492bef0d2b579b6f59b91afc890e3092d36

9 years agoMerge "Remove references to SkPorterDuff as it is deprecated."
Derek Sollenberger [Thu, 5 Mar 2015 15:45:27 +0000 (15:45 +0000)]
Merge "Remove references to SkPorterDuff as it is deprecated."

9 years agoMerge "Fix bug, change crashes to warnings"
Tom Hudson [Thu, 5 Mar 2015 15:40:45 +0000 (15:40 +0000)]
Merge "Fix bug, change crashes to warnings"

9 years agoFix bug, change crashes to warnings
Tom Hudson [Thu, 5 Mar 2015 15:30:18 +0000 (10:30 -0500)]
Fix bug, change crashes to warnings

Improve behavior when we get a call to draw 0 points.
Replace one ALWAYS_FATAL statements with noop.

Change-Id: I864b7a9633dfa3dc6eefa403beca4cc7ae14074f

9 years agoMerge "Add a list verb to the settings cmd."
John Spurlock [Thu, 5 Mar 2015 15:26:35 +0000 (15:26 +0000)]
Merge "Add a list verb to the settings cmd."

9 years agoMerge "Text selection changes - smart handles & drag accelerator"
Mady Mellor [Thu, 5 Mar 2015 15:15:25 +0000 (15:15 +0000)]
Merge "Text selection changes - smart handles & drag accelerator"

9 years agoClean up the lock task APIs for COSU devices.
Benjamin Franz [Wed, 11 Feb 2015 15:59:44 +0000 (15:59 +0000)]
Clean up the lock task APIs for COSU devices.

Clean up and increase readability of internal handling of lock task mode APIs.
Add a public API to query the lock task mode state with pinned and locked as
possible outcomes. Additionally, change wording in lock task toasts when in
locked mode and update the javadoc regarding onLockTaskModeEntering and
onLockTaskModeExiting to represent the actual behaviour.

Bug: 19377096
Change-Id: Ia563078ca6ef6d6fc7e75130e6b94ba18af69340

9 years agoMerge "Added function to render a drawable in all available states"
Andrew Shulaev [Thu, 5 Mar 2015 14:39:52 +0000 (14:39 +0000)]
Merge "Added function to render a drawable in all available states"

9 years agoRemove references to SkPorterDuff as it is deprecated.
Derek Sollenberger [Wed, 4 Mar 2015 15:44:46 +0000 (10:44 -0500)]
Remove references to SkPorterDuff as it is deprecated.

Change-Id: Ic0722cfef4ed61aa546c495924397097a45cfe77

9 years agoAdd a list verb to the settings cmd.
John Spurlock [Wed, 4 Mar 2015 19:55:37 +0000 (14:55 -0500)]
Add a list verb to the settings cmd.

Change-Id: I8a203eefced3431085fd1981b1d120baab2cb77a

9 years agoAdded function to render a drawable in all available states
Andrew Shulaev [Thu, 5 Mar 2015 11:51:38 +0000 (11:51 +0000)]
Added function to render a drawable in all available states

This reverts commit 01cdf8b135be3bf67b9386dc929109c3db82c730.

Change-Id: I596855047d78c3c718744ad61432fc45e1239634

9 years agoMerge "Fix crash when shadowSize is 0"
Diego Perez [Thu, 5 Mar 2015 10:13:00 +0000 (10:13 +0000)]
Merge "Fix crash when shadowSize is 0"

9 years agoMerge "Enable Ethernet if the device has FEATURE_USB_HOST."
Lorenzo Colitti [Thu, 5 Mar 2015 08:23:30 +0000 (08:23 +0000)]
Merge "Enable Ethernet if the device has FEATURE_USB_HOST."

9 years agoEnable Ethernet if the device has FEATURE_USB_HOST.
Lorenzo Colitti [Tue, 25 Nov 2014 12:52:12 +0000 (21:52 +0900)]
Enable Ethernet if the device has FEATURE_USB_HOST.

Any device that supports USB OTG is capable of running Ethernet
via a USB OTG cable and Ethernet to USB adapter.

Currently, we only start the Ethernet system service if the
device has FEATURE_ETHERNET, but this requires that every device
explicitly declare FEATURE_ETHERNET, which causes bugs like
http://b/18515146 , where the L OTA broke Ethernet on nakasi.

Therefore, start the Ethernet service on all devices that have
FEATURE_USB_HOST.

Bug: 18515146
Change-Id: I3b4e85d1ad8e1aea9baa046a27f5b4dd68c42028

9 years agoam 9f4e1f7f: am b488a256: am 4f674bbd: am 8b2be54a: am 182059f8: am ca10a435: am...
smain@google.com [Thu, 5 Mar 2015 06:40:13 +0000 (06:40 +0000)]
am 9f4e1f7f: am b488a256: am 4f674bbd: am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs

* commit '9f4e1f7f501b934b72e7abefecc61b5666ee4463':
  add tags for wakelock and other API names

9 years agoam 233baedc: am 686a1b2f: am 165c2564: Merge "Manually add SignalStrength to preloade...
Brian Carlstrom [Thu, 5 Mar 2015 06:35:09 +0000 (06:35 +0000)]
am 233baedc: am 686a1b2f: am 165c2564: Merge "Manually add SignalStrength to preloaded-classes"

* commit '233baedce82ba244e06044dca803496dc2c48a9c':
  Manually add SignalStrength to preloaded-classes

9 years agoam b488a256: am 4f674bbd: am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge...
smain@google.com [Thu, 5 Mar 2015 06:32:35 +0000 (06:32 +0000)]
am b488a256: am 4f674bbd: am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs

* commit 'b488a256308c8c7598da19d109be99d19a08a76d':
  add tags for wakelock and other API names

9 years agoam 686a1b2f: am 165c2564: Merge "Manually add SignalStrength to preloaded-classes"
Brian Carlstrom [Thu, 5 Mar 2015 06:27:40 +0000 (06:27 +0000)]
am 686a1b2f: am 165c2564: Merge "Manually add SignalStrength to preloaded-classes"

* commit '686a1b2f4ac90c3fb522405258212c8a91ed5148':
  Manually add SignalStrength to preloaded-classes

9 years agoam 4f674bbd: am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags...
smain@google.com [Thu, 5 Mar 2015 06:25:43 +0000 (06:25 +0000)]
am 4f674bbd: am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs

* commit '4f674bbdf83056141f3dccf1af8af3113e17af87':
  add tags for wakelock and other API names

9 years agoam 165c2564: Merge "Manually add SignalStrength to preloaded-classes"
Brian Carlstrom [Thu, 5 Mar 2015 06:22:18 +0000 (06:22 +0000)]
am 165c2564: Merge "Manually add SignalStrength to preloaded-classes"

* commit '165c25641ccedf6447d09dfec00f485df1361c35':
  Manually add SignalStrength to preloaded-classes

9 years agoam 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock...
smain@google.com [Thu, 5 Mar 2015 06:18:45 +0000 (06:18 +0000)]
am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs

* commit '8b2be54a629e4567152d8b0e6c81332632b0b877':
  add tags for wakelock and other API names

9 years agoMerge "Manually add SignalStrength to preloaded-classes"
Brian Carlstrom [Thu, 5 Mar 2015 06:15:53 +0000 (06:15 +0000)]
Merge "Manually add SignalStrength to preloaded-classes"

9 years agoam 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API...
smain@google.com [Thu, 5 Mar 2015 06:10:54 +0000 (06:10 +0000)]
am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs

* commit '182059f875bedc778a3ce9710a4f634197d1e959':
  add tags for wakelock and other API names

9 years agoManually add SignalStrength to preloaded-classes
Brian Carlstrom [Thu, 5 Mar 2015 05:56:26 +0000 (21:56 -0800)]
Manually add SignalStrength to preloaded-classes

Bug: 19323020
Change-Id: I61e9d2dd5d06fe2353da17e5646f259122e5ea98

9 years agoPrioritize regular names over phonetic names. P1
Brian Attwell [Thu, 5 Mar 2015 05:05:27 +0000 (21:05 -0800)]
Prioritize regular names over phonetic names. P1

Bug: 19587274
Change-Id: I503c0fff6da30b9f1d6b6cbeaedfc4d9314f8a00

9 years agoam 7b737c80: am 097f8d5f: Merge "Update "Optimizing app X from Y string"" into lmp...
Anthony Hugh [Thu, 5 Mar 2015 04:14:06 +0000 (04:14 +0000)]
am 7b737c80: am 097f8d5f: Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev

* commit '7b737c809d95343ebf18d68dd9f503f5efe127be':
  Update "Optimizing app X from Y string"

9 years agoam 097f8d5f: Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev
Anthony Hugh [Thu, 5 Mar 2015 04:08:32 +0000 (04:08 +0000)]
am 097f8d5f: Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev

* commit '097f8d5f6b82f27e71ec72795dee053dfc698ac5':
  Update "Optimizing app X from Y string"

9 years agoMerge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev
Anthony Hugh [Thu, 5 Mar 2015 04:04:04 +0000 (04:04 +0000)]
Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev

9 years agoMerge "CEC: Do not start queued actions for TV device"
Jinsuk Kim [Thu, 5 Mar 2015 03:44:47 +0000 (03:44 +0000)]
Merge "CEC: Do not start queued actions for TV device"

9 years agoam 76120308: am 8edf64e9: am 28d11557: am 498691d2: am 62777b18: am 5c30adfd: am...
Eric Gilmore [Thu, 5 Mar 2015 01:53:38 +0000 (01:53 +0000)]
am 76120308: am 8edf64e9: am 28d11557: am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs

* commit '761203089d46a208000140a1090deb7b6c8c8356':
  Fixing broken link per b/19503824.

9 years agoam 1445dec7: am 5a1cec86: am 0c3052a6: am 4eedcceb: Merge "Merge commit \'83a63bac...
Bart Sears [Thu, 5 Mar 2015 01:29:43 +0000 (01:29 +0000)]
am 1445dec7: am 5a1cec86: am 0c3052a6: am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev

* commit '1445dec74f0411206e8964d4efbf01668a791e2e':
  Do not make ActivityContainer available to apps. DO NOT MERGE

9 years agoFrameworks/base: Add removeAll for ArraySet
Andreas Gampe [Thu, 5 Mar 2015 01:14:10 +0000 (17:14 -0800)]
Frameworks/base: Add removeAll for ArraySet

Add a simple ArraySet.removeAll(ArraySet) method. This avoids two
allocations, a MapCollections helper and an Iterator object, over
the removeAll(Collection) code.

KeySetManagerService heavily calls removeAll during boot (about 9K
times in AOSP). This reduces GC stress and optimizes the removal
(about half the time the removed collection has only one element).
The removal method in KeySetManagerService is also done under a lock,
so that it gates parallelization efforts in PackageManagerService.

Bug: 19498314
Change-Id: Ib0e483adfd09831cd66ab19a820ebf6544a2b66f

9 years agoam ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into...
smain@google.com [Thu, 5 Mar 2015 01:12:15 +0000 (01:12 +0000)]
am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs

* commit 'ca10a4352f07652d82da59f6c1630e8607d82dda':
  add tags for wakelock and other API names

9 years agoam 8edf64e9: am 28d11557: am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge...
Eric Gilmore [Thu, 5 Mar 2015 01:10:56 +0000 (01:10 +0000)]
am 8edf64e9: am 28d11557: am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs

* commit '8edf64e9e903f2dcd54d52b74ef1bbfefcbbca3d':
  Fixing broken link per b/19503824.

9 years agoam 28d11557: am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken...
Eric Gilmore [Thu, 5 Mar 2015 01:02:55 +0000 (01:02 +0000)]
am 28d11557: am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs

* commit '28d11557d6846e7ea7fb2593a6ed4d3a16f5eef6':
  Fixing broken link per b/19503824.

9 years agoam f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
smain@google.com [Thu, 5 Mar 2015 00:59:24 +0000 (00:59 +0000)]
am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs

* commit 'f4bbec09a4c3795bc72d6a95aab3488c6c49ce6e':
  add tags for wakelock and other API names

9 years agoam 5a1cec86: am 0c3052a6: am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualme...
Bart Sears [Thu, 5 Mar 2015 00:59:01 +0000 (00:59 +0000)]
am 5a1cec86: am 0c3052a6: am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev

* commit '5a1cec86cfb3f08fac06ed26fe81247c3415d3ca':
  Do not make ActivityContainer available to apps. DO NOT MERGE

9 years agoam 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per...
Eric Gilmore [Thu, 5 Mar 2015 00:55:38 +0000 (00:55 +0000)]
am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs

* commit '498691d2641deb1ca30938c7777a9a63882ffd87':
  Fixing broken link per b/19503824.

9 years agoam 0c3052a6: am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into...
Bart Sears [Thu, 5 Mar 2015 00:52:58 +0000 (00:52 +0000)]
am 0c3052a6: am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev

* commit '0c3052a6675ed528c2898bd2ecb92576bca78df9':
  Do not make ActivityContainer available to apps. DO NOT MERGE

9 years agoMerge "add tags for wakelock and other API names" into lmp-docs
smain@google.com [Thu, 5 Mar 2015 00:49:48 +0000 (00:49 +0000)]
Merge "add tags for wakelock and other API names" into lmp-docs

9 years agoam 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824....
Eric Gilmore [Thu, 5 Mar 2015 00:49:21 +0000 (00:49 +0000)]
am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs

* commit '62777b189dc31c250c4ae06915aae0a337950e1c':
  Fixing broken link per b/19503824.

9 years agoam 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev
Bart Sears [Thu, 5 Mar 2015 00:40:13 +0000 (00:40 +0000)]
am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev

* commit '4eedccebb7f4c3f9e2f1890f92bead4b9c2a9819':
  Do not make ActivityContainer available to apps. DO NOT MERGE

9 years agoMerge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev
Bart Sears [Thu, 5 Mar 2015 00:35:07 +0000 (00:35 +0000)]
Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev

9 years agoam 80cb7300: (-s ours) am 5a6b44c4: (-s ours) Merge "DO NOT MERGE ANYWHERE Bluetooth...
Tucker Sylvestro [Thu, 5 Mar 2015 00:32:51 +0000 (00:32 +0000)]
am 80cb7300: (-s ours) am 5a6b44c4: (-s ours) Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev

* commit '80cb73006d6c14f9a9cd506172d9223cbca8606f':
  DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)

9 years agoam 5a6b44c4: (-s ours) Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging...
Tucker Sylvestro [Thu, 5 Mar 2015 00:27:13 +0000 (00:27 +0000)]
am 5a6b44c4: (-s ours) Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev

* commit '5a6b44c435fb06817a66bb74c66a5a6d19690616':
  DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)

9 years agoMerge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into...
Tucker Sylvestro [Thu, 5 Mar 2015 00:15:06 +0000 (00:15 +0000)]
Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev

9 years agoUpdate "Optimizing app X from Y string"
Anthony Hugh [Wed, 4 Mar 2015 00:50:05 +0000 (16:50 -0800)]
Update "Optimizing app X from Y string"

The word "Optimizing" is rendering on two lines on Lenok due to being too
long.  New design is to shorten the string on watches to avoid this issue.

BUG: 18388692
BUG: 18902013
BUG: 16493311
Change-Id: I8d9a9e8fcade460e50f9bf71d5cb0c6e415f871e

9 years agoMerge "Add ChooserTargetService API"
Adam Powell [Thu, 5 Mar 2015 00:07:52 +0000 (00:07 +0000)]
Merge "Add ChooserTargetService API"

9 years agoMerge "MidiManager: Virtual MIDI devices are now implemented as Services"
Mike Lockwood [Thu, 5 Mar 2015 00:00:31 +0000 (00:00 +0000)]
Merge "MidiManager: Virtual MIDI devices are now implemented as Services"

9 years agoMerge "Patch cleanup, reenable Patch Glops"
Chris Craik [Wed, 4 Mar 2015 23:41:41 +0000 (23:41 +0000)]
Merge "Patch cleanup, reenable Patch Glops"

9 years agoPatch cleanup, reenable Patch Glops
Chris Craik [Tue, 3 Mar 2015 22:20:47 +0000 (14:20 -0800)]
Patch cleanup, reenable Patch Glops

bug:19597454

Change-Id: If12b95e83588b81a553210cd8c2437c6c771073a

9 years agoMerge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform...
John Spurlock [Wed, 4 Mar 2015 23:26:01 +0000 (23:26 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base

9 years agoMerge "soundpool: update sample rate when reusing audiotrack"
Glenn Kasten [Wed, 4 Mar 2015 23:25:25 +0000 (23:25 +0000)]
Merge "soundpool: update sample rate when reusing audiotrack"

9 years agoMerge "soundpool: reuse channel for same sample if available"
Glenn Kasten [Wed, 4 Mar 2015 23:25:01 +0000 (23:25 +0000)]
Merge "soundpool: reuse channel for same sample if available"

9 years agoam 3bedeb01: am bd438742: am b879e739: am c974ac11: MediaProjectionPermissionActivity...
John Spurlock [Wed, 4 Mar 2015 23:24:53 +0000 (23:24 +0000)]
am 3bedeb01: am bd438742: am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.

* commit '3bedeb010103f4da26241c23929aa38598758f93':
  MediaProjectionPermissionActivity: Fix NPE.

9 years agoam bd438742: am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Wed, 4 Mar 2015 23:15:51 +0000 (23:15 +0000)]
am bd438742: am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.

* commit 'bd438742870a51eacea3554376f671bd1be0e30c':
  MediaProjectionPermissionActivity: Fix NPE.

9 years agoam b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Wed, 4 Mar 2015 23:09:19 +0000 (23:09 +0000)]
am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.

* commit 'b879e7395fa9446952b840b1d576ff225b039774':
  MediaProjectionPermissionActivity: Fix NPE.

9 years agoam c974ac11: MediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Wed, 4 Mar 2015 23:01:26 +0000 (23:01 +0000)]
am c974ac11: MediaProjectionPermissionActivity: Fix NPE.

* commit 'c974ac11f808968648d26e83a0b64a7fba02ad15':
  MediaProjectionPermissionActivity: Fix NPE.

9 years agoMerge "Audio: Remove the concept of master volume."
John Spurlock [Wed, 4 Mar 2015 22:59:39 +0000 (22:59 +0000)]
Merge "Audio: Remove the concept of master volume."

9 years agoAudio: Remove the concept of master volume.
John Spurlock [Tue, 3 Mar 2015 21:17:21 +0000 (16:17 -0500)]
Audio: Remove the concept of master volume.

- Remove two config resources (use master volume, and volume ramp).
- Remove master volume adjustments / getters / intents.
- Retain @hidden setMasterMute, needed for device admin
- Remove master volume logic in AudioService.
- Remove master volume logic in VolumePanel.
- Rename "getMasterStreamType" to "getUiSoundsStreamType" to avoid confusion.

Bug: 19582978
Change-Id: Id02c8fa4898cff3b913147f5ac1b4038e2e7cc24

9 years agoMerge "DOs can clear the DI; rehide hasUserSetupCompleted."
Julia Reynolds [Wed, 4 Mar 2015 22:38:16 +0000 (22:38 +0000)]
Merge "DOs can clear the DI; rehide hasUserSetupCompleted."

9 years agoDOs can clear the DI; rehide hasUserSetupCompleted.
Julia Reynolds [Wed, 11 Feb 2015 17:34:08 +0000 (12:34 -0500)]
DOs can clear the DI; rehide hasUserSetupCompleted.

Bug: 19230954
Change-Id: I97467229b23f3c9be1c3c4fff1c888a812f14a95

9 years agoMerge "Temporarily disable Patch glops"
Chris Craik [Wed, 4 Mar 2015 22:30:59 +0000 (22:30 +0000)]
Merge "Temporarily disable Patch glops"

9 years agoMerge "Some refactoring of StaticLayout"
Raph Levien [Wed, 4 Mar 2015 22:28:18 +0000 (22:28 +0000)]
Merge "Some refactoring of StaticLayout"

9 years agoTemporarily disable Patch glops
Chris Craik [Wed, 4 Mar 2015 22:25:09 +0000 (14:25 -0800)]
Temporarily disable Patch glops

bug:19597454

Change-Id: I9dbe781a714582717a5585113b9a56821265b36e

9 years agoAdd ChooserTargetService API
Adam Powell [Fri, 27 Feb 2015 23:51:11 +0000 (15:51 -0800)]
Add ChooserTargetService API

A ChooserTargetService can be implemented by apps that wish to offer
additional deep-link targets for the system intent chooser to in turn
offer to the user. This allows apps to create contextually relevant
shortcuts for UI flows that would otherwise require several steps of
explicit disambiguation. For example, a chat app might offer one-touch
access to recent conversations when sharing a photo to it from
elsewhere.

The chooser implementation must limit the number of
ChooserTargetServices it elects to query in order to respect available
system resources. Only the system chooser is permitted to bind to a
ChooserTargetService.

Change-Id: Ia7e075ee649c51cf2035f20aee166c5a27d91aeb

9 years agoDO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)
Andre Eisenbach [Fri, 5 Dec 2014 17:31:30 +0000 (09:31 -0800)]
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)

Bug: 18508263
Change-Id: I88f9c90dab8b0c825010c8617709449a3dd704b2

9 years agoSome refactoring of StaticLayout
Raph Levien [Mon, 2 Mar 2015 22:30:53 +0000 (14:30 -0800)]
Some refactoring of StaticLayout

This patch refactors construction of StaticLayout to use an explicit
Builder object, which is intended to hold state used for constructing
the layout but not needed for merely reading out the results.

Builder objects are allocated from a pool and explicitly recycled,
so there is insignificant additional allocation cost.

This patch has very little impact on performance (it does avoid
allocating a FontMetricsInt object) but opens the way for significant
performance and functionality improvements as more of the Builder
functionality migrates to native code.

Change-Id: I2a576643e573a38b61f895a80d5d92a85c94b6b4