OSDN Git Service

android-x86/frameworks-base.git
10 years agosetAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
Zhihai Xu [Sat, 11 Jan 2014 00:44:39 +0000 (16:44 -0800)]
setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager

setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager.
It cause maximize volume in Bluetooth speaker/device.
The volume expected by Bluetooth Avrcp should be from 0 to 15.
But the current volume parameter passed to Bluetooth Avrcp is from 0 to 150.
It is scaled by 10 times than the correct volume.
index = rescaleIndex(index * 10, streamType, streamTypeAlias);
Should divide the volume by 10 before pass to Bluetooth Avrcp.

bug:12495379
Change-Id: I0432f83ca4a0c134244d96b2eea14d7168e9a9ff

10 years agoam 3d763e25: am a9a39d6c: am acca12fa: Merge "Doc change: move localized files into...
Dirk Dougherty [Wed, 20 Nov 2013 02:24:20 +0000 (18:24 -0800)]
am 3d763e25: am a9a39d6c: am acca12fa: Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs

* commit '3d763e258b6643d29a495b5dfb1cb376e6b61f87':
  Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.

10 years agoam a9a39d6c: am acca12fa: Merge "Doc change: move localized files into an intl dir...
Dirk Dougherty [Wed, 20 Nov 2013 02:20:40 +0000 (18:20 -0800)]
am a9a39d6c: am acca12fa: Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs

* commit 'a9a39d6ca25796ba0fcf16ead3a9928f36b6444d':
  Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.

10 years agoam acca12fa: Merge "Doc change: move localized files into an intl dir. Build output...
Dirk Dougherty [Wed, 20 Nov 2013 02:16:21 +0000 (02:16 +0000)]
am acca12fa: Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs

* commit 'acca12faea5fc1c9de63fdc08ae4d6bc0bad864a':
  Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.

10 years agoMerge "Doc change: move localized files into an intl dir. Build output remains the...
Dirk Dougherty [Wed, 20 Nov 2013 02:13:48 +0000 (02:13 +0000)]
Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs

10 years agoDoc change: move localized files into an intl dir. Build output remains the same...
Dirk Dougherty [Tue, 19 Nov 2013 21:15:07 +0000 (13:15 -0800)]
Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.

Change-Id: Ia75712323563cf56f0224822cb7977f3421f8527

10 years agoam a99e486c: am 26574688: am 39711934: Merge "Doc update: redo of new API Console...
Katie McCormick [Wed, 20 Nov 2013 01:16:27 +0000 (17:16 -0800)]
am a99e486c: am 26574688: am 39711934: Merge "Doc update: redo of new API Console steps." into klp-docs

* commit 'a99e486c3a45c2ba96bce7a994e3b91f17b5f75f':
  Doc update: redo of new API Console steps.

10 years agoam 26574688: am 39711934: Merge "Doc update: redo of new API Console steps." into...
Katie McCormick [Wed, 20 Nov 2013 01:14:14 +0000 (17:14 -0800)]
am 26574688: am 39711934: Merge "Doc update: redo of new API Console steps." into klp-docs

* commit '26574688b627f5b5d722834d73cba5f37185770f':
  Doc update: redo of new API Console steps.

10 years agoam 39711934: Merge "Doc update: redo of new API Console steps." into klp-docs
Katie McCormick [Wed, 20 Nov 2013 01:10:37 +0000 (01:10 +0000)]
am 39711934: Merge "Doc update: redo of new API Console steps." into klp-docs

* commit '39711934023b088887a08d833674170938f82a7d':
  Doc update: redo of new API Console steps.

10 years agoMerge "Doc update: redo of new API Console steps." into klp-docs
Katie McCormick [Wed, 20 Nov 2013 01:07:56 +0000 (01:07 +0000)]
Merge "Doc update: redo of new API Console steps." into klp-docs

10 years agoMerge "Convert Java/JNI to 64-bit, part 1."
Tim Murray [Wed, 20 Nov 2013 00:47:46 +0000 (00:47 +0000)]
Merge "Convert Java/JNI to 64-bit, part 1."

10 years agoPrint service meta-data changes not handled properly.
Svetoslav [Tue, 19 Nov 2013 23:47:11 +0000 (15:47 -0800)]
Print service meta-data changes not handled properly.

The package monitor in the PrintManagerService was not overriding
the correct callback to capture changes in the print service package
including meta-data. Hence, there was a missed signal the the old
meta-data was used.

The implication is that if a vendor adds new feature such as custom
print options activity or print service settings that were not there
before, then they will not be show until the device reboots.

bug:11772977

Change-Id: Idf756c430f30ae6d16760a257c199a72a52cf5c5

10 years agoDoc update: redo of new API Console steps.
Katie McCormick [Sat, 16 Nov 2013 00:02:58 +0000 (16:02 -0800)]
Doc update: redo of new API Console steps.

Fixes for:

b/11713745
b/11712882
b/10669388
b/10641901

Change-Id: I071eba31d51f0e29b9be4a7f7ede0f01c7a52838

10 years agoConvert Java/JNI to 64-bit, part 1.
Tim Murray [Fri, 15 Nov 2013 21:08:30 +0000 (13:08 -0800)]
Convert Java/JNI to 64-bit, part 1.

This converts context and device storage to use long instead of int.

bug 11332320

Change-Id: If93a5d78385d3004d5e709762b78bd1d3538088d

10 years agoam c8ea38fe: am e3705342: am b0183f0a: Harden against transiently unavailable backup...
Christopher Tate [Tue, 19 Nov 2013 19:53:02 +0000 (11:53 -0800)]
am c8ea38fe: am e3705342: am b0183f0a: Harden against transiently unavailable backup transports

* commit 'c8ea38fe18efb447a0f87aed60f511d14d2389fa':
  Harden against transiently unavailable backup transports

10 years agoam e3705342: am b0183f0a: Harden against transiently unavailable backup transports
Christopher Tate [Tue, 19 Nov 2013 19:48:50 +0000 (11:48 -0800)]
am e3705342: am b0183f0a: Harden against transiently unavailable backup transports

* commit 'e3705342671d08b5cd94a0d69ef8099a2c3211f8':
  Harden against transiently unavailable backup transports

10 years agoam b0183f0a: Harden against transiently unavailable backup transports
Christopher Tate [Tue, 19 Nov 2013 19:46:48 +0000 (11:46 -0800)]
am b0183f0a: Harden against transiently unavailable backup transports

* commit 'b0183f0ae311966cff0e10e8139c56f97288d1f2':
  Harden against transiently unavailable backup transports

10 years agoHarden against transiently unavailable backup transports
Christopher Tate [Mon, 18 Nov 2013 22:20:36 +0000 (14:20 -0800)]
Harden against transiently unavailable backup transports

The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.

Now with 100% less build break.

Bug 11716868

Change-Id: I2af4e93788068cfac97c0a48d3568c561eefa23d

10 years agoam f52450b1: am dcf78a05: am de4a8d85: Merge "Systrace doc updates" into klp-docs
Joe Fernandez [Tue, 19 Nov 2013 19:20:41 +0000 (11:20 -0800)]
am f52450b1: am dcf78a05: am de4a8d85: Merge "Systrace doc updates" into klp-docs

* commit 'f52450b1f174eac239ffac67774960d547e295c8':
  Systrace doc updates

10 years agoam dcf78a05: am de4a8d85: Merge "Systrace doc updates" into klp-docs
Joe Fernandez [Tue, 19 Nov 2013 19:16:30 +0000 (11:16 -0800)]
am dcf78a05: am de4a8d85: Merge "Systrace doc updates" into klp-docs

* commit 'dcf78a0541665332792d3f645dda673a9add2c1e':
  Systrace doc updates

10 years agoam de4a8d85: Merge "Systrace doc updates" into klp-docs
Joe Fernandez [Tue, 19 Nov 2013 19:12:24 +0000 (19:12 +0000)]
am de4a8d85: Merge "Systrace doc updates" into klp-docs

* commit 'de4a8d851b18ac032f044fa39e5db2529dd33911':
  Systrace doc updates

10 years agoMerge "Systrace doc updates" into klp-docs
Joe Fernandez [Tue, 19 Nov 2013 19:09:05 +0000 (19:09 +0000)]
Merge "Systrace doc updates" into klp-docs

10 years agoSystrace doc updates
Joe Fernandez [Mon, 16 Sep 2013 18:31:25 +0000 (11:31 -0700)]
Systrace doc updates

Update to reflect new user interface and command line options
in Android 4.3+. Also add section on using application-level
tracing.

Fixes for bugs:
b/7306847
b/10113361
b/9425766
b/7306847
b/9262485

Change-Id: Ia1c2a54fa2edc12cd68da27055aebe7ec47df745

10 years agoMerge "Refactor WifiEnterpriseConfig and move service part in WifiConfigStore"
Vinit Deshapnde [Tue, 19 Nov 2013 18:47:37 +0000 (18:47 +0000)]
Merge "Refactor WifiEnterpriseConfig and move service part in WifiConfigStore"

10 years agoMerge "Fix logic problems in AnimationDrawable and View."
John Spurlock [Tue, 19 Nov 2013 17:48:51 +0000 (17:48 +0000)]
Merge "Fix logic problems in AnimationDrawable and View."

10 years agoam 741c9c74: am d220d820: am c04aa87e: Merge "Fix incorrent page range parsing when...
Dave Langemak [Tue, 19 Nov 2013 16:43:18 +0000 (08:43 -0800)]
am 741c9c74: am d220d820: am c04aa87e: Merge "Fix incorrent page range parsing when custom print options used." into klp-dev

* commit '741c9c74ffead322c349242e3f72e8fd2957bd3d':
  Fix incorrent page range parsing when custom print options used.

10 years agoam 8ef1c531: am be462aff: am 096de3c3: Merge "Notify apps when insets change." into...
Craig Mautner [Tue, 19 Nov 2013 16:43:13 +0000 (08:43 -0800)]
am 8ef1c531: am be462aff: am 096de3c3: Merge "Notify apps when insets change." into klp-dev

* commit '8ef1c53177fa43cf78eb8911af77bde87c9c1536':
  Notify apps when insets change.

10 years agoam d220d820: am c04aa87e: Merge "Fix incorrent page range parsing when custom print...
Dave Langemak [Tue, 19 Nov 2013 16:38:55 +0000 (08:38 -0800)]
am d220d820: am c04aa87e: Merge "Fix incorrent page range parsing when custom print options used." into klp-dev

* commit 'd220d8202e67a82075ee20351657509ca0885b67':
  Fix incorrent page range parsing when custom print options used.

10 years agoam be462aff: am 096de3c3: Merge "Notify apps when insets change." into klp-dev
Craig Mautner [Tue, 19 Nov 2013 16:38:51 +0000 (08:38 -0800)]
am be462aff: am 096de3c3: Merge "Notify apps when insets change." into klp-dev

* commit 'be462affdbe9f962c495d6eeabdad645aa9baf03':
  Notify apps when insets change.

10 years agoam c04aa87e: Merge "Fix incorrent page range parsing when custom print options used...
Dave Langemak [Tue, 19 Nov 2013 16:34:57 +0000 (08:34 -0800)]
am c04aa87e: Merge "Fix incorrent page range parsing when custom print options used." into klp-dev

* commit 'c04aa87e4ac41b6c65dceb7b20d7a7f92c2efec1':
  Fix incorrent page range parsing when custom print options used.

10 years agoam 096de3c3: Merge "Notify apps when insets change." into klp-dev
Craig Mautner [Tue, 19 Nov 2013 16:34:53 +0000 (08:34 -0800)]
am 096de3c3: Merge "Notify apps when insets change." into klp-dev

* commit '096de3c3017bb9b9e5e1ed9ad790b7fedab95433':
  Notify apps when insets change.

10 years agoMerge "Fix incorrent page range parsing when custom print options used." into klp-dev
Dave Langemak [Tue, 19 Nov 2013 16:33:22 +0000 (16:33 +0000)]
Merge "Fix incorrent page range parsing when custom print options used." into klp-dev

10 years agoMerge "Notify apps when insets change." into klp-dev
Craig Mautner [Tue, 19 Nov 2013 16:31:59 +0000 (16:31 +0000)]
Merge "Notify apps when insets change." into klp-dev

10 years agoam 37ba54ac: am eb4dc749: am 6d0d4b5b: Merge "Mask OOBE when filtering recent documen...
Jeff Sharkey [Tue, 19 Nov 2013 08:17:23 +0000 (00:17 -0800)]
am 37ba54ac: am eb4dc749: am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-dev

* commit '37ba54ac13e6f8cff70d3138a029cfdd4733aba7':
  Mask OOBE when filtering recent documents.

10 years agoam eb4dc749: am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into...
Jeff Sharkey [Tue, 19 Nov 2013 08:13:26 +0000 (00:13 -0800)]
am eb4dc749: am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-dev

* commit 'eb4dc749de7f6ee45cae070db960890643e94aff':
  Mask OOBE when filtering recent documents.

10 years agoam 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-dev
Jeff Sharkey [Tue, 19 Nov 2013 08:11:15 +0000 (00:11 -0800)]
am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-dev

* commit '6d0d4b5b5a66ea348c2cdd89a89d4ab7f0483829':
  Mask OOBE when filtering recent documents.

10 years agoMerge "Mask OOBE when filtering recent documents." into klp-dev
Jeff Sharkey [Tue, 19 Nov 2013 08:08:12 +0000 (08:08 +0000)]
Merge "Mask OOBE when filtering recent documents." into klp-dev

10 years agoam a9249322: am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." into klp-dev
Sascha Prueter [Tue, 19 Nov 2013 07:35:15 +0000 (23:35 -0800)]
am a9249322: am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." into klp-dev

* commit 'a9249322d554fa13eb9c2662d39be256f833404f':
  Trying to unbreak build...

10 years agoam c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." into klp-dev
Sascha Prueter [Tue, 19 Nov 2013 07:31:11 +0000 (23:31 -0800)]
am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." into klp-dev

* commit 'c7f7d1bf18dded61bcbf4015a4cfc9cf1ee45bd4':
  Trying to unbreak build...

10 years agoam f7044fec: Merge "Trying to unbreak build..." into klp-dev
Sascha Prueter [Tue, 19 Nov 2013 07:27:07 +0000 (23:27 -0800)]
am f7044fec: Merge "Trying to unbreak build..." into klp-dev

* commit 'f7044fecee3ad1e2b2bfdd67c25b0c1536c83e18':
  Trying to unbreak build...

10 years agoMerge "Trying to unbreak build..." into klp-dev
Sascha Prueter [Tue, 19 Nov 2013 07:23:34 +0000 (07:23 +0000)]
Merge "Trying to unbreak build..." into klp-dev

10 years agoTrying to unbreak build...
Sascha Prueter [Tue, 19 Nov 2013 06:51:21 +0000 (06:51 +0000)]
Trying to unbreak build...

Revert "Harden against transiently unavailable backup transports"

This reverts commit 8f98252afea3fd0e68693635ec21b6004a52fa69.

Change-Id: I3aabb80f1a5932d530bce6b82d4b30c6cd1cdd5a

10 years agoam fa331b1d: am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable...
Christopher Tate [Tue, 19 Nov 2013 02:51:51 +0000 (18:51 -0800)]
am fa331b1d: am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev

* commit 'fa331b1dfbf3e071e2ff48dbe21727452bfb8042':
  Harden against transiently unavailable backup transports

10 years agoam 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backup transp...
Christopher Tate [Tue, 19 Nov 2013 02:48:29 +0000 (18:48 -0800)]
am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev

* commit '1e964ed808798a56664853e2aeffdc47c676ac5a':
  Harden against transiently unavailable backup transports

10 years agoam d6bbc544: Merge "Harden against transiently unavailable backup transports" into...
Christopher Tate [Tue, 19 Nov 2013 02:44:47 +0000 (18:44 -0800)]
am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev

* commit 'd6bbc54423c0fb70e9e0415b3e8c12a435d715a1':
  Harden against transiently unavailable backup transports

10 years agoMerge "Harden against transiently unavailable backup transports" into klp-dev
Christopher Tate [Tue, 19 Nov 2013 02:41:54 +0000 (02:41 +0000)]
Merge "Harden against transiently unavailable backup transports" into klp-dev

10 years agoMask OOBE when filtering recent documents.
Jeff Sharkey [Tue, 19 Nov 2013 01:41:33 +0000 (17:41 -0800)]
Mask OOBE when filtering recent documents.

There is a data ownership issue related to recent documents Cursors,
and the loader and UI threads can end up traversing the same Cursor
at runtime.  This change masks OOBE crashes caused by this race until
we have time to fix cleanly.

Bug: 11736668
Change-Id: I2039a5edcf341fcaedacc2f08bde96fc5a271782

10 years agoam 27927d5d: am 08ee31a2: am ce3f3a8d: Merge "Add link to HCE dev guide." into klp...
Dirk Dougherty [Tue, 19 Nov 2013 01:41:34 +0000 (17:41 -0800)]
am 27927d5d: am 08ee31a2: am ce3f3a8d: Merge "Add link to HCE dev guide." into klp-docs

* commit '27927d5d55eb4bd9087bdeba7df1e98f280177bd':
  Add link to HCE dev guide.

10 years agoam 08ee31a2: am ce3f3a8d: Merge "Add link to HCE dev guide." into klp-docs
Dirk Dougherty [Tue, 19 Nov 2013 01:38:00 +0000 (17:38 -0800)]
am 08ee31a2: am ce3f3a8d: Merge "Add link to HCE dev guide." into klp-docs

* commit '08ee31a22421ed9dc144d89edc695322044d699c':
  Add link to HCE dev guide.

10 years agoam ce3f3a8d: Merge "Add link to HCE dev guide." into klp-docs
Dirk Dougherty [Tue, 19 Nov 2013 01:33:25 +0000 (01:33 +0000)]
am ce3f3a8d: Merge "Add link to HCE dev guide." into klp-docs

* commit 'ce3f3a8d35a4fb23c907937cb8283532e321c8ad':
  Add link to HCE dev guide.

10 years agoMerge "Add link to HCE dev guide." into klp-docs
Dirk Dougherty [Tue, 19 Nov 2013 01:30:53 +0000 (01:30 +0000)]
Merge "Add link to HCE dev guide." into klp-docs

10 years agoMerge "Revert "Expose new API for querying whether a certificate was user added.""
William Luh [Tue, 19 Nov 2013 01:28:08 +0000 (01:28 +0000)]
Merge "Revert "Expose new API for querying whether a certificate was user added.""

10 years agoRevert "Expose new API for querying whether a certificate was user added."
William Luh [Tue, 19 Nov 2013 01:20:45 +0000 (01:20 +0000)]
Revert "Expose new API for querying whether a certificate was user added."

This reverts commit 60b96502b39d221afb43ff7e8a49a19a2fb3c2e0.

Change-Id: Ie1c2ee4c983c4d6b0c086f252a191b3c60e50b9c

10 years agoNotify apps when insets change.
Craig Mautner [Mon, 18 Nov 2013 20:59:05 +0000 (12:59 -0800)]
Notify apps when insets change.

Activities that handle their own configuration get layout when hidden
and the configuration changes but not when the content insets change
if they are hidden. They need to get a fresh layout for both
situations.

Fixes bug 11544694.

Change-Id: Iff3a9adb72ea7dfc3e5cd38e1b9cd7cf2006f8f5

10 years agoam bdfa8a1a: (-s ours) am 5a0fd1fd: am 9d5a9434: Merge "Update ICU_Delegate methods...
Deepanshu Gupta [Tue, 19 Nov 2013 00:29:24 +0000 (16:29 -0800)]
am bdfa8a1a: (-s ours) am 5a0fd1fd: am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev

* commit 'bdfa8a1ae0a4d10abd14cffb93f629803e469464':
  Update ICU_Delegate methods. DO NOT MERGE

10 years agoam 5a0fd1fd: am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into...
Deepanshu Gupta [Tue, 19 Nov 2013 00:25:04 +0000 (16:25 -0800)]
am 5a0fd1fd: am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev

* commit '5a0fd1fd0fb5d734bf65d26e56e413dba2821b07':
  Update ICU_Delegate methods. DO NOT MERGE

10 years agoam 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev
Deepanshu Gupta [Tue, 19 Nov 2013 00:22:41 +0000 (16:22 -0800)]
am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev

* commit '9d5a9434d3fe65d32aae0a400502dde8357f0ec7':
  Update ICU_Delegate methods. DO NOT MERGE

10 years agoMerge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev
Deepanshu Gupta [Tue, 19 Nov 2013 00:19:01 +0000 (00:19 +0000)]
Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev

10 years agoMerge "Expose new API for querying whether a certificate was user added."
William Luh [Tue, 19 Nov 2013 00:14:20 +0000 (00:14 +0000)]
Merge "Expose new API for querying whether a certificate was user added."

10 years agoHarden against transiently unavailable backup transports
Christopher Tate [Mon, 18 Nov 2013 22:20:36 +0000 (14:20 -0800)]
Harden against transiently unavailable backup transports

The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.

Bug 11716868

Change-Id: I4860fe3d4e99618b2cd194c83162bd7cbd5a83a9

10 years agoam 49b1dc33: am 63bb9185: am abb4d2da: Doc change: edit line length above button.
Dirk Dougherty [Mon, 18 Nov 2013 23:57:59 +0000 (15:57 -0800)]
am 49b1dc33: am 63bb9185: am abb4d2da: Doc change: edit line length above button.

* commit '49b1dc335dee85eb72892f722164feaabe910bd0':
  Doc change: edit line length above button.

10 years agoam 63bb9185: am abb4d2da: Doc change: edit line length above button.
Dirk Dougherty [Mon, 18 Nov 2013 23:54:01 +0000 (15:54 -0800)]
am 63bb9185: am abb4d2da: Doc change: edit line length above button.

* commit '63bb9185d4bd4bce3361135e4fcfdba5a6157340':
  Doc change: edit line length above button.

10 years agoam abb4d2da: Doc change: edit line length above button.
Dirk Dougherty [Mon, 18 Nov 2013 23:49:48 +0000 (23:49 +0000)]
am abb4d2da: Doc change: edit line length above button.

* commit 'abb4d2da4374eb5e5e7a750e4b60a9145b1b1058':
  Doc change: edit line length above button.

10 years agoDoc change: edit line length above button.
Dirk Dougherty [Mon, 18 Nov 2013 23:45:30 +0000 (15:45 -0800)]
Doc change: edit line length above button.

Change-Id: I7fd5c192b93846e91e0069c287776996c3f01ab8

10 years agoMerge "Clean up modelView matrix logic"
Chris Craik [Mon, 18 Nov 2013 22:50:03 +0000 (22:50 +0000)]
Merge "Clean up modelView matrix logic"

10 years agoam bac61807: am 1abead42: am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl...
Adam Lesinski [Mon, 18 Nov 2013 21:36:06 +0000 (13:36 -0800)]
am bac61807: am 1abead42: am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev

* commit 'bac61807d3bcfff957b358cb9ad77850bd373689':
  Do not hold direct ref BatteryStatsImpl$Uid$Proc

10 years agoam 1abead42: am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev
Adam Lesinski [Mon, 18 Nov 2013 21:32:42 +0000 (13:32 -0800)]
am 1abead42: am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev

* commit '1abead425c0e862e316e17521833a33d22e7a850':
  Do not hold direct ref BatteryStatsImpl$Uid$Proc

10 years agoam 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev
Adam Lesinski [Mon, 18 Nov 2013 21:29:25 +0000 (13:29 -0800)]
am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev

* commit '245408d29018fee4b1231e52f5da1edcc3283c4a':
  Do not hold direct ref BatteryStatsImpl$Uid$Proc

10 years agoMerge "Do not hold direct ref BatteryStatsImpl$Uid$Proc" into klp-dev
Adam Lesinski [Mon, 18 Nov 2013 21:26:32 +0000 (21:26 +0000)]
Merge "Do not hold direct ref BatteryStatsImpl$Uid$Proc" into klp-dev

10 years agoam 32962b3e: am c65dfef3: am afc76f28: Merge "Use scaled display size in wallpaper...
John Spurlock [Mon, 18 Nov 2013 21:00:21 +0000 (13:00 -0800)]
am 32962b3e: am c65dfef3: am afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev

* commit '32962b3e2c1968fbd83ebbf4cc94ab3dd8de3485':
  Use scaled display size in wallpaper constraint.

10 years agoFix logic problems in AnimationDrawable and View.
John Spurlock [Fri, 15 Nov 2013 22:10:03 +0000 (17:10 -0500)]
Fix logic problems in AnimationDrawable and View.

1. View now checks both queues when unscheduling runnables,
fixing the case where work was scheduled pre-attach, and unscheduled
post-attach.

2. AnimationDrawable avoids posting duplicate runnables when rescheduling
itself.

3. Decouple is-animation-running state from current frame pointer in
AnimationDrawable.  Some calls init to the first frame, but do not
kick off the animation.

4. Remove workaround in SystemUI's AnimatedImageView (status bar icon)
now that the underlying framework issues are fixed.

Bug:11694594
Change-Id: I77ca6bd80262f7edcf980b2d7efc2592f8051f29

10 years agoam c65dfef3: am afc76f28: Merge "Use scaled display size in wallpaper constraint...
John Spurlock [Mon, 18 Nov 2013 20:56:25 +0000 (12:56 -0800)]
am c65dfef3: am afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev

* commit 'c65dfef3f5ee07883446be0e6907f15fe457da9d':
  Use scaled display size in wallpaper constraint.

10 years agoam afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev
John Spurlock [Mon, 18 Nov 2013 20:52:58 +0000 (12:52 -0800)]
am afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev

* commit 'afc76f28b93f931069bb58c4f9b524d5a99b1604':
  Use scaled display size in wallpaper constraint.

10 years agoClean up modelView matrix logic
Chris Craik [Sat, 16 Nov 2013 00:06:56 +0000 (16:06 -0800)]
Clean up modelView matrix logic

bug:11359533

Also changes shader matrix to correctly account for modelView and
currentTransform()

Change-Id: I6ce18857dc6d08ea08ca7535385c2ad351ec3caa

10 years agoMerge "Use scaled display size in wallpaper constraint." into klp-dev
John Spurlock [Mon, 18 Nov 2013 20:49:16 +0000 (20:49 +0000)]
Merge "Use scaled display size in wallpaper constraint." into klp-dev

10 years agoDo not hold direct ref BatteryStatsImpl$Uid$Proc
Adam Lesinski [Mon, 18 Nov 2013 20:23:26 +0000 (12:23 -0800)]
Do not hold direct ref BatteryStatsImpl$Uid$Proc

BatteryStatsImpl can reset its collected data, including
removing a BatteryStatsImpl$Uid$Proc object. If a ProcessRecord
has a direct reference, then the battery stats for a process
will be recorded in an old Proc object and prevent GC, causing
a memory leak.

bug:11087238
Change-Id: I19a9cd9d8361c10446a8ebdd5c0860b56c442209

10 years agoMerge "Initial integration of Minikin to framework"
Raph Levien [Mon, 18 Nov 2013 19:38:18 +0000 (19:38 +0000)]
Merge "Initial integration of Minikin to framework"

10 years agoUse scaled display size in wallpaper constraint.
John Spurlock [Mon, 18 Nov 2013 19:14:49 +0000 (14:14 -0500)]
Use scaled display size in wallpaper constraint.

Bug:11596190
Change-Id: Icc81beeea2e71144c2e5330b047e4781a23d7449

10 years agoam 1dc93acf: (-s ours) am 4dee4e1c: (-s ours) am 35fb6cdf: (-s ours) Merge "Import...
Baligh Uddin [Mon, 18 Nov 2013 19:00:37 +0000 (11:00 -0800)]
am 1dc93acf: (-s ours) am 4dee4e1c: (-s ours) am 35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '1dc93acf3a4a7cf9ede43e5d2d03fc5c7ff8071e':
  Import translations. DO NOT MERGE

10 years agoam 0076f4ac: (-s ours) am 2cf27e71: (-s ours) am d7b40520: (-s ours) Merge "Import...
Baligh Uddin [Mon, 18 Nov 2013 19:00:34 +0000 (11:00 -0800)]
am 0076f4ac: (-s ours) am 2cf27e71: (-s ours) am d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '0076f4ac0f35814fed1613cae1120b3d954fe985':
  Import translations. DO NOT MERGE

10 years agoam 4dee4e1c: (-s ours) am 35fb6cdf: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 18 Nov 2013 18:56:21 +0000 (10:56 -0800)]
am 4dee4e1c: (-s ours) am 35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '4dee4e1cb394b077174ee29656bde962502555de':
  Import translations. DO NOT MERGE

10 years agoam 2cf27e71: (-s ours) am d7b40520: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 18 Nov 2013 18:56:17 +0000 (10:56 -0800)]
am 2cf27e71: (-s ours) am d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '2cf27e711196c3c8fdf8ed14e283bd6a08b7fde5':
  Import translations. DO NOT MERGE

10 years agoam 35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 18 Nov 2013 18:53:25 +0000 (10:53 -0800)]
am 35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '35fb6cdf14549dac07585ae791b27e2c069bf176':
  Import translations. DO NOT MERGE

10 years agoam d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 18 Nov 2013 18:53:21 +0000 (10:53 -0800)]
am d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'd7b4052049cba6c793367f6b5a8c3837f06faf1e':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 18 Nov 2013 18:51:51 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 18 Nov 2013 18:51:24 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 18 Nov 2013 18:51:19 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 18 Nov 2013 18:51:00 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 18 Nov 2013 18:50:30 +0000 (18:50 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoam 51213d94: am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into...
Robert Greenwalt [Mon, 18 Nov 2013 18:37:51 +0000 (10:37 -0800)]
am 51213d94: am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev

* commit '51213d943b3931434cbd196a8a159ee325a4e3fc':
  Fix NPE in ConnectivityService

10 years agoam a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev
Robert Greenwalt [Mon, 18 Nov 2013 18:33:46 +0000 (10:33 -0800)]
am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev

* commit 'a8a448da25c62f54cac3318c17c69e851a4ecde9':
  Fix NPE in ConnectivityService

10 years agoInitial integration of Minikin to framework
Raph Levien [Wed, 22 May 2013 23:16:59 +0000 (16:16 -0700)]
Initial integration of Minikin to framework

With this patch, framework does at least some of its text rendering
using Minikin instead of TextLayoutCache. There's a lot of stuff broken
and not yet implemented, but the phone will boot.

Changes are hidden behind USE_MINIKIN, which should be set in
BoardConfig.mk for the brave. Without that, there are changes to
signatures in JNI methods and so on, but shouldn't be any visible
changes.

This commit also introduces a new abstraction for Typeface:

The new TypefaceImpl abstraction represents the functionality that
corresponds to a Java Typeface object. Currently it is backed by
SkTypeface, but in the migration to Minikin it is a FontCollection
combined with a FontStyle. This patch introduces a USE_MINIKIN
preprocessor switch, so there is no substantial change to existing
Skia-based code, but which lets us start replacing the implementation
with the Minikin version.

Change-Id: I532c4c2d32d4f4c1f349dc1db37caa112af587ea

10 years agoam e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev
Robert Greenwalt [Mon, 18 Nov 2013 18:29:51 +0000 (10:29 -0800)]
am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev

* commit 'e568672c9e57e1d7066e95ba547a1ae568409226':
  Fix NPE in ConnectivityService

10 years agoMerge "Fix NPE in ConnectivityService" into klp-dev
Robert Greenwalt [Mon, 18 Nov 2013 18:27:23 +0000 (18:27 +0000)]
Merge "Fix NPE in ConnectivityService" into klp-dev

10 years agoUpdate ICU_Delegate methods. DO NOT MERGE
Deepanshu Gupta [Wed, 13 Nov 2013 13:39:17 +0000 (19:09 +0530)]
Update ICU_Delegate methods. DO NOT MERGE

Bug: 11435966
Change-Id: Ib8ed2011fe62b2496795075b33b9ca7d5907b87a

10 years agoam 5b950250: (-s ours) am ea04da7a: am 9570ed56: Merge "Add libphonenumber to layoutl...
Deepanshu Gupta [Mon, 18 Nov 2013 18:19:42 +0000 (10:19 -0800)]
am 5b950250: (-s ours) am ea04da7a: am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev

* commit '5b95025059f0925ad8d11bf503eb2acb4cc63228':
  Add libphonenumber to layoutlib.jar. DO NOT MERGE

10 years agoam f6ee0805: (-s ours) am 42453ede: am 599105a9: Merge "Fix NPE in layoutlib. DO...
Deepanshu Gupta [Mon, 18 Nov 2013 18:19:39 +0000 (10:19 -0800)]
am f6ee0805: (-s ours) am 42453ede: am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev

* commit 'f6ee0805706531ee0e899778a16bec71b5f18ce5':
  Fix NPE in layoutlib. DO NOT MERGE

10 years agoam ea04da7a: am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE...
Deepanshu Gupta [Mon, 18 Nov 2013 18:15:44 +0000 (10:15 -0800)]
am ea04da7a: am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev

* commit 'ea04da7a183b526cdc79366822e4fc794d28cbd2':
  Add libphonenumber to layoutlib.jar. DO NOT MERGE

10 years agoam 42453ede: am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev
Deepanshu Gupta [Mon, 18 Nov 2013 18:15:40 +0000 (10:15 -0800)]
am 42453ede: am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev

* commit '42453ede3335aa5f7007a5b36749e84df83a08d4':
  Fix NPE in layoutlib. DO NOT MERGE

10 years agoam 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev
Deepanshu Gupta [Mon, 18 Nov 2013 18:11:50 +0000 (10:11 -0800)]
am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev

* commit '9570ed561296dd5a0753198706cde152b00f1b24':
  Add libphonenumber to layoutlib.jar. DO NOT MERGE