OSDN Git Service

android-x86/frameworks-base.git
10 years agoMerge "Separate background from ripple for better focus/press UX" into lmp-dev
Alan Viverette [Fri, 25 Jul 2014 00:12:31 +0000 (00:12 +0000)]
Merge "Separate background from ripple for better focus/press UX" into lmp-dev

10 years agoSeparate background from ripple for better focus/press UX
Alan Viverette [Thu, 24 Jul 2014 23:31:42 +0000 (16:31 -0700)]
Separate background from ripple for better focus/press UX

Regresses the "jump" when focus changes, since the background position
is static and we don't have any reasonable UX spec for this yet.

BUG: 16323640
Change-Id: I7152546ed08375864174049b342653b3c4d3d9fb

10 years agoFix corner case of RelativeLayout with pinned edges
Chet Haase [Tue, 22 Jul 2014 23:38:16 +0000 (16:38 -0700)]
Fix corner case of RelativeLayout with pinned edges

LayoutParams without a specified layout_width value automatically
get a default of 0. This works in most cases, when the view is pinned by
various constraints (such as alignParentLeft and alignParentRight),
but breaks down when the child lies in negative coordinates.

Negative coordinates are supposed to be a signal, in RelativeLayout, that
that coordinate is variable. However, negative margins can cause a negative
value to be calculated, at which point it should be used as a concrete value,
not a behavior trigger.

The fix is to use Integer.MIN_VALUe as the tirgger instead, to distinguish that
impossible value from negative values which could reasonably have been computed
during measurement.

Also, removes dead code from earlier attempt at rtl.

Issue #10606777 Time picker can't display 10, 11, or 12 oclock when font size is huge
Issue #16516577 resolveLayoutDirection doesn't act as intended

Change-Id: Ia564603012f3c45636e69cd3776205fb544fda48

10 years agoMerge "AudioService: implement TV system volume" into lmp-dev
Eric Laurent [Thu, 24 Jul 2014 23:26:44 +0000 (23:26 +0000)]
Merge "AudioService: implement TV system volume" into lmp-dev

10 years agoAudioService: implement TV system volume
Eric Laurent [Mon, 21 Jul 2014 22:43:18 +0000 (15:43 -0700)]
AudioService: implement TV system volume

Implement volume policy for TV devices:
- No ringer mode: never silent
- All stream volumes are synchronized: changing any
stream volume will change the volume for all sources.
- Volume is maintained per output device.
- If a CEC capable HDMI sink is connected, digital volume
is maxed out and volume controls are sent to HDMI sink.

Bug: 15759753.

Change-Id: Ic4c38c749ef0440def9635a1669068ccef02a323

10 years agoMerge "Also unhide WifiConfiguration.lastUpdatedUid." into lmp-dev
Chelsea Derrick [Thu, 24 Jul 2014 23:24:05 +0000 (23:24 +0000)]
Merge "Also unhide WifiConfiguration.lastUpdatedUid." into lmp-dev

10 years agoAlso unhide WifiConfiguration.lastUpdatedUid.
Chelsea Derrick [Thu, 24 Jul 2014 19:50:40 +0000 (12:50 -0700)]
Also unhide WifiConfiguration.lastUpdatedUid.

Bug: 16153258
Change-Id: I69c2666a63c3e56787c4aa2699c2cfd22c053353

10 years agoMerge "Don't create a ConnectivityManager when the service isn't ready yet." into...
Sreeram Ramachandran [Thu, 24 Jul 2014 23:35:56 +0000 (23:35 +0000)]
Merge "Don't create a ConnectivityManager when the service isn't ready yet." into lmp-dev

10 years agoDon't create a ConnectivityManager when the service isn't ready yet.
Sreeram Ramachandran [Thu, 24 Jul 2014 23:05:17 +0000 (16:05 -0700)]
Don't create a ConnectivityManager when the service isn't ready yet.

Bug: 16550853
Change-Id: Ib244c93dc982cbfe5d065a20e4b8f0aeefb15b8f

10 years agoMerge "Add memory tracking for persistent proccesses and launcher" into lmp-dev
wsmlby [Thu, 24 Jul 2014 23:25:50 +0000 (23:25 +0000)]
Merge "Add memory tracking for persistent proccesses and launcher" into lmp-dev

10 years agoCall PRE_BOOT_COMPLETED on starting any user
Amith Yamasani [Wed, 23 Jul 2014 02:59:47 +0000 (19:59 -0700)]
Call PRE_BOOT_COMPLETED on starting any user

Refactor PRE_BOOT_COMPLETED delivery code.
Continue to call it on all existing users on system update.
Call it on any user being started, as part of
initialization.

Change-Id: Ie188a823fb19afde3781d6c45ada55d6e92edfac

10 years agoAdd memory tracking for persistent proccesses and launcher
wsmlby [Thu, 24 Jul 2014 21:27:39 +0000 (14:27 -0700)]
Add memory tracking for persistent proccesses and launcher

Change-Id: I5228bd67884dc8b77207a597f279fd4032c7f9d9

10 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 24 Jul 2014 21:04:57 +0000 (21:04 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

10 years agoMerge "Add letter-spacing to Paint and TextView" into lmp-dev
Behdad Esfahbod [Thu, 24 Jul 2014 22:56:20 +0000 (22:56 +0000)]
Merge "Add letter-spacing to Paint and TextView" into lmp-dev

10 years agoAdd letter-spacing to Paint and TextView
Behdad Esfahbod [Thu, 17 Jul 2014 23:10:39 +0000 (19:10 -0400)]
Add letter-spacing to Paint and TextView

New API is hidden.

Bug: 15594400
Change-Id: I5cbe7aebef0b7280eb13924f2a706c0cb4a4688e

10 years agoMerge "resolved conflicts for merge of bc3699b1 to lmp-dev" into lmp-dev
Prashant Malani [Thu, 24 Jul 2014 22:39:54 +0000 (22:39 +0000)]
Merge "resolved conflicts for merge of bc3699b1 to lmp-dev" into lmp-dev

10 years agoresolved conflicts for merge of bc3699b1 to lmp-dev
Prashant Malani [Thu, 24 Jul 2014 22:29:22 +0000 (15:29 -0700)]
resolved conflicts for merge of bc3699b1 to lmp-dev

Change-Id: I1b219b5b48afb08ce3704a4f064a85652d2d9339

10 years agoMerge "Address API review" into lmp-dev
Selim Gurun [Thu, 24 Jul 2014 22:36:10 +0000 (22:36 +0000)]
Merge "Address API review" into lmp-dev

10 years agoAddress API review
Selim Gurun [Fri, 18 Jul 2014 23:23:46 +0000 (16:23 -0700)]
Address API review

Bug: 16403458

Address API review. This change updates the FileChooser api. The
largest change is, as requested by API council, providing a helper
to reduce the code app developers need to implement. This
change does not include the CookieManager changes that was requested.

Change-Id: I30d75f36df6bc96d9842b63fdd25c4ff62aee5bb

10 years agoam b4dcc64f: Merge "Revert "Remove circular mask"" into klp-modular-dev
Prashant Malani [Thu, 24 Jul 2014 18:06:03 +0000 (18:06 +0000)]
am b4dcc64f: Merge "Revert "Remove circular mask"" into klp-modular-dev

* commit 'b4dcc64fe6314b139ac17aa296419bbf153df2f6':
  Revert "Remove circular mask"

10 years agoMerge "QS: Handle all camera api exceptions during init." into lmp-dev
John Spurlock [Thu, 24 Jul 2014 22:15:13 +0000 (22:15 +0000)]
Merge "QS: Handle all camera api exceptions during init." into lmp-dev

10 years agoQS: Handle all camera api exceptions during init.
John Spurlock [Thu, 24 Jul 2014 22:12:58 +0000 (18:12 -0400)]
QS: Handle all camera api exceptions during init.

Temporary workaround to unblock certain devices.

Bug:16547333
Change-Id: I80d8ec609e5c32b9db290576c5ec791ad915c45c

10 years agoMerge "fix build" into lmp-dev
John Reck [Thu, 24 Jul 2014 21:48:47 +0000 (21:48 +0000)]
Merge "fix build" into lmp-dev

10 years agofix build
John Reck [Thu, 24 Jul 2014 21:46:54 +0000 (14:46 -0700)]
fix build

Change-Id: I597255b2b311b7daec7ffe537f62ee78eace50be

10 years agoUse a sequence number for thumbnail callback.
Yao Chen [Wed, 23 Jul 2014 22:04:48 +0000 (15:04 -0700)]
Use a sequence number for thumbnail callback.

Change-Id: I27888cd0437b4f654cb29371b7d86b9341d84ae9

10 years agoFix ALL compile warnings
John Reck [Thu, 24 Jul 2014 20:38:28 +0000 (13:38 -0700)]
Fix ALL compile warnings

 All warnings/errors fixed for GCC & Clang

Change-Id: I2ece3a136a5ae97a9acc3069537ed986238b5fd3

10 years agoMerge "Fix no transition when only shared element exists." into lmp-dev
George Mount [Thu, 24 Jul 2014 21:19:18 +0000 (21:19 +0000)]
Merge "Fix no transition when only shared element exists." into lmp-dev

10 years agoFix no transition when only shared element exists.
George Mount [Thu, 24 Jul 2014 20:19:51 +0000 (13:19 -0700)]
Fix no transition when only shared element exists.

Bug 16245703

Change-Id: Ie31baaf7f58038fc79ffca0206ce3bec0ef64cb4

10 years agoMerge "Fix build" into lmp-dev
Justin Morey [Thu, 24 Jul 2014 15:55:35 +0000 (15:55 +0000)]
Merge "Fix build" into lmp-dev

10 years agoFix build
Justin Morey [Thu, 24 Jul 2014 15:53:40 +0000 (10:53 -0500)]
Fix build

Change-Id: I8790b274864610b7e00d7ea12efe96b3b826301f

10 years agoLoad package information from correct user.
Kenny Guy [Tue, 15 Jul 2014 11:41:24 +0000 (12:41 +0100)]
Load package information from correct user.

Handle case where a package is only installed
for secondary user.

Bug: 15983201
Change-Id: I6733011c59e6d08d275dc761660d38b709051d79

10 years agoMerge "Fix DUN-based tethering." into lmp-dev
Robert Greenwalt [Thu, 24 Jul 2014 21:48:39 +0000 (21:48 +0000)]
Merge "Fix DUN-based tethering." into lmp-dev

10 years agoFix DUN-based tethering.
Robert Greenwalt [Wed, 23 Jul 2014 18:44:01 +0000 (11:44 -0700)]
Fix DUN-based tethering.

It was calling into dead ConnectivityService code rather than using
the new ConnectivityManager shim code.

bug:15221541
Change-Id: I1e3eea8a658a162ce36673ed1cf7b1e7e4372c42

10 years agoMerge "Revert "Remove circular mask"" into klp-modular-dev
Prashant Malani [Thu, 24 Jul 2014 17:42:06 +0000 (17:42 +0000)]
Merge "Revert "Remove circular mask"" into klp-modular-dev

10 years agoMerge "Remove MediaFocusControl persisting media button receiver" into lmp-dev
Jean-Michel Trivi [Thu, 24 Jul 2014 21:12:19 +0000 (21:12 +0000)]
Merge "Remove MediaFocusControl persisting media button receiver" into lmp-dev

10 years agoRemove MediaFocusControl persisting media button receiver
Jean-Michel Trivi [Thu, 24 Jul 2014 17:06:13 +0000 (10:06 -0700)]
Remove MediaFocusControl persisting media button receiver

MediaFocusControl doesn't handle media button receivers anymore,
 so it should read and persist a receiver, and monitor
 package addition/removals.
Also involved a security vulnerability, see bug

Bug 15428797

Change-Id: Ia2be01b20dc4a9820cc0cd3d0605ac03770b266b

10 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 24 Jul 2014 21:04:53 +0000 (21:04 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

10 years agoRefactor screen blocking logic.
Craig Mautner [Thu, 24 Jul 2014 04:47:09 +0000 (21:47 -0700)]
Refactor screen blocking logic.

Because of the call to turn on the screen introduced in ag/495255
is now made earlier we may not have sent the wakeup broadcast by
the time the windows have all drawn. In such a case onScreenOn()
did not release the wakelock and the screen stayed off.

This change ensures that no matter the timing of onScreenOn()
the wakelock will be released but only for the onScreenOn()
called in response to the most recent screen on transition.

Fixes bug 16404078.

Change-Id: Ic1e3e61e16c1fc34d4ec657e0e53ac49a05ca6a4

10 years agoMerge "Remove the max ripple count exceeded warning" into lmp-dev
Alan Viverette [Thu, 24 Jul 2014 20:47:37 +0000 (20:47 +0000)]
Merge "Remove the max ripple count exceeded warning" into lmp-dev

10 years agoRemove the max ripple count exceeded warning
Alan Viverette [Thu, 24 Jul 2014 20:45:46 +0000 (13:45 -0700)]
Remove the max ripple count exceeded warning

BUG: 16543509
Change-Id: I84ec8e01136d1f0f34c6153d8ef7936de547746e

10 years agoUpdate icons for search and back
Alan Viverette [Thu, 24 Jul 2014 20:42:40 +0000 (13:42 -0700)]
Update icons for search and back

BUG: 16539661
Change-Id: If914e812841d2844a4fa50cc5a863615531371a2

10 years agoMerge "Update icons for search and back" into lmp-dev
Alan Viverette [Thu, 24 Jul 2014 20:43:06 +0000 (20:43 +0000)]
Merge "Update icons for search and back" into lmp-dev

10 years agoMerge "Add <feature-group> tag and change aapt badging" into lmp-dev
Adam Lesinski [Thu, 24 Jul 2014 20:29:43 +0000 (20:29 +0000)]
Merge "Add <feature-group> tag and change aapt badging" into lmp-dev

10 years agocleanup : delete BLE advertising related hidden state references in Bluetooth Adapter
Prerepa Viswanadham [Thu, 24 Jul 2014 19:22:24 +0000 (12:22 -0700)]
cleanup : delete BLE advertising related hidden state references in Bluetooth Adapter

Change-Id: Ia58a46392157e274f8fc4696e8e25af480eb2d2a

10 years agoUpdated accessibility nodes not properly cached.
Svetoslav [Thu, 24 Jul 2014 19:19:22 +0000 (12:19 -0700)]
Updated accessibility nodes not properly cached.

We have an accessibiliy node info cache in the process of each
accessibility service. Sometimes the cached node changes and
in this case we have evict from the cache the sub-trees rooted
at children that are no longer present. There was bug where if
none of the children is present anymore we did not evict their
sub-trees.

Also the verification logic was not stopping if a duplicate
node is seen potentially getting into an infinite loop.

bug:15729762

Change-Id: I7adf4f0a1bde07b385556d9acdded5059231f1f3

10 years agoMerge "Volume: force-dismiss panel when the screen turns off." into lmp-dev
John Spurlock [Thu, 24 Jul 2014 19:16:35 +0000 (19:16 +0000)]
Merge "Volume: force-dismiss panel when the screen turns off." into lmp-dev

10 years agoVolume: force-dismiss panel when the screen turns off.
John Spurlock [Thu, 24 Jul 2014 19:15:25 +0000 (15:15 -0400)]
Volume: force-dismiss panel when the screen turns off.

Bug:16492823
Change-Id: Ifc069ef936dc5f29d11f6b11dcc7131f440c7f0b

10 years agoMerge "QS: Fix clipped battery icon when expanded." into lmp-dev
John Spurlock [Thu, 24 Jul 2014 18:56:27 +0000 (18:56 +0000)]
Merge "QS: Fix clipped battery icon when expanded." into lmp-dev

10 years agoQS: Fix clipped battery icon when expanded.
John Spurlock [Thu, 24 Jul 2014 16:16:14 +0000 (12:16 -0400)]
QS: Fix clipped battery icon when expanded.

Change-Id: If5ad46b9f25e70af0e13654ce1137955eb87eec2

10 years agoMerge "Move AdvertiseData length check to BluetoothAdvertiser." into lmp-dev
Wei Wang [Thu, 24 Jul 2014 18:25:24 +0000 (18:25 +0000)]
Merge "Move AdvertiseData length check to BluetoothAdvertiser." into lmp-dev

10 years agoMerge "Update CookieManager API for Council review." into lmp-dev
Hector Dearman [Thu, 24 Jul 2014 17:53:05 +0000 (17:53 +0000)]
Merge "Update CookieManager API for Council review." into lmp-dev

10 years agoCompute layer bounds over subset of VertexBuffer verts
Chris Craik [Thu, 24 Jul 2014 00:21:25 +0000 (17:21 -0700)]
Compute layer bounds over subset of VertexBuffer verts

bug:15538815
Change-Id: I0dbb54f656a6ae99a87c5734761107e1c2351b65

10 years agocamera2: Move noise model to dynamic metadata.
Ruben Brunk [Thu, 24 Jul 2014 00:49:08 +0000 (17:49 -0700)]
camera2: Move noise model to dynamic metadata.

Bug: 16369384

Change-Id: I7a540705176c7be68431a977e2b7218ffa1bddd0

10 years agoUpdate CookieManager API for Council review.
Hector Dearman [Mon, 21 Jul 2014 11:00:10 +0000 (12:00 +0100)]
Update CookieManager API for Council review.

Remove synchronized from setAcceptThirdPartyCookies

Bug: 16403458
Change-Id: I6073da2c03fd0952bc447f7cfe0d959148af6877

10 years agoConnect shadow style attributes to renderer
Chris Craik [Thu, 24 Jul 2014 01:19:28 +0000 (18:19 -0700)]
Connect shadow style attributes to renderer

bug:15859361

Moves lighting info out of StatefulBaseRenderer, since it's not useful
at record time, and only used by OGLR.

Change-Id: I7ab065d02d9304afad1dc4c48597a7a621366f8e

10 years agoam 0f1e067a: am 472e234d: am 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811
Ricardo Cervera [Thu, 24 Jul 2014 16:22:40 +0000 (16:22 +0000)]
am 0f1e067a: am 472e234d: am 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811

* commit '0f1e067a28c2ef50d4db53ad19e0902b052bd014':
  docs: Fixed RecyclerView example. Bug: 16483811

10 years agoam 39572996: am 1903bbb8: am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatti...
Robert Ly [Thu, 24 Jul 2014 16:22:29 +0000 (16:22 +0000)]
am 39572996: am 1903bbb8: am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs

* commit '39572996f25d4b4ce744d9d04080e33b687ab03b':
  cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1

10 years agoam 162493b5: am 3bb44fec: am 72c80d30: cherrypick from klp-docs docs: b/14387628...
Scott Rowe [Thu, 24 Jul 2014 16:22:15 +0000 (16:22 +0000)]
am 162493b5: am 3bb44fec: am 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1

* commit '162493b5e3fb1bbf4505c2d18ebf6c900d7875e6':
  cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1

10 years agoMerge "Add Calls.TRANSCRIPTION to CallLog (2/2)" into lmp-dev
Yorke Lee [Thu, 24 Jul 2014 17:40:11 +0000 (17:40 +0000)]
Merge "Add Calls.TRANSCRIPTION to CallLog (2/2)" into lmp-dev

10 years agoIMS: Adding ims on/off interface files and callback for enabled/disabled features.
ram [Wed, 16 Jul 2014 16:08:42 +0000 (21:38 +0530)]
IMS: Adding ims on/off interface files and callback for enabled/disabled features.

Change-Id: I4e0049d605d9e7d13035c43e2504cdfb67a7a102

10 years agoMerge "Add API invokeOemRilRequestRaw" into lmp-dev
Amit Mahajan [Thu, 24 Jul 2014 17:32:37 +0000 (17:32 +0000)]
Merge "Add API invokeOemRilRequestRaw" into lmp-dev

10 years agoPrint to PDF putting a pring job in a wrong state.
Svetoslav [Thu, 24 Jul 2014 17:13:00 +0000 (10:13 -0700)]
Print to PDF putting a pring job in a wrong state.

When printing to a PDF file we get a Uri from the storage APIs
and write the content. Once the file is written to storage the
print job is completed and there is print service involved. Th
spooler was wrongly putting the job in a failed state instead
of a complete state.

bug:16522267

Change-Id: I4741c9b9eb763e118e7dfb2c7c502bd7fc13f7a1

10 years agoAdd API invokeOemRilRequestRaw
Steven Liu [Thu, 17 Jul 2014 15:57:01 +0000 (10:57 -0500)]
Add API invokeOemRilRequestRaw

this API is used by system app, app could communicate with RIL
with it.

Change-Id: I5397c1cf2b108d9dc3a9694b1f071dc60bb5b341

Conflicts:
telephony/java/com/android/internal/telephony/ITelephony.aidl

10 years agoMerge "Document BlurMaskFilter.Blur." into lmp-dev
Leon Scroggins III [Thu, 24 Jul 2014 17:04:28 +0000 (17:04 +0000)]
Merge "Document BlurMaskFilter.Blur." into lmp-dev

10 years agoUpdate KeyguardUserSwitcher to use UserSwitcherController
Adrian Roos [Wed, 23 Jul 2014 19:13:21 +0000 (21:13 +0200)]
Update KeyguardUserSwitcher to use UserSwitcherController

Also wires up the button to expand the keyguard user switcher.
Also respects the EDU simple switcher setting.

Bug: 16043126
Change-Id: I58871ec3323b2cafcacbc747fec5f20c56172969

10 years agoAdd Calls.TRANSCRIPTION to CallLog (2/2)
Yorke Lee [Thu, 24 Jul 2014 02:43:39 +0000 (19:43 -0700)]
Add Calls.TRANSCRIPTION to CallLog (2/2)

Dialer needs access to the TRANSCRIPTION column via the CallLog to
show voicemail transcriptions inline.

Change-Id: Id1807923a07af9e9e34783e6be2e39485eee7795

10 years agoImplemented new camera affordance
Selim Cinek [Tue, 8 Jul 2014 16:01:07 +0000 (18:01 +0200)]
Implemented new camera affordance

Also fixed a bug in the touch logic where you could close the shade / hint
after going to the camera / phone.

Bug: 15126905
Change-Id: Iadfde56cb68f4048868eedec6bd3456f55823cd9

10 years agoExpose setActiveProfileOwner() using @SystemApi
Justin Morey [Thu, 24 Jul 2014 14:16:35 +0000 (09:16 -0500)]
Expose setActiveProfileOwner() using @SystemApi

Change-Id: I1607fa90e76da495ede48f01ad250baae60108af
(cherry picked from commit 85db24136eefb01341760208541563aba05ce82e)

10 years agoDocument BlurMaskFilter.Blur.
Leon Scroggins III [Thu, 24 Jul 2014 14:41:27 +0000 (10:41 -0400)]
Document BlurMaskFilter.Blur.

BUG:1894887
Change-Id: Ia5ed8d8d5e3fcebec6f903b2641d030e8b29513c

10 years agoDisable trust agents after wrong credential is entered
Adrian Roos [Wed, 23 Jul 2014 13:45:05 +0000 (15:45 +0200)]
Disable trust agents after wrong credential is entered

Bug: 16498202
Change-Id: I36f2e80aec8c04bcb6e6d9f1b0e2ebb8fc49998e

10 years agoRefactor text drawing to move minikin interactions outside of the canvas interface.
Derek Sollenberger [Mon, 21 Jul 2014 19:22:10 +0000 (15:22 -0400)]
Refactor text drawing to move minikin interactions outside of the canvas interface.

bug:15672762
Change-Id: Iad63855424b4eeccef67a7341a9c2b0018c64c30

10 years agoMake updateLocalMatrix replace the current Matrix.
Leon Scroggins III [Tue, 22 Jul 2014 21:25:22 +0000 (17:25 -0400)]
Make updateLocalMatrix replace the current Matrix.

Fixes a bug introduced in I3c3316377874e89fccc85afb864bc038b0ef3890.

CreateLocalMatrixShader combines the existing matrix with the new
matrix, which is not what we want. Keep track of the original
SkShader at all times, and always create the local matrix shader
with the original. Store the SkShader with a local matrix as
Shader.native_with_local_matrix.

Make Shader.native_instance private. Instead of allowing direct
access, add an init() method which sets it, and getNativeInstance(),
which returns either native_instance or native_with_local_matrix,
as appropriate.

Make Shader subclasses call init(), instead of setting native_instance
directly.

Pass native_with_local_matrix pointer to nativeSetLocalMatrix and
nativeDestructor, which unrefs it (if not null).

Since nativeSetLocalMatrix no longer replaces the original, do not
unref it.

Add a comment to Shader.updateLocalMatrix that it does not affect
ComposeShaders created with this Shader. (This should have been a
part of I3c3316377874e89fccc85afb864bc038b0ef3890.)

BUG:16293121
Change-Id: Ieb31c7e1fe99081f6b81493178f4a18d3c5df643

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Jul 2014 03:54:38 +0000 (20:54 -0700)]
Import translations. DO NOT MERGE

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

10 years agoMove AdvertiseData length check to BluetoothAdvertiser.
Wei Wang [Thu, 24 Jul 2014 03:33:31 +0000 (20:33 -0700)]
Move AdvertiseData length check to BluetoothAdvertiser.

This will keep AdvertiseData simple and avoid coupling with
BluetoothAdapter.

Change-Id: I3609652bdea1c6e757bac7d2dada7f8ddf20a5e3

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Jul 2014 02:37:41 +0000 (19:37 -0700)]
Import translations. DO NOT MERGE

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

10 years agoRevert "Remove circular mask"
Prashant Malani [Sat, 19 Jul 2014 00:27:56 +0000 (17:27 -0700)]
Revert "Remove circular mask"

This reverts commit 2e8b27e898af3af1165a79e7c5f8b59f63f20a2f.

It also makes the circularMask option configurable via overlay.
It is set to false by default.

An offset dimension entry is also provided, for displays which have
a "chin". This is set to 0 by default.

Bug: 16380982
Change-Id: I16ec3e8d8882a6683c9155055944e5c2f5cd781e

10 years agoam 472e234d: am 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811
Ricardo Cervera [Wed, 23 Jul 2014 23:12:15 +0000 (23:12 +0000)]
am 472e234d: am 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811

* commit '472e234d807df490124263c1e28c66e1918787c9':
  docs: Fixed RecyclerView example. Bug: 16483811

10 years agoam 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811
Ricardo Cervera [Wed, 23 Jul 2014 23:08:10 +0000 (23:08 +0000)]
am 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811

* commit '7af4e812d06d7174e9eb677a508c6af0f3ba3608':
  docs: Fixed RecyclerView example. Bug: 16483811

10 years agodocs: Fixed RecyclerView example. Bug: 16483811
Ricardo Cervera [Tue, 22 Jul 2014 19:58:24 +0000 (12:58 -0700)]
docs: Fixed RecyclerView example. Bug: 16483811

Change-Id: I1c501c97026dfaaac88d7398160ff192fee4fb05

10 years agoAdd <feature-group> tag and change aapt badging
Adam Lesinski [Tue, 24 Jun 2014 16:56:01 +0000 (09:56 -0700)]
Add <feature-group> tag and change aapt badging

A <feature-group> represents a set of features required
for an app to be compatible with a device. Multiple
<feature-group> elements represent a logical 'or'
of required features.

Features defined in the old way with <uses-feature> tags
under the <manifest> tag are automatically added to each
feature-group defined.

Defining a <feature-group> means that any default
features are not included (such as android.hardware.touchscreen)
and declared permissions do not imply any features.

Change-Id: I45626f0fdc546e47bcf2aead7ef05ebcca12b023

10 years agoam 1903bbb8: am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html...
Robert Ly [Wed, 23 Jul 2014 21:06:47 +0000 (21:06 +0000)]
am 1903bbb8: am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs

* commit '1903bbb88d8e2e1921b0441911cb73966d3bca4a':
  cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1

10 years agoam 3bb44fec: am 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localiz...
Scott Rowe [Wed, 23 Jul 2014 21:06:36 +0000 (21:06 +0000)]
am 3bb44fec: am 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1

* commit '3bb44fecbb9643e68a52d19b9c90809c77367b3e':
  cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1

10 years agoam 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id...
Robert Ly [Wed, 23 Jul 2014 21:02:12 +0000 (21:02 +0000)]
am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs

* commit '22bdcd2f829dd9226978c9ec4405fd89d4562d73':
  cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1

10 years agoam 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localized Applicatio...
Scott Rowe [Wed, 23 Jul 2014 21:02:09 +0000 (21:02 +0000)]
am 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1

* commit '72c80d308a88d59347f13dd813f2885bc4f45acc':
  cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1

10 years agocherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu...
Scott Rowe [Wed, 4 Jun 2014 17:15:17 +0000 (10:15 -0700)]
cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1

Change-Id: I245d8351d82b29131783df71f78fcd7bc3c1d89e

10 years agoMerge "Making the clipboard work across users." into lmp-dev
Nicolas Prevot [Thu, 24 Jul 2014 10:47:52 +0000 (10:47 +0000)]
Merge "Making the clipboard work across users." into lmp-dev

10 years agoMaking the clipboard work across users.
Nicolas Prevot [Wed, 25 Jun 2014 08:29:02 +0000 (09:29 +0100)]
Making the clipboard work across users.

When copying from the parent: the ClipData can be pasted in the managed profile.
When copying from a managed profile: it can be pasted in the parent,
unless the policies says it's disabled. In which case, the clipboard of the parent becomes empty.
Supporting content uris.

BUG: 15186236

Change-Id: I522564a7c07ff21df137adcda980bb52e5739964

10 years agoShow disclosure when an intent switches profiles
Robin Lee [Wed, 23 Jul 2014 22:41:31 +0000 (23:41 +0100)]
Show disclosure when an intent switches profiles

If an activity in one profile starts an activity in another profile
without any user interaction - such as operating the chooser - a toast
appears, saying something like 'you are using this app in your work
space'.

@bug 14375080

Change-Id: Id2dc5973a9b68ee29d0227947c19b78f021fb6ac

10 years agoMerge "TIF: Handle null main session" into lmp-dev
Ji-Hwan Lee [Thu, 24 Jul 2014 09:01:20 +0000 (09:01 +0000)]
Merge "TIF: Handle null main session" into lmp-dev

10 years agoTIF: Handle null main session
Ji-Hwan Lee [Thu, 24 Jul 2014 08:34:19 +0000 (17:34 +0900)]
TIF: Handle null main session

Change-Id: I5d9007e706d2adf4b559839c1db31221527214ec

10 years agoFix typo
Sungsoo Lim [Thu, 24 Jul 2014 08:14:57 +0000 (17:14 +0900)]
Fix typo

Change-Id: Ied87356fae0fff1bc5a0c80223351423a81ea0ce

10 years agoTIF: Fix crash on setMainSession
Ji-Hwan Lee [Thu, 24 Jul 2014 08:11:03 +0000 (17:11 +0900)]
TIF: Fix crash on setMainSession

Change-Id: Iddf5032a99dbf855e418448b39ba66a68be8b07c

10 years agoTIF: Support HDMI-CEC active source management
Ji-Hwan Lee [Mon, 21 Jul 2014 19:46:30 +0000 (04:46 +0900)]
TIF: Support HDMI-CEC active source management

Add system API TvView.setMain() and TvInputService.onSetMain().

Bug: 15994065
Change-Id: I60ac24659453ca616380993c4accd8c17e714639

10 years agoMerge "TIF: Enable capturing TV input of TvInputPassthroughWrapperService" into lmp-dev
Terry Heo [Thu, 24 Jul 2014 05:47:58 +0000 (05:47 +0000)]
Merge "TIF: Enable capturing TV input of TvInputPassthroughWrapperService" into lmp-dev

10 years agoTIF: Enable capturing TV input of TvInputPassthroughWrapperService
Terry Heo [Mon, 21 Jul 2014 06:17:17 +0000 (15:17 +0900)]
TIF: Enable capturing TV input of TvInputPassthroughWrapperService

Also fixed usage of Log.e() in TvInputService to show stack trace.

Bug: 16441553
Change-Id: I5c160de4a628698907ffd00510d982d597c0ea01

10 years agoMerge "Rewriting android.text.format.Time without the native _tz functions" into...
Neil Fuller [Thu, 24 Jul 2014 10:42:38 +0000 (10:42 +0000)]
Merge "Rewriting android.text.format.Time without the native _tz functions" into lmp-dev

10 years agoRewriting android.text.format.Time without the native _tz functions
Neil Fuller [Wed, 25 Jun 2014 10:13:25 +0000 (11:13 +0100)]
Rewriting android.text.format.Time without the native _tz functions

(cherry picked from commit d7f0849b8c053ccc6abf0dc7d5bc07da502782a4)
Bug: 15765976

Change-Id: I00f72bd1043ef20f22d25559206b2f741334ba9c

10 years agoMerge "TIF: Fix crash on setMainSession" into lmp-dev
Ji-Hwan Lee [Thu, 24 Jul 2014 08:14:43 +0000 (08:14 +0000)]
Merge "TIF: Fix crash on setMainSession" into lmp-dev

10 years agoMerge "Revert "Make lighting style and attribute public"" into lmp-dev
Alan Viverette [Thu, 24 Jul 2014 01:44:00 +0000 (01:44 +0000)]
Merge "Revert "Make lighting style and attribute public"" into lmp-dev

10 years agoRevert "Make lighting style and attribute public"
Alan Viverette [Thu, 24 Jul 2014 01:43:51 +0000 (01:43 +0000)]
Revert "Make lighting style and attribute public"

We're moving some things around. Stay tuned!

This reverts commit fe16224456b72966515190e19f8f85793a39d1c9.

Change-Id: I13a2013854cba64540dfee5c3e4ecb4929c336b5