OSDN Git Service

android-x86/frameworks-base.git
9 years agoMerge "Doze: Improve icon treatment when dozing." into lmp-dev
John Spurlock [Fri, 22 Aug 2014 12:59:15 +0000 (12:59 +0000)]
Merge "Doze: Improve icon treatment when dozing." into lmp-dev

9 years agoRemove a line that was accidentally committed.
Narayan Kamath [Fri, 22 Aug 2014 11:35:04 +0000 (12:35 +0100)]
Remove a line that was accidentally committed.

Prevents the APK from being installed.

bug: 17153971

Change-Id: Ic53c94dc6f0583371965d5edb0b12248c915214e

9 years agoRemove CursorAnchorInfoRequest and related stuff
Yohei Yukawa [Fri, 22 Aug 2014 01:38:44 +0000 (18:38 -0700)]
Remove CursorAnchorInfoRequest and related stuff

This CL removes CursorAnchorInfoRequest and related stuff
in favor of InputConnection.requestUpdateCursorAnchorInfo,
which is more easy to understand. This CL also deprecates
InputMethodManager#updateCursor and related stuff.

Rationale:
1. The spec of #updateCursor says that it provides the cursor
   position in local coordinates, while the input method
   requires it in the screen coordinates.
2. #updateCursor has never been enabled in AOSP, because
   InputMethodManager#isWatchingCursor always returned false.
3. There has been no way to let
   InputMethodManager#isWatchingCursor return true.
4. In L, InputMethodManager#updateCursorAnchorInfo is
   introduced to address all the issues above.

Given that we no longer need to support #updateCursor,
CursorAnchorInfoRequest is overkill when we need to convey
just a couple of parameters.

BUG: 17185263
BUG: 17182367

Change-Id: I4a577bfd02b37b9e56c80b8b41bb25afa95dd8ef

9 years agoMerge "Fix service tests." into lmp-dev
Narayan Kamath [Fri, 22 Aug 2014 07:47:36 +0000 (07:47 +0000)]
Merge "Fix service tests." into lmp-dev

9 years agoAdd spam-safe logger.
Jungshik Jang [Fri, 22 Aug 2014 04:49:55 +0000 (13:49 +0900)]
Add spam-safe logger.

This change introduces a new helper class, HdmiLogger,
which prevents spammy log for same error message.

Bug: 17179667
Change-Id: Ia55808408e0a92b0370cd627361f80754b2f1018

9 years agoMerge "Implement interfaces for MHL scratchpad command" into lmp-dev
Jungshik Jang [Fri, 22 Aug 2014 05:22:44 +0000 (05:22 +0000)]
Merge "Implement interfaces for MHL scratchpad command" into lmp-dev

9 years agoMerge "Fix docs for circular reveal" into lmp-dev
Chet Haase [Fri, 22 Aug 2014 04:12:49 +0000 (04:12 +0000)]
Merge "Fix docs for circular reveal" into lmp-dev

9 years agoMerge "Clean up RsFountainFbo_intermediates." into lmp-dev
Stephen Hines [Fri, 22 Aug 2014 04:09:46 +0000 (04:09 +0000)]
Merge "Clean up RsFountainFbo_intermediates." into lmp-dev

9 years agoMerge "Rework the per-network URL API." into lmp-dev
Lorenzo Colitti [Fri, 22 Aug 2014 03:07:27 +0000 (03:07 +0000)]
Merge "Rework the per-network URL API." into lmp-dev

9 years agoImplement interfaces for MHL scratchpad command
Jungshik Jang [Thu, 21 Aug 2014 05:17:05 +0000 (14:17 +0900)]
Implement interfaces for MHL scratchpad command

1. Add sendScratchpadCommand to IHdmiControlService interface,
which is used to send scratchpad command.

2. Add IHdmiMhlScratchpadCommandListener to handle incoming
MHL scratchpad command.

Bug: 17146522

Change-Id: I8e8e743dc08a18c80867be470997ce79d3292c15

9 years agoMerge "CEC: Skip routing control/internal source selection conditionally" into lmp-dev
Jinsuk Kim [Fri, 22 Aug 2014 02:14:05 +0000 (02:14 +0000)]
Merge "CEC: Skip routing control/internal source selection conditionally" into lmp-dev

9 years agoRework the per-network URL API.
Lorenzo Colitti [Thu, 21 Aug 2014 18:45:54 +0000 (11:45 -0700)]
Rework the per-network URL API.

This addresses API council comments.

Bug: 17112978
Change-Id: I698b243b2b685d1f25414cee72450be3ae0c2bf0

9 years agoFix docs for circular reveal
Chet Haase [Fri, 22 Aug 2014 01:55:38 +0000 (18:55 -0700)]
Fix docs for circular reveal

Issue #17189634 API Review: reveal animation

Change-Id: Iffcec2669368fc95b50ddcba63d0f5c552f49231

9 years agoMerge "Directly propagate Activity titles to action bars" into lmp-dev
Adam Powell [Fri, 22 Aug 2014 01:18:22 +0000 (01:18 +0000)]
Merge "Directly propagate Activity titles to action bars" into lmp-dev

9 years agoDirectly propagate Activity titles to action bars
Adam Powell [Fri, 22 Aug 2014 01:05:53 +0000 (18:05 -0700)]
Directly propagate Activity titles to action bars

Window decor action bars already inherit window title changes if no
explicit action bar title has been set but from an Activity's
perspective setting the activity title is a stronger signal. This is
especially relevant when the activity's action bar has been provided
by the application in the form of a Toolbar.

Bug 17138048

Change-Id: Ibf042cab6bbda3dc29590c09d1a0910b6ba78870

9 years agoMerge "Add private themes for dialogs spawned from Settings theme" into lmp-dev
Alan Viverette [Fri, 22 Aug 2014 01:03:47 +0000 (01:03 +0000)]
Merge "Add private themes for dialogs spawned from Settings theme" into lmp-dev

9 years agoMinor tweaks to recents thumbnails.
Winson Chung [Wed, 20 Aug 2014 22:39:01 +0000 (15:39 -0700)]
Minor tweaks to recents thumbnails.

- Reducing the size of the recents thumbnails
- Skip persisting if we never update the last thumbnail
- Don't bother loading the last thumbnail file descriptor if we have it in memory
- Fixing warning in getting drawable from resource

Change-Id: Ieddaeac75a5e5d80876a9b6b1d50f7cc84c7d6fd

9 years agoMerge "Clean up nullable listeners in date and time picker delegates" into lmp-dev
Alan Viverette [Fri, 22 Aug 2014 01:02:01 +0000 (01:02 +0000)]
Merge "Clean up nullable listeners in date and time picker delegates" into lmp-dev

9 years agoMerge "Guard against EOF when reading in FileBridge." into lmp-dev
Jeff Sharkey [Fri, 22 Aug 2014 00:58:01 +0000 (00:58 +0000)]
Merge "Guard against EOF when reading in FileBridge." into lmp-dev

9 years agoGuard against EOF when reading in FileBridge.
Jeff Sharkey [Fri, 22 Aug 2014 00:54:29 +0000 (17:54 -0700)]
Guard against EOF when reading in FileBridge.

Bug: 17183379
Change-Id: I8856fc149915281093f83f46bad64f211d134322

9 years agoMerge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev
Eino-Ville Talvala [Fri, 22 Aug 2014 00:46:40 +0000 (00:46 +0000)]
Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev

9 years agoCEC: Skip routing control/internal source selection conditionally
Jinsuk Kim [Fri, 22 Aug 2014 00:07:40 +0000 (09:07 +0900)]
CEC: Skip routing control/internal source selection conditionally

This is necessary for TV woken up by <Text/Image View On> to override
initial TV source selection/routing control, since the input change
will immediately come from external device.

Bug: 17189114
Change-Id: I4aa1ac31bc7f6ab554e29a9e6065e534e15abd58

9 years agoMerge "Camera2: add toString for two params classes" into lmp-dev
Yin-Chia Yeh [Fri, 22 Aug 2014 00:20:05 +0000 (00:20 +0000)]
Merge "Camera2: add toString for two params classes" into lmp-dev

9 years agoMake mAutoAttachOnCreation in DcTracker configuable
Jing Zhao [Wed, 20 Aug 2014 18:51:30 +0000 (13:51 -0500)]
Make mAutoAttachOnCreation in DcTracker configuable

Bug: 17131842
Change-Id: Iba63cff2f8f5b3ed28bde2aca42e91d3693cad54

9 years agoMerge "Content description for next alarm" into lmp-dev
Jorim Jaggi [Fri, 22 Aug 2014 00:05:45 +0000 (00:05 +0000)]
Merge "Content description for next alarm" into lmp-dev

9 years agoAdditional changes for Conference.
Santos Cordon [Thu, 21 Aug 2014 21:28:11 +0000 (14:28 -0700)]
Additional changes for Conference.

1) Connection.setConference() checked to see if the conference was valid
before setting it.  This prevented us from populating child connections
on a new conference until it was added.  Now we allow it but dont sent
the update unless the conference has already been sent.
2) removed unnecessary ArrayList<>() wrappers on CopyOnWriteLists.
3) Updated disconnect/hold/unhold so that they are sent to Conference
objects as well as Connection objects.
4) Added support for separating a child conference call.
5) Additional Logging

Bug: 15621105
Bug: 17136172
Change-Id: I939c36bc9694b9d81f0ff582e2fbe335006aa485

9 years agoClean up RsFountainFbo_intermediates.
Stephen Hines [Thu, 21 Aug 2014 23:34:43 +0000 (16:34 -0700)]
Clean up RsFountainFbo_intermediates.

Change-Id: I5c041bac357466d918d3dd209f36b505fd000852

9 years agoContent description for next alarm
Jorim Jaggi [Thu, 21 Aug 2014 23:33:33 +0000 (01:33 +0200)]
Content description for next alarm

Also fixes a bug where "status" was read out with TalkBack for no
good reason.

Bug: 15694080
Change-Id: Id295eb70af880d93ff928ebc337b09a8d679120d

9 years agoMerge "MediaCodec: expand documentation on flush/EOS handling and adaptive playback...
Lajos Molnar [Thu, 21 Aug 2014 23:05:27 +0000 (23:05 +0000)]
Merge "MediaCodec: expand documentation on flush/EOS handling and adaptive playback" into lmp-dev

9 years agoMerge "Add Parent Change to ChangeTransform" into lmp-dev
George Mount [Thu, 21 Aug 2014 23:00:04 +0000 (23:00 +0000)]
Merge "Add Parent Change to ChangeTransform" into lmp-dev

9 years agoAdd Parent Change to ChangeTransform
Dake Gu [Tue, 22 Jul 2014 21:53:53 +0000 (14:53 -0700)]
Add Parent Change to ChangeTransform

Bug 16460123

Modified ChangeTransform to support any pivot changes.
Modified ChangeTransform to support changes between parents.

Change-Id: I6374890dab9f3d795f334b951bdb9d51d434b8ee

9 years agoMerge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev
Igor Murashkin [Thu, 21 Aug 2014 22:33:28 +0000 (22:33 +0000)]
Merge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev

9 years agoMerge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev
George Mount [Thu, 21 Aug 2014 22:26:56 +0000 (22:26 +0000)]
Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev

9 years agoMerge "MediaHTTPConnection: handles cross protocol redirects." into lmp-dev
Ronghua Wu [Thu, 21 Aug 2014 22:24:15 +0000 (22:24 +0000)]
Merge "MediaHTTPConnection: handles cross protocol redirects." into lmp-dev

9 years agoAdd private themes for dialogs spawned from Settings theme
Alan Viverette [Thu, 21 Aug 2014 22:16:31 +0000 (15:16 -0700)]
Add private themes for dialogs spawned from Settings theme

BUG: 16778165
Change-Id: I19ecf735171c55d56dc1072622eeefcef5d233a0

9 years agoVoLTE incoming call number
Jing Zhao [Tue, 19 Aug 2014 17:41:23 +0000 (12:41 -0500)]
VoLTE incoming call number

Set incoming call number in OIR to be shown to user

Bug: 17032453
Change-Id: Iceadb0f537fb35f685cbcf8279ccef7d86036600

9 years agoMerge "Add better error message for AAPT file conflicts" into lmp-dev
Adam Lesinski [Thu, 21 Aug 2014 22:00:24 +0000 (22:00 +0000)]
Merge "Add better error message for AAPT file conflicts" into lmp-dev

9 years agoMerge "AAPT: mipmaps should not end up in Splits" into lmp-dev
Adam Lesinski [Thu, 21 Aug 2014 22:00:08 +0000 (22:00 +0000)]
Merge "AAPT: mipmaps should not end up in Splits" into lmp-dev

9 years agoMerge "We need to specify a target SDK < 21 to use graphics RS." into lmp-dev
Stephen Hines [Thu, 21 Aug 2014 21:48:17 +0000 (21:48 +0000)]
Merge "We need to specify a target SDK < 21 to use graphics RS." into lmp-dev

9 years agoMerge "Work on issue #16683269: system_server still leaking memory" into lmp-dev
Dianne Hackborn [Thu, 21 Aug 2014 21:34:08 +0000 (21:34 +0000)]
Merge "Work on issue #16683269: system_server still leaking memory" into lmp-dev

9 years agoAllow Activities to opt into using Overlay for shared elements.
George Mount [Mon, 18 Aug 2014 23:50:50 +0000 (16:50 -0700)]
Allow Activities to opt into using Overlay for shared elements.

Bug 17001227

Change-Id: Icc49a81357ee69abd2a15a1d1efcead298ab3fb7

9 years agoCamera2: Fix return type of CaptureFailure#getFrameNumber
Eino-Ville Talvala [Thu, 21 Aug 2014 21:27:20 +0000 (14:27 -0700)]
Camera2: Fix return type of CaptureFailure#getFrameNumber

Should be long, not int.

Bug: 17188354
Change-Id: If90749f21cdf9dd493aa561769655211a70acf29

9 years agoMerge "Don't say "Arabic (Egypt)" in Settings." into lmp-dev
Elliott Hughes [Thu, 21 Aug 2014 21:24:43 +0000 (21:24 +0000)]
Merge "Don't say "Arabic (Egypt)" in Settings." into lmp-dev

9 years agoMerge "Change the NetworkInfo for disconnected types." into lmp-dev
Robert Greenwalt [Thu, 21 Aug 2014 21:02:18 +0000 (21:02 +0000)]
Merge "Change the NetworkInfo for disconnected types." into lmp-dev

9 years agoAAPT: mipmaps should not end up in Splits
Adam Lesinski [Thu, 21 Aug 2014 20:19:12 +0000 (13:19 -0700)]
AAPT: mipmaps should not end up in Splits

Mipmaps are never filtered, and so they will always
end up in the base APK. Make sure they get omitted from
any split.

Change-Id: Id24b082bc9bd2d3f031a58bd0de4d30b4f0de7e0

9 years agoClean up nullable listeners in date and time picker delegates
Alan Viverette [Thu, 21 Aug 2014 20:56:54 +0000 (13:56 -0700)]
Clean up nullable listeners in date and time picker delegates

Removes the NO_OP listener from TimePicker since we actually do null
checks everywhere already.

BUG: 17179502
Change-Id: I39a7d68253845c004027e31c59afc43be42195b7

9 years agoAdd better error message for AAPT file conflicts
Adam Lesinski [Tue, 13 May 2014 05:13:02 +0000 (22:13 -0700)]
Add better error message for AAPT file conflicts

Some resource directories may be the same even though
their names are different. For instance, the
"smallest width" qualifier was added in API 13,
so the resource directory "values-sw600dp" and
"values-sw600dp-v13" are the same and cause
a conflict. The error reports that this might be the
case.

Change-Id: Ia35f1d670edd48265b3a7fe3d55656128421f612

9 years agoMerge "Enable scissor for rounded outline clips" into lmp-dev
Chris Craik [Thu, 21 Aug 2014 20:48:52 +0000 (20:48 +0000)]
Merge "Enable scissor for rounded outline clips" into lmp-dev

9 years agoEnable scissor for rounded outline clips
Chris Craik [Thu, 21 Aug 2014 19:26:16 +0000 (12:26 -0700)]
Enable scissor for rounded outline clips

bug:17164074

Change-Id: I83ca428f4d7651c6774ab81ac390477fb90c5d38

9 years agoWork on issue #16683269: system_server still leaking memory
Dianne Hackborn [Thu, 21 Aug 2014 20:44:19 +0000 (13:44 -0700)]
Work on issue #16683269: system_server still leaking memory

Fix a small temporary leak of app crash dialogs, which weren't
removing their timeout message.

Change-Id: Iee90b5fa2be700e3006388f32145ce4b14baa2ec

9 years agoMediaHTTPConnection: handles cross protocol redirects.
Ronghua Wu [Thu, 21 Aug 2014 18:15:53 +0000 (11:15 -0700)]
MediaHTTPConnection: handles cross protocol redirects.

Bug: 16899444
Bug: 17106630

Change-Id: I7e416447abffcae31c65fd469ee5f9fc867b4cdc

9 years agoMerge "Update Split example with application icon" into lmp-dev
Adam Lesinski [Thu, 21 Aug 2014 20:39:25 +0000 (20:39 +0000)]
Merge "Update Split example with application icon" into lmp-dev

9 years agoMerge "Report the right resource version in am get-config" into lmp-dev
Adam Lesinski [Thu, 21 Aug 2014 20:38:57 +0000 (20:38 +0000)]
Merge "Report the right resource version in am get-config" into lmp-dev

9 years agoJobScheduler needs to flush queue on charging
Matthew Williams [Fri, 8 Aug 2014 18:51:06 +0000 (11:51 -0700)]
JobScheduler needs to flush queue on charging

Also make it illegal to schedule a job with no constraints.
BUG: 16877705
Change-Id: Iae57286bc4f73163a7e3c9d2d531623fd50f1f72

9 years agoMerge "Write device owner name to XML" into lmp-dev
Jason Monk [Thu, 21 Aug 2014 20:28:07 +0000 (20:28 +0000)]
Merge "Write device owner name to XML" into lmp-dev

9 years agoMerge "Don't run animators in buildLayer" into lmp-dev
John Reck [Thu, 21 Aug 2014 20:26:17 +0000 (20:26 +0000)]
Merge "Don't run animators in buildLayer" into lmp-dev

9 years agoDon't say "Arabic (Egypt)" in Settings.
Elliott Hughes [Thu, 21 Aug 2014 20:10:44 +0000 (13:10 -0700)]
Don't say "Arabic (Egypt)" in Settings.

Nexus devices only ship one Arabic locale: ar_EG. This should probably be
changed to ar_001 in a later release (and, really, we should let users
choose _all_ of the Arabic-speaking countries), but there's no time for L.

This adds ar_EG to the list of special cases for LocalePicker so that
we'll show "Arabic" instead of "Arabic (Egypt)" (the actual change uses
the Arabic for "Arabic", obviously).

If you're an OEM trying to ship multiple Arabic locales, please accept
my apologies for making your lives slightly harder and, yes, this is the
patch you want to revert so that ar_EG shows up as "Arabic (Egypt)" again.

Bug: 17150708
Change-Id: Iea2fdf813bf3d7758e667bb1a8134a612ee0317b

9 years agoMerge "Fix supporting modifying listeners in callbacks" into lmp-dev
John Reck [Thu, 21 Aug 2014 20:18:54 +0000 (20:18 +0000)]
Merge "Fix supporting modifying listeners in callbacks" into lmp-dev

9 years agoDoze: Improve icon treatment when dozing.
John Spurlock [Thu, 21 Aug 2014 13:44:39 +0000 (09:44 -0400)]
Doze: Improve icon treatment when dozing.

Instead of inverting them, simply desaturate.  Also, apply
a constant background to small icons and give them some
transparency.

Bug:17137319

Change-Id: Id772b4fcd9ffa461bec26b87a74302012fb27867

9 years agoMerge "Update form spinner and search field assets" into lmp-dev
Alan Viverette [Thu, 21 Aug 2014 20:03:04 +0000 (20:03 +0000)]
Merge "Update form spinner and search field assets" into lmp-dev

9 years agoMerge "Jump drawable state (including ripples) on view detach" into lmp-dev
Alan Viverette [Thu, 21 Aug 2014 20:03:02 +0000 (20:03 +0000)]
Merge "Jump drawable state (including ripples) on view detach" into lmp-dev

9 years agoMerge "Update material switch styling" into lmp-dev
Alan Viverette [Thu, 21 Aug 2014 19:59:03 +0000 (19:59 +0000)]
Merge "Update material switch styling" into lmp-dev

9 years agoJump drawable state (including ripples) on view detach
Alan Viverette [Thu, 21 Aug 2014 19:57:45 +0000 (12:57 -0700)]
Jump drawable state (including ripples) on view detach

BUG: 15350931
Change-Id: I09928f59fb7b9f6d87b1f5219353a41ae6b5681d

9 years agoUpdate form spinner and search field assets
Alan Viverette [Thu, 21 Aug 2014 19:53:27 +0000 (12:53 -0700)]
Update form spinner and search field assets

Also cleans up insets in some other Material drawables.

BUG: 17162129
BUG: 16736289
Change-Id: I9b4d77230941522022908bc2939c4026459cf02a

9 years agoWrite device owner name to XML
Jason Monk [Thu, 21 Aug 2014 19:34:25 +0000 (15:34 -0400)]
Write device owner name to XML

So that it can be remembered.

Bug: 17153003
Change-Id: I6fb96334f235348bc237cc52e09c2fe5ef1332b7

9 years agoFix supporting modifying listeners in callbacks
John Reck [Thu, 21 Aug 2014 19:37:48 +0000 (12:37 -0700)]
Fix supporting modifying listeners in callbacks

 Bug: 17179442

Change-Id: I2d64f86395c0b1befb5c10b9c696330db1c96821

9 years agoMerge "Use the crop function in the surfaceflinger screenshot api." into lmp-dev
Riley Andrews [Thu, 21 Aug 2014 19:31:44 +0000 (19:31 +0000)]
Merge "Use the crop function in the surfaceflinger screenshot api." into lmp-dev

9 years agoUpdate Split example with application icon
Adam Lesinski [Thu, 21 Aug 2014 19:23:36 +0000 (12:23 -0700)]
Update Split example with application icon

Play console wants the icon in the <application> tag

Change-Id: I83f8e5488ad853e548ba7aba6e32b14602a24ad3

9 years agoReport the right resource version in am get-config
Adam Lesinski [Thu, 21 Aug 2014 19:21:45 +0000 (12:21 -0700)]
Report the right resource version in am get-config

Change-Id: I79ed3db45d91d8ec7e6f67608533ce3adf22ab27

9 years agoMerge "Implement GradientDrawable getColorFilter." into lmp-dev
John Spurlock [Thu, 21 Aug 2014 19:13:57 +0000 (19:13 +0000)]
Merge "Implement GradientDrawable getColorFilter." into lmp-dev

9 years agoMerge "Show lock to app request on all users" into lmp-dev
Jason Monk [Thu, 21 Aug 2014 19:13:31 +0000 (19:13 +0000)]
Merge "Show lock to app request on all users" into lmp-dev

9 years agoMerge "Fix layer shadow transform crash" into lmp-dev
Chris Craik [Thu, 21 Aug 2014 19:03:24 +0000 (19:03 +0000)]
Merge "Fix layer shadow transform crash" into lmp-dev

9 years agoImplement GradientDrawable getColorFilter.
John Spurlock [Thu, 21 Aug 2014 18:53:05 +0000 (14:53 -0400)]
Implement GradientDrawable getColorFilter.

Otherwise the value in setColorFilter is unavailable.

Bug:17137319
Change-Id: Ief973abfa129d935aa45336275337e19a3eb0f6a

9 years agoMerge "In startActivityAsCaller, changing the way we get the userId." into lmp-dev
Nicolas Prevot [Thu, 21 Aug 2014 18:47:35 +0000 (18:47 +0000)]
Merge "In startActivityAsCaller, changing the way we get the userId." into lmp-dev

9 years agoMerge "Always set transport control flags" into lmp-dev
RoboErik [Thu, 21 Aug 2014 18:44:24 +0000 (18:44 +0000)]
Merge "Always set transport control flags" into lmp-dev

9 years agoMerge "Update the Split example" into lmp-dev
Adam Lesinski [Thu, 21 Aug 2014 18:43:57 +0000 (18:43 +0000)]
Merge "Update the Split example" into lmp-dev

9 years agoUpdate the Split example
Adam Lesinski [Thu, 21 Aug 2014 18:21:42 +0000 (11:21 -0700)]
Update the Split example

Caveat: There are two bugs:

- Mipmap definitions get placed in all splits.
- mdpi drawable doesn't get split properly.

Change-Id: I53b8e54cbcb3dfba495ec68e602f98666e8883a7

9 years agoMerge "Always put current user first in user switchers" into lmp-dev
Adrian Roos [Thu, 21 Aug 2014 18:36:02 +0000 (18:36 +0000)]
Merge "Always put current user first in user switchers" into lmp-dev

9 years agoAlways put current user first in user switchers
Adrian Roos [Thu, 21 Aug 2014 18:31:41 +0000 (20:31 +0200)]
Always put current user first in user switchers

Bug: 16896343
Change-Id: I2de19b3af5d5b2eed1347b41bccf9c9dc87c2e5b

9 years agoMerge "Fix a regression in partially updading app widgets." into lmp-dev
Svet Ganov [Thu, 21 Aug 2014 18:27:10 +0000 (18:27 +0000)]
Merge "Fix a regression in partially updading app widgets." into lmp-dev

9 years agoDon't run animators in buildLayer
John Reck [Thu, 21 Aug 2014 18:23:05 +0000 (11:23 -0700)]
Don't run animators in buildLayer

 Bug: 17172689

Change-Id: Ib47d589c002543327fa336718440f9f8c95524e0

9 years agoMerge "Use the correct versionCode for Split APKs" into lmp-dev
Adam Lesinski [Thu, 21 Aug 2014 18:21:19 +0000 (18:21 +0000)]
Merge "Use the correct versionCode for Split APKs" into lmp-dev

9 years agoUse the correct versionCode for Split APKs
Adam Lesinski [Fri, 8 Aug 2014 04:26:53 +0000 (21:26 -0700)]
Use the correct versionCode for Split APKs

Insert the correct versionCode into the generated
Split AndroidManifest.xml.

Change-Id: I0aec797b5a4ff8bd70f9394b18aee5ad292b37c8

9 years agoMerge "LE: Rename new MTU and connection paramter update APIs" into lmp-dev
Andre Eisenbach [Thu, 21 Aug 2014 17:56:24 +0000 (17:56 +0000)]
Merge "LE: Rename new MTU and connection paramter update APIs" into lmp-dev

9 years agoUpdate material switch styling
Alan Viverette [Thu, 21 Aug 2014 17:54:14 +0000 (10:54 -0700)]
Update material switch styling

Also adds switch style to default theme.

BUG: 16984766
Change-Id: Ib90bcd80cd599e3c66a08ae7b327a347f4ca2405

9 years agoAlways set transport control flags
RoboErik [Thu, 21 Aug 2014 17:13:58 +0000 (10:13 -0700)]
Always set transport control flags

In case we're attaching to a pre-existing session with non-zero flags.

bug:16822064
Change-Id: Ibd5cc8e00de59f1fe30fc3d0e64741aaf9f4746f

9 years agoShow lock to app request on all users
Jason Monk [Thu, 21 Aug 2014 17:45:44 +0000 (13:45 -0400)]
Show lock to app request on all users

This way secondary users can see it.  To avoid it being displayed
on the wrong user, clear it on user switch.

Bug: 17151184
Change-Id: I1699f85d2d90cbc0e17f39f9971f20d90637b38f

9 years agoam c1da9cbf: am 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug...
Ricardo Cervera [Thu, 21 Aug 2014 17:44:53 +0000 (17:44 +0000)]
am c1da9cbf: am 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs

* commit 'c1da9cbff5d5b597fd58cbb578a1eadc6f479c80':
  docs: Fixed typo in intents page. Bug: 16949177

9 years agoam e415ebc6: am d309de3d: am 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp...
Rich Slogar [Thu, 21 Aug 2014 17:44:47 +0000 (17:44 +0000)]
am e415ebc6: am d309de3d: am 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp-modular-docs

* commit 'e415ebc634c98b5a6aaa42c0698b7482e44b3b3f':
  Docs: Fixed typo 'Fore'

9 years agoam e4be8986: am 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout...
Ricardo Cervera [Thu, 21 Aug 2014 17:44:40 +0000 (17:44 +0000)]
am e4be8986: am 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs

* commit 'e4be8986544a45a2560003f004b72528c691acef':
  docs: Fixed bug in declaring layout page. Bug: 16815916

9 years agoam 9e6b3e7d: am 63da186f: am c5807808: docs: Fixed typo in Wear training class. Bug...
Ricardo Cervera [Thu, 21 Aug 2014 17:44:27 +0000 (17:44 +0000)]
am 9e6b3e7d: am 63da186f: am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202

* commit '9e6b3e7dd85224c836e902551079c2445688d762':
  docs: Fixed typo in Wear training class. Bug: 16709202

9 years agoMerge "Clear identity before calling out to PackageHelper" into lmp-dev
Jeff Sharkey [Thu, 21 Aug 2014 17:42:01 +0000 (17:42 +0000)]
Merge "Clear identity before calling out to PackageHelper" into lmp-dev

9 years agoClear identity before calling out to PackageHelper
Robin Lee [Thu, 21 Aug 2014 15:51:18 +0000 (16:51 +0100)]
Clear identity before calling out to PackageHelper

PackageHelper.resolveInstallLocation expects the binding user to be
equivalent to the calling user. If this is not the case, it may fail
and throw an exception preventing anyone but user 0 from installing
anything.

Bug: 17175251
Change-Id: Id5615738c7b4e1234a548c7b4a410282d14c9ee3

9 years agoMerge "AAPT: Fix regression generating dynamic ref table for shared libraries" into...
Adam Lesinski [Thu, 21 Aug 2014 17:31:44 +0000 (17:31 +0000)]
Merge "AAPT: Fix regression generating dynamic ref table for shared libraries" into lmp-dev

9 years agoam 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177...
Ricardo Cervera [Thu, 21 Aug 2014 17:31:31 +0000 (17:31 +0000)]
am 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs

* commit '2c374e643d6cce73a71fb57559f898b6b554e36c':
  docs: Fixed typo in intents page. Bug: 16949177

9 years agoam d309de3d: am 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp-modular-docs
Rich Slogar [Thu, 21 Aug 2014 17:31:27 +0000 (17:31 +0000)]
am d309de3d: am 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp-modular-docs

* commit 'd309de3d06817e51aab056284874f613238ff400':
  Docs: Fixed typo 'Fore'

9 years agoam 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815...
Ricardo Cervera [Thu, 21 Aug 2014 17:31:03 +0000 (17:31 +0000)]
am 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs

* commit '0d65bf25c8a9091d598f50e0d534625107db6cf6':
  docs: Fixed bug in declaring layout page. Bug: 16815916

9 years agoam 63da186f: am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202
Ricardo Cervera [Thu, 21 Aug 2014 17:30:57 +0000 (17:30 +0000)]
am 63da186f: am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202

* commit '63da186fef8add43bcd0c347eec86946b67350c3':
  docs: Fixed typo in Wear training class. Bug: 16709202

9 years agoMerge "Fixing issue with inconsistent icon filename. (Bug 16992882)" into lmp-dev
Winson Chung [Thu, 21 Aug 2014 17:19:27 +0000 (17:19 +0000)]
Merge "Fixing issue with inconsistent icon filename. (Bug 16992882)" into lmp-dev

9 years agoFix layer shadow transform crash
Chris Craik [Thu, 21 Aug 2014 17:18:58 +0000 (10:18 -0700)]
Fix layer shadow transform crash

bug:17180252

Change-Id: Ia648b8c98a217a3a4973917bf255d1397802cbbe