OSDN Git Service

android-x86/frameworks-base.git
8 years agoRevert "Add support for partial view layouts"
Chet Haase [Thu, 3 Dec 2015 15:38:11 +0000 (07:38 -0800)]
Revert "Add support for partial view layouts"

This reverts commit c55d5072ac52cee1811b52406419228fa81119ce.

There were several bugs related to incorrect handling of various
layout issues (layout not being run on containers/views that needed
it), reverting to take another run at it outside of master.

Issue #25980198  requestLayout() sometimes doesn't result in measure/layout for view

Change-Id: Ic0e159cbcf6171652d8fd1bee9ae44a3977cea04

8 years agoMerge "Fix requestLayout() optimizations"
Chet Haase [Mon, 7 Dec 2015 21:29:00 +0000 (21:29 +0000)]
Merge "Fix requestLayout() optimizations"

8 years agoFix requestLayout() optimizations
Chet Haase [Mon, 7 Dec 2015 20:58:06 +0000 (12:58 -0800)]
Fix requestLayout() optimizations

A bug in recent layout optimizations was causing the framework to avoid
laying out containers with WRAP_CONTENT in one axis or the other.
This fix updates the logic in the code that finds dependent layout axes
to correctly account for this case.

Issue #25980198 requestLayout() sometimes doesn't result in measure/layout for view

Change-Id: Ie5f678beef5d8c4ba25291ffdcd59797d4697acc

8 years agoMerge "Move surface save state tracking to WindowState."
Rob Carr [Mon, 7 Dec 2015 21:11:35 +0000 (21:11 +0000)]
Merge "Move surface save state tracking to WindowState."

8 years agoMerge "Fix incorrect style parent"
Adam Lesinski [Mon, 7 Dec 2015 20:58:11 +0000 (20:58 +0000)]
Merge "Fix incorrect style parent"

8 years agoMerge "Add subtypeId for SpellCheckerSubtype."
Yohei Yukawa [Mon, 7 Dec 2015 20:58:02 +0000 (20:58 +0000)]
Merge "Add subtypeId for SpellCheckerSubtype."

8 years agoMerge "Merged op dispatch in OpReorderer"
Chris Craik [Mon, 7 Dec 2015 20:37:31 +0000 (20:37 +0000)]
Merge "Merged op dispatch in OpReorderer"

8 years agoMerged op dispatch in OpReorderer
Chris Craik [Thu, 3 Dec 2015 20:16:56 +0000 (12:16 -0800)]
Merged op dispatch in OpReorderer

bug:22480459

Also switches std::functions to function pointers on OpReorderer, and
switches AssetAtlas' entry getter methods to using pixelRef pointers,
so it's clear they're the keys.

Change-Id: I3040ce5ff4e178a8364e0fd7ab0876ada7d4de05

8 years agoFix incorrect style parent
Adam Lesinski [Mon, 7 Dec 2015 19:56:11 +0000 (11:56 -0800)]
Fix incorrect style parent

AAPT wrongly allowed a style parent to be an attribute. This will not
do any runtime dynamic parent resolving and will result in an incorrect style.

Bug:26061260
Change-Id: Id5d43e5786a64ff939b69a2d84e53733db6baf29

8 years agoMove surface save state tracking to WindowState.
Robert Carr [Thu, 3 Dec 2015 02:39:45 +0000 (18:39 -0800)]
Move surface save state tracking to WindowState.

In the current set up, surface saving is managed by the app window
token. So when destroySavedSurfaces is called, all saved surfaces
assosciated with a given app will be destroyed. This causes pretty weird
behavior where hiding child windows can destroy the parent window. We
move this tracking to WindowState and allow child windows to exempt themselves.

Bug: 25780116
Change-Id: I3ab92221d83297092dfd98a71e6a5fe96381de8b

8 years agoMerge "Added SynchronousUserSwitchObserver"
Fyodor Kupolov [Mon, 7 Dec 2015 18:55:09 +0000 (18:55 +0000)]
Merge "Added SynchronousUserSwitchObserver"

8 years agoMerge "Allow --user current in dpm command"
Fyodor Kupolov [Mon, 7 Dec 2015 18:38:04 +0000 (18:38 +0000)]
Merge "Allow --user current in dpm command"

8 years agoMerge "Changed ActivityManager.requestBugreport() to take a 'progress' parameter."
Felipe Leme [Mon, 7 Dec 2015 18:02:40 +0000 (18:02 +0000)]
Merge "Changed ActivityManager.requestBugreport() to take a 'progress' parameter."

8 years agoDo not force keyguard orientation to no sensor.
Xiaohui Chen [Mon, 7 Dec 2015 17:42:48 +0000 (09:42 -0800)]
Do not force keyguard orientation to no sensor.

Fixing a bug that if the device is hold in landscape mode during
initial device setup, after the setup is done, the screen would rotate
to portrait mode and then back to landscape.

Bug: 25817950
Change-Id: Ibbcb7be01d8f14d7b6a98f069cb7eb3a94da12bb

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 7 Dec 2015 17:40:19 +0000 (17:40 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoRefactoring: merge two snippets of adding activity to stopped.
Filip Gruszczynski [Fri, 4 Dec 2015 22:52:25 +0000 (14:52 -0800)]
Refactoring: merge two snippets of adding activity to stopped.

Change-Id: I70777333ca9ff6c4f0736e036bd0946add4b041f

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 7 Dec 2015 17:14:13 +0000 (18:14 +0100)]
Import translations. DO NOT MERGE

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

8 years agoAPIs for activity to know when its windowing/pip modes change
Wale Ogunwale [Fri, 4 Dec 2015 23:35:38 +0000 (15:35 -0800)]
APIs for activity to know when its windowing/pip modes change

Added APIs that allow activities to ask the system if they are currently
in multi-window or picture-in-picture mode and also get notified when
their modes change.

Bug: 25509834
Bug: 25683717
Change-Id: I4b8c316a49940bd6a8b31a93b345f9fd725a4721

8 years agoMerge "Add ephemeral installs"
Todd Kennedy [Mon, 7 Dec 2015 15:33:05 +0000 (15:33 +0000)]
Merge "Add ephemeral installs"

8 years agoMerge "Send pwchange broadcast to caller only in FBE case"
Robin Lee [Mon, 7 Dec 2015 14:37:50 +0000 (14:37 +0000)]
Merge "Send pwchange broadcast to caller only in FBE case"

8 years agoMerge "Fix possibility of ScrollView not allowing clicks after a fling"
Chris Banes [Mon, 7 Dec 2015 13:54:34 +0000 (13:54 +0000)]
Merge "Fix possibility of ScrollView not allowing clicks after a fling"

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 7 Dec 2015 13:50:36 +0000 (13:50 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 7 Dec 2015 13:49:49 +0000 (05:49 -0800)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 7 Dec 2015 13:40:53 +0000 (13:40 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoSend pwchange broadcast to caller only in FBE case
Robin Lee [Thu, 19 Nov 2015 20:05:50 +0000 (20:05 +0000)]
Send pwchange broadcast to caller only in FBE case

When per-user encryption is set up and we change the password of a
profile, the parent and other profiles shouldn't receive an
ACTION_PASSWORD_CHANGED as they have their own distinct passwords.

Change-Id: I70d4ec81277a9bdc3ac6cd952b84cd769a2800b4

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 7 Dec 2015 13:39:02 +0000 (05:39 -0800)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 7 Dec 2015 13:17:15 +0000 (05:17 -0800)]
Import translations. DO NOT MERGE

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

8 years agoFix possibility of ScrollView not allowing clicks after a fling
Chris Banes [Mon, 7 Dec 2015 11:53:26 +0000 (11:53 +0000)]
Fix possibility of ScrollView not allowing clicks after a fling

The reason that manifests is because SV's
onInterceptTouchEvent checks if it's scroller.isFinished()
returns true. The result of Scroller.isFinished() is only
valid if it has had computeScrollOffset() called on it before.

ScrollView currently posts a invalidation after a computeScroll()
call, which means that isFinished() *should* be valid, but it's
better to be explicit which CL adds.

BUG: 26051101
Change-Id: If78f48dc855de1776011cb7b0f95cb0a80d9b777

8 years agoMerge "Wire support for archives to DocumentsUI."
Tomasz Mikolajewski [Mon, 7 Dec 2015 03:50:02 +0000 (03:50 +0000)]
Merge "Wire support for archives to DocumentsUI."

8 years agoWire support for archives to DocumentsUI.
Tomasz Mikolajewski [Wed, 25 Nov 2015 04:01:18 +0000 (13:01 +0900)]
Wire support for archives to DocumentsUI.

Bug: 20176812
Change-Id: I8220afa2f53b07aa842bf6ac24fcc62afd4e2617

8 years agoMerge "Update client configuration when resizing without crossing size threshold."
Filip Gruszczynski [Mon, 7 Dec 2015 02:17:47 +0000 (02:17 +0000)]
Merge "Update client configuration when resizing without crossing size threshold."

8 years agoMerge "Don't lose stopping state when getting paused confirmation."
Filip Gruszczynski [Mon, 7 Dec 2015 01:11:01 +0000 (01:11 +0000)]
Merge "Don't lose stopping state when getting paused confirmation."

8 years agoChanged ActivityManager.requestBugreport() to take a 'progress' parameter.
Felipe Leme [Sat, 5 Dec 2015 00:37:28 +0000 (16:37 -0800)]
Changed ActivityManager.requestBugreport() to take a 'progress' parameter.

When progress is set to 'true', it calls the new, enhanced
'bugreportplus' service, while when 'false' it calls the regular
'bugreport' service.

'bugreportplus' is more user-friendly (it shows a system notification
with the progress, allow user to cancel, etc...), at the cost of
consuming more resources. As such, the "Take Bug Report" UI will be
changed to offer the user a combo with these 2 options, but for now it's
always going to be 'bugreportplus'

BUG: 26034608
Change-Id: I21a6b5b092a85614e91d523b8f4df1fb00e49b3b

8 years agoMerge commit 'da131290ae5e476691e05e5eb4ac6d507012a0ac' into tgunn-mncvtdev-to-master...
Tyler Gunn [Sat, 5 Dec 2015 05:05:15 +0000 (21:05 -0800)]
Merge commit 'da131290ae5e476691e05e5eb4ac6d507012a0ac' into tgunn-mncvtdev-to-master-2015-12-04

8 years agoMerge commit '9aadad47a0085c4298307781a423064207933f0b' into tgunn-mncvtdev-to-master...
Tyler Gunn [Sat, 5 Dec 2015 05:04:50 +0000 (21:04 -0800)]
Merge commit '9aadad47a0085c4298307781a423064207933f0b' into tgunn-mncvtdev-to-master-2015-12-04

8 years agoMerge commit '70da83381f77e0ee9ada47eafaae395038ff77ad' into tgunn-mncvtdev-to-master...
Tyler Gunn [Sat, 5 Dec 2015 05:04:44 +0000 (21:04 -0800)]
Merge commit '70da83381f77e0ee9ada47eafaae395038ff77ad' into tgunn-mncvtdev-to-master-2015-12-04

8 years agoMerge commit 'bc4da97ce0fcd0ddef228048bc663e383776c323' into tgunn-mncvtdev-to-master...
Tyler Gunn [Sat, 5 Dec 2015 05:04:20 +0000 (21:04 -0800)]
Merge commit 'bc4da97ce0fcd0ddef228048bc663e383776c323' into tgunn-mncvtdev-to-master-2015-12-04

8 years agoMerge commit '5e42c1cf1c7786a550df351622865ba1710a0ea6' into tgunn-mncvtdev-to-master...
Tyler Gunn [Sat, 5 Dec 2015 05:04:14 +0000 (21:04 -0800)]
Merge commit '5e42c1cf1c7786a550df351622865ba1710a0ea6' into tgunn-mncvtdev-to-master-2015-12-04

8 years agoMerge commit 'd40a83543a67a911b5dcfbb8d164cea0c5285a78' into tgunn-mncvtdev-to-master...
Tyler Gunn [Sat, 5 Dec 2015 05:04:03 +0000 (21:04 -0800)]
Merge commit 'd40a83543a67a911b5dcfbb8d164cea0c5285a78' into tgunn-mncvtdev-to-master-2015-12-04

8 years agoMerge commit '3132d0c9f894707043c07622fae7b33c85ea0013' into tgunn-mncvtdev-to-master...
Tyler Gunn [Sat, 5 Dec 2015 05:03:57 +0000 (21:03 -0800)]
Merge commit '3132d0c9f894707043c07622fae7b33c85ea0013' into tgunn-mncvtdev-to-master-2015-12-04

8 years agoMerge commit '73831680cd7e47df103cf60a2230ed411e5d3b93' into tgunn-mncvtdev-to-master...
Tyler Gunn [Sat, 5 Dec 2015 05:03:46 +0000 (21:03 -0800)]
Merge commit '73831680cd7e47df103cf60a2230ed411e5d3b93' into tgunn-mncvtdev-to-master-2015-12-04

8 years agoMerge commit 'c956f0dcb3d93dd0f3ee0a3daafaf2da8212402e' into tgunn-mncvtdev-to-master...
Tyler Gunn [Sat, 5 Dec 2015 05:03:41 +0000 (21:03 -0800)]
Merge commit 'c956f0dcb3d93dd0f3ee0a3daafaf2da8212402e' into tgunn-mncvtdev-to-master-2015-12-04

8 years agoMerge commit '024557b2afdbe2e946d2cc557cb71492d87b0f62' into tgunn-mncvtdev-to-master...
Tyler Gunn [Sat, 5 Dec 2015 05:03:30 +0000 (21:03 -0800)]
Merge commit '024557b2afdbe2e946d2cc557cb71492d87b0f62' into tgunn-mncvtdev-to-master-2015-12-04

Change-Id: I156930f72a3267b59123469231331e9da5ac6aab

8 years agoMerge commit '98bd72181e176cdc5536b9709127a71cca082bbf' into tgunn-mncvtdev-to-master...
Tyler Gunn [Sat, 5 Dec 2015 05:00:51 +0000 (21:00 -0800)]
Merge commit '98bd72181e176cdc5536b9709127a71cca082bbf' into tgunn-mncvtdev-to-master-2015-12-04

8 years agoMerge commit '109e9c449d5a0070df793c63383e474a03242ba5' into tgunn-mncvtdev-to-master...
Tyler Gunn [Sat, 5 Dec 2015 05:00:24 +0000 (21:00 -0800)]
Merge commit '109e9c449d5a0070df793c63383e474a03242ba5' into tgunn-mncvtdev-to-master-2015-12-04

8 years agoMerge commit 'f231ca1c67f3925d018265f99f5b8a691d190d68' into tgunn-mncvtdev-to-master...
Tyler Gunn [Sat, 5 Dec 2015 05:00:18 +0000 (21:00 -0800)]
Merge commit 'f231ca1c67f3925d018265f99f5b8a691d190d68' into tgunn-mncvtdev-to-master-2015-12-04

8 years agoMerge commit '6cb5fcaad143227002bd4d00b1974e126d9a8090' into tgunn-mncvtdev-to-master...
Tyler Gunn [Sat, 5 Dec 2015 05:00:00 +0000 (21:00 -0800)]
Merge commit '6cb5fcaad143227002bd4d00b1974e126d9a8090' into tgunn-mncvtdev-to-master-2015-12-04

8 years agoMerge commit 'b19c0041914019e6d9d96fce67ec0e7a6820bf3c' into tgunn-mncvtdev-to-master...
Tyler Gunn [Sat, 5 Dec 2015 04:59:54 +0000 (20:59 -0800)]
Merge commit 'b19c0041914019e6d9d96fce67ec0e7a6820bf3c' into tgunn-mncvtdev-to-master-2015-12-04

8 years agoAdd android.support.v7.recyclerview resources.
Ying Wang [Sat, 5 Dec 2015 02:35:54 +0000 (18:35 -0800)]
Add android.support.v7.recyclerview resources.

This fixes build error of unresolved symbols if you build with Jack
disabled.

Change-Id: I0a9e1288015cc8894b7cdda3130aa8df628092e9

8 years agoMerge "Track rename from base/ to android-base/." am: 9f6a2ae67c am: 8aa8fe2c64
Elliott Hughes [Sat, 5 Dec 2015 01:51:41 +0000 (17:51 -0800)]
Merge "Track rename from base/ to android-base/." am: 9f6a2ae67c am: 8aa8fe2c64
am: 7e7047ea0a

* commit '7e7047ea0aba2099408fba70937a758a91cebbca':
  Track rename from base/ to android-base/.

8 years agoMerge "Track rename from base/ to android-base/." am: 9f6a2ae67c
Elliott Hughes [Sat, 5 Dec 2015 01:44:41 +0000 (01:44 +0000)]
Merge "Track rename from base/ to android-base/." am: 9f6a2ae67c
am: 8aa8fe2c64

* commit '8aa8fe2c64cf4611ba68d90992e54858a35aae58':
  Track rename from base/ to android-base/.

8 years agoMerge "Track rename from base/ to android-base/."
Elliott Hughes [Sat, 5 Dec 2015 01:36:53 +0000 (01:36 +0000)]
Merge "Track rename from base/ to android-base/."
am: 9f6a2ae67c

* commit '9f6a2ae67c70085d550962829e6bfe76706907d8':
  Track rename from base/ to android-base/.

8 years agoDon't lose stopping state when getting paused confirmation.
Filip Gruszczynski [Fri, 4 Dec 2015 23:45:35 +0000 (15:45 -0800)]
Don't lose stopping state when getting paused confirmation.

In some cases we request pause and soon after request stop of an
activity. An example of this is maximizing an activity in side by side
mode when recents are visible. First, we add recents to a list of
activities to be stopped (because it becomes invisible), then we request
a pause (because we resume full screen activity and pause all other
stacks) and finally request a stop (from the list to which we added the
request).

The activity now will be put into pausing state (requesting pause), then
stopping (requesting stop), then paused (confirmation comes from the
activity) and stopped (another confirmation comes from activity). If we
switch from stopping to paused, the stop confirmation will become
confused.

Bug: 25729693

Change-Id: I935acd71a28f3d0882f608bdd4d7216cd08ba2eb

8 years agoMerge "Track rename from base/ to android-base/."
Elliott Hughes [Sat, 5 Dec 2015 01:30:46 +0000 (01:30 +0000)]
Merge "Track rename from base/ to android-base/."

8 years agoUpdate client configuration when resizing without crossing size threshold.
Filip Gruszczynski [Fri, 4 Dec 2015 20:43:36 +0000 (12:43 -0800)]
Update client configuration when resizing without crossing size threshold.

Even though the activity won't be relaunched and won't receive a
callback about the resize, we still need to update it's configuration.
Otherwise when the application queries for it, it will receive wrong
data.

Bug: 23904868
Change-Id: I601e91b8e71691c1cb5edb2734894441c4fde8e2

8 years agoMerge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 am...
Eino-Ville Talvala [Sat, 5 Dec 2015 00:45:33 +0000 (00:45 +0000)]
Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 am: 7417f70ac6 am: e2d516fd4b am: 5794dbb1a5
am: dd00ed1554

* commit 'dd00ed1554113d52c8b07ee36d5b0b912d74a268':
  Camera: codegen doc update

8 years agoMerge "Added 46654* to fee-free US short codes."
Yorick Henning [Sat, 5 Dec 2015 00:37:41 +0000 (00:37 +0000)]
Merge "Added 46654* to fee-free US short codes."

8 years agoMerge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 am...
Eino-Ville Talvala [Sat, 5 Dec 2015 00:36:06 +0000 (16:36 -0800)]
Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 am: 7417f70ac6 am: e2d516fd4b
am: 5794dbb1a5

* commit '5794dbb1a5f54b116911526c1086efda5dfb63f7':
  Camera: codegen doc update

8 years agoMerge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 am...
Eino-Ville Talvala [Sat, 5 Dec 2015 00:28:38 +0000 (00:28 +0000)]
Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 am: 7417f70ac6
am: e2d516fd4b

* commit 'e2d516fd4b77352919d1c40971678909e3f4a15d':
  Camera: codegen doc update

8 years agoAdded 46654* to fee-free US short codes.
Yorick Henning [Sat, 5 Dec 2015 00:27:04 +0000 (16:27 -0800)]
Added 46654* to fee-free US short codes.

This change excludes the Google Wallet dedicated short code (being used
    by the Google Wallet team to send notifications to users) from
premium phone numbers. Users may answer the text message free of charge
(e.g. answering HELP). Google internal reference b/25675421.

Change-Id: Ic022ccc19151224b53c8a35c9568e9b943d8220d

8 years agoMerge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41
Eino-Ville Talvala [Sat, 5 Dec 2015 00:20:47 +0000 (16:20 -0800)]
Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41
am: 7417f70ac6

* commit '7417f70ac6aa6a59ab67bac959ce39aa3372e0ef':
  Camera: codegen doc update

8 years agoAdd subtypeId for SpellCheckerSubtype.
Yohei Yukawa [Sat, 5 Dec 2015 00:16:47 +0000 (16:16 -0800)]
Add subtypeId for SpellCheckerSubtype.

What this CL actually does is just copying the existing concept
"subtypeId" from InputMethodSubtype to SpellCheckerSubtype.

To recap, the underlying problem is that the system has stored only the
return value of SpellCheckerSubtype#hashCode() to track the set of
enabled subtypes, and SpellCheckerSubtype#hashCode() has been
implemented as Arrays.hashCode(new Object[] {locale, extraValue}), which
is problematic because:
  - Spell checker developers cannot change "locale" and/or 'extraValue'
    if they want to keep enabled subtypes enabled.
  - Android Framework developers cannot change the hash function even
    when new fields are added if they want to keep enabled subtypes
    enabled.
InputMethodSubtype has had the same issue, and what we did was
introducing a concept "subtypeId", which allows IME developers to
specify the return value of #hashCode().

For instance, suppose that a subtype X has already been used in
production with the following attributes:
  - locale: "tl_PH"
  - extraValues: "key1=value1,key2=value2"

With "subtypeId", you can change the attributes of subtype X without
losing the enabled state of subtype X on devices as follows.
  - locale: "fil_PH"
  - extraValues: "key1=value1,key2=value2,key3=value3"
  - subtypeId: Arrays.hashCode(new Object[] {
            "tl_PH", "key1=value1,key2=value2"})

This CL also deprecates existing public constructor of
SpellCheckerSubtype, which was probably published as a public API by
mistake.  Note that the constructor of SpellCheckerInfo class is @hide.
Also there is no public API that receives SpellCheckerSubtype object
instantiated by developers with custom data.  Making developers to be
able to instantiate SpellCheckerSubtype does not make sense right now.

Bug: 11736916
Bug: 22858221
Change-Id: I98f05c1e9421c47a93769bc4a6fe11b678bc2509

8 years agoMerge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d
Eino-Ville Talvala [Sat, 5 Dec 2015 00:11:43 +0000 (00:11 +0000)]
Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d
am: add4b91d41

* commit 'add4b91d41d3ba810b6b25c14d7c13050394f201':
  Camera: codegen doc update

8 years agoMerge "Camera: codegen doc update" into mnc-dev
Eino-Ville Talvala [Sat, 5 Dec 2015 00:03:23 +0000 (16:03 -0800)]
Merge "Camera: codegen doc update" into mnc-dev
am: 69c5e7143d

* commit '69c5e7143dd308e8db9b6055b428b7ad3964c1ff':
  Camera: codegen doc update

8 years agoMerge "Camera: codegen doc update" into mnc-dev
Eino-Ville Talvala [Fri, 4 Dec 2015 23:54:05 +0000 (23:54 +0000)]
Merge "Camera: codegen doc update" into mnc-dev

8 years agoMerge "AccountManager: add finishSession(...) API."
Sandra Kwan [Fri, 4 Dec 2015 23:35:20 +0000 (23:35 +0000)]
Merge "AccountManager: add finishSession(...) API."

8 years agoTrack rename from base/ to android-base/.
Elliott Hughes [Fri, 4 Dec 2015 23:33:35 +0000 (15:33 -0800)]
Track rename from base/ to android-base/.

Change-Id: I31be831de812052d1c0d4c0781178d0756124bcf

8 years agoAccountManager: add finishSession(...) API.
Sandra Kwan [Tue, 10 Nov 2015 22:13:29 +0000 (14:13 -0800)]
AccountManager: add finishSession(...) API.

Adding finishSession API to AccountManager and
AbstractAccountAuthenticator.

Change-Id: I153dd2bb6fe01d2e4b10b41e8b553f59da26bd29

8 years agoFix build by making docs match params.
Robert Carr [Fri, 4 Dec 2015 23:18:40 +0000 (15:18 -0800)]
Fix build by making docs match params.

Change-Id: Id5bb5161514be372b709ecbb5d56e86554d3ec64

8 years agoFix app over lockscreen being cropped by docked stack
Chong Zhang [Fri, 4 Dec 2015 22:16:36 +0000 (14:16 -0800)]
Fix app over lockscreen being cropped by docked stack

When secure apps are launched over lockscreen, the bounds should always
be fullscreen. Also docked stack and divider shouldn't be visible while
lockscreen is shown.

bug: 25837786
Change-Id: I0bc681cdb46404fb79e9332d1f82fee51f338da9

8 years agoMerge changes I0af0f520,I51be014c
Yohei Yukawa [Fri, 4 Dec 2015 22:49:49 +0000 (22:49 +0000)]
Merge changes I0af0f520,I51be014c

* changes:
  Rewrite a fake language code "tl" in SpellChecker.
  retry: Add @hide SpellCheckerSubtype#getLocaleObject().

8 years agoMerge "Add tagging variants for DatagramSocket."
Jeff Sharkey [Fri, 4 Dec 2015 22:44:40 +0000 (22:44 +0000)]
Merge "Add tagging variants for DatagramSocket."

8 years agoRewrite a fake language code "tl" in SpellChecker.
Yohei Yukawa [Fri, 4 Dec 2015 22:43:17 +0000 (14:43 -0800)]
Rewrite a fake language code "tl" in SpellChecker.

With following CLs, we already have a special rewrite rule of "tl" to
"fil" for IMEs that are targeting older versions of Android earlier than
Lollipop that did not support three letter language codes and used
"tl" (Tagalog) as the language string for "fil" (Filipino).
  - 92280cd309b0f5967dd253280962d8581844db89 [1]
  - ed65bc0c62ca99a118057db7ad54c4ccc14d52d0 [2]

  [1]: I94f203bddceb9c87710cb187cc3cc0ee6d9092a5
  [2]: Ica9cd2baac002c406f92331aadd7725d7424046a

With this CL, we have the same rewrite rule for spell checker services.

Bug: 20696126
Change-Id: I0af0f520a15337e33973391c9965364e3ae1ee4c

8 years agoretry: Add @hide SpellCheckerSubtype#getLocaleObject().
Yohei Yukawa [Fri, 4 Dec 2015 22:43:01 +0000 (14:43 -0800)]
retry: Add @hide SpellCheckerSubtype#getLocaleObject().

This is the 2nd try of I39dc0c310158ad23ba6c987efce07deaf30ce693.

This is a mechanical refactoring with no behavior change.

With this CL, InputMethodSubtype and SpellCheckerSubtype have the same
getLocaleObject() hidden API, which makes it easy to share the logic in
subsequent CLs.

No behavior change is intended.

Bug: 11736916
Bug: 20696126
Bug: 22858221
Change-Id: I51be014c752b736a808e2b0d56e664941a218a2f

8 years agoAdd tagging variants for DatagramSocket.
Jeff Sharkey [Fri, 4 Dec 2015 22:21:52 +0000 (15:21 -0700)]
Add tagging variants for DatagramSocket.

Oops, we missed these along the way.

Bug: 25799174
Change-Id: I4ad368f9faee4b1996d605534dce4c2b23dbe200

8 years agoMerge "Revert "Add @hide SpellCheckerSubtype#getLocaleObject().""
Yohei Yukawa [Fri, 4 Dec 2015 22:30:45 +0000 (22:30 +0000)]
Merge "Revert "Add @hide SpellCheckerSubtype#getLocaleObject().""

8 years agoMerge "Fix broken copy after recent copy related chagnes."
Steve McKay [Fri, 4 Dec 2015 22:29:43 +0000 (22:29 +0000)]
Merge "Fix broken copy after recent copy related chagnes."

8 years agoAllow --user current in dpm command
Fyodor Kupolov [Fri, 4 Dec 2015 18:58:37 +0000 (10:58 -0800)]
Allow --user current in dpm command

dpm command now accepts current user as an argument.

Bug: 25974105
Change-Id: I5335a2fc2159f9574e319697dcf5e0485233d8f2

8 years agoRevert "Add @hide SpellCheckerSubtype#getLocaleObject()."
Yohei Yukawa [Fri, 4 Dec 2015 22:24:15 +0000 (22:24 +0000)]
Revert "Add @hide SpellCheckerSubtype#getLocaleObject()."

This reverts commit e3c761c87efdee7c28461559015fa76602d4605a.

Previous CL unintentionaly contained behavior change.

Change-Id: I1e350f224df815e991d9f42ac4145ecfc5c1c8b0

8 years agoMerge "Added default config to enable adding users from lockscreen"
Suprabh Shukla [Fri, 4 Dec 2015 22:26:20 +0000 (22:26 +0000)]
Merge "Added default config to enable adding users from lockscreen"

8 years agoFix broken copy after recent copy related chagnes.
Steve McKay [Fri, 4 Dec 2015 19:19:09 +0000 (11:19 -0800)]
Fix broken copy after recent copy related chagnes.

Also, add a label to Downloads app, and enabled drag and drop by default.
Cleanued up menu handling in BaseActivity (use switch statement).

Bug: 26033335
Change-Id: I3cef89a4a9f9e30b4e926411e94cf06bc2dc0f8d

8 years agoMerge "Add @hide SpellCheckerSubtype#getLocaleObject()."
Yohei Yukawa [Fri, 4 Dec 2015 22:17:32 +0000 (22:17 +0000)]
Merge "Add @hide SpellCheckerSubtype#getLocaleObject()."

8 years agoMerge "Refactoring: pulled ServiceHandler methods to its parent class."
Felipe Leme [Fri, 4 Dec 2015 22:14:05 +0000 (22:14 +0000)]
Merge "Refactoring: pulled ServiceHandler methods to its parent class."

8 years agoMerge "Add SpellCheckerSubtypeTest."
Yohei Yukawa [Fri, 4 Dec 2015 22:12:36 +0000 (22:12 +0000)]
Merge "Add SpellCheckerSubtypeTest."

8 years agoMerge "Changed workflow so max progress can be dynamically updated."
Felipe Leme [Fri, 4 Dec 2015 22:12:20 +0000 (22:12 +0000)]
Merge "Changed workflow so max progress can be dynamically updated."

8 years agoAdd @hide SpellCheckerSubtype#getLocaleObject().
Yohei Yukawa [Fri, 4 Dec 2015 02:12:40 +0000 (18:12 -0800)]
Add @hide SpellCheckerSubtype#getLocaleObject().

This is a mechanical refactoring with no behavior change.

With this CL, InputMethodSubtype and SpellCheckerSubtype have the same
getLocaleObject() hidden API, which makes it easy to share the logic in
subsequent CLs.

Bug: 11736916
Bug: 20696126
Bug: 22858221
Change-Id: I39dc0c310158ad23ba6c987efce07deaf30ce693

8 years agoRefactoring: pulled ServiceHandler methods to its parent class.
Felipe Leme [Fri, 4 Dec 2015 20:15:30 +0000 (12:15 -0800)]
Refactoring: pulled ServiceHandler methods to its parent class.

Now ServiceHandler only have 2 methods:

- handleMessage(): part of its interface.
- poll(): delegates work to parent, but sends a delayed message
  so it keeps polling.

Also changed hardcoded "N/A" to a resource.

BUG: 25794470
Change-Id: I486fff46c1532685bfd6f5903349d14e55059219

8 years agoMerge "Improved phrasing for "in progress" message."
Felipe Leme [Fri, 4 Dec 2015 21:48:14 +0000 (21:48 +0000)]
Merge "Improved phrasing for "in progress" message."

8 years agoMerge "Add package command to print resolve activity."
Dianne Hackborn [Fri, 4 Dec 2015 21:28:59 +0000 (21:28 +0000)]
Merge "Add package command to print resolve activity."

8 years agoMerge "Restore exception behavior of getLocationInWindow."
Rob Carr [Fri, 4 Dec 2015 21:08:54 +0000 (21:08 +0000)]
Merge "Restore exception behavior of getLocationInWindow."

8 years agoAdd SpellCheckerSubtypeTest.
Yohei Yukawa [Fri, 4 Dec 2015 01:49:07 +0000 (17:49 -0800)]
Add SpellCheckerSubtypeTest.

Before introducing behavior changes, this CL adds
SpellCheckerSubtypeTest to make the current behavior clear.

Bug: 11736916
Bug: 20696126
Bug: 22858221
Change-Id: Ied18580f31497156510e1b785adfc248683ba94d

8 years agoMerge "Put PIP windows above transition animations."
Filip Gruszczynski [Fri, 4 Dec 2015 20:50:23 +0000 (20:50 +0000)]
Merge "Put PIP windows above transition animations."

8 years agoPut PIP windows above transition animations.
Filip Gruszczynski [Fri, 4 Dec 2015 17:05:00 +0000 (09:05 -0800)]
Put PIP windows above transition animations.

PIP activities are already on top of everything else, but during
animation we increase the layer of the animated window for the duration
of the animation and it may cover the PIP. By forcing the same
adjustment on PIP windows we will keep them above animating windows.

Bug: 26015827
Change-Id: I8f7a87f41fed24b3e520fb599a94cf24cc2eeb50

8 years agoRestore exception behavior of getLocationInWindow.
Robert Carr [Fri, 4 Dec 2015 20:48:55 +0000 (12:48 -0800)]
Restore exception behavior of getLocationInWindow.

Restore exception throwing behavior on invalid arguments
for getLocationInWindow. This is tested by CTS.
Tweak some variable names to make the exception string readable.

Change-Id: I069d63b354d90ce74d156362b223765a5c2da2f0

8 years agoMerge "Topics can now have an Importance."
Julia Reynolds [Fri, 4 Dec 2015 20:37:28 +0000 (20:37 +0000)]
Merge "Topics can now have an Importance."

8 years agoTopics can now have an Importance.
Julia Reynolds [Fri, 20 Nov 2015 20:38:20 +0000 (15:38 -0500)]
Topics can now have an Importance.

Bug: 22451710
Change-Id: I627121da6c4b85492715a8e8a099656dca52b734

8 years agoMerge "Followup changes to ag/810782."
Steve McKay [Fri, 4 Dec 2015 20:14:34 +0000 (20:14 +0000)]
Merge "Followup changes to ag/810782."

8 years agoFollowup changes to ag/810782.
Steve McKay [Fri, 4 Dec 2015 20:12:48 +0000 (12:12 -0800)]
Followup changes to ag/810782.

Note, one of the requested changes already happened.

Change-Id: I253cbc2b3b7f2091ca80f43c90e951263fc50ad2

8 years agoMerge "Remove some sized based resource (match support lib removal)."
Filip Gruszczynski [Fri, 4 Dec 2015 20:09:31 +0000 (20:09 +0000)]
Merge "Remove some sized based resource (match support lib removal)."

8 years agoMerge "Reset mPointerIconShape properly on window manager."
Jun Mukai [Fri, 4 Dec 2015 20:08:02 +0000 (20:08 +0000)]
Merge "Reset mPointerIconShape properly on window manager."