OSDN Git Service

android-x86/frameworks-base.git
8 years agoColor transforms for the tuner
Jason Monk [Tue, 8 Dec 2015 02:45:47 +0000 (21:45 -0500)]
Color transforms for the tuner

Change-Id: I615be65e2b020acd5520f93c04f426c4006221c5

8 years agoMerge "Track libcore commit 85d69e16fe1e59e50c1ad228e754abf325088362."
Narayan Kamath [Mon, 21 Dec 2015 10:59:20 +0000 (10:59 +0000)]
Merge "Track libcore commit 85d69e16fe1e59e50c1ad228e754abf325088362."

8 years agoMerge "Pass app\'s code paths to the runtime" am: db73912471
Calin Juravle [Mon, 21 Dec 2015 09:57:12 +0000 (01:57 -0800)]
Merge "Pass app\'s code paths to the runtime" am: db73912471
am: 7d7ab7ad3b

* commit '7d7ab7ad3b096d28b274024705b3171e42bebdcd':
  Pass app's code paths to the runtime

8 years agoMerge "Pass app\'s code paths to the runtime"
Calin Juravle [Mon, 21 Dec 2015 09:52:40 +0000 (09:52 +0000)]
Merge "Pass app\'s code paths to the runtime"
am: db73912471

* commit 'db73912471df39aa527971f2884f37295616d3a9':
  Pass app's code paths to the runtime

8 years agoMerge "Pass app's code paths to the runtime"
Calin Juravle [Mon, 21 Dec 2015 09:43:34 +0000 (09:43 +0000)]
Merge "Pass app's code paths to the runtime"

8 years agoMerge "Add support for archives to ExternalStorageProvider."
Tomasz Mikolajewski [Mon, 21 Dec 2015 06:03:39 +0000 (06:03 +0000)]
Merge "Add support for archives to ExternalStorageProvider."

8 years agoMerge "Fix compiler error on com_android_mtp_AppFuse.cpp."
Daichi Hirono [Mon, 21 Dec 2015 04:32:36 +0000 (04:32 +0000)]
Merge "Fix compiler error on com_android_mtp_AppFuse.cpp."

8 years agoFix compiler error on com_android_mtp_AppFuse.cpp.
Daichi Hirono [Mon, 21 Dec 2015 04:13:57 +0000 (13:13 +0900)]
Fix compiler error on com_android_mtp_AppFuse.cpp.

The CL adds explicit assigning for reply_size to prevent 'unused'
compiler error.

Change-Id: I307758debb23b5bf56ddf71d54813b8cd81d8f49

8 years agoMerge "Add AppFuse class and its JNI module."
Daichi Hirono [Mon, 21 Dec 2015 03:10:37 +0000 (03:10 +0000)]
Merge "Add AppFuse class and its JNI module."

8 years agoAdd AppFuse class and its JNI module.
Daichi Hirono [Mon, 14 Dec 2015 02:00:54 +0000 (11:00 +0900)]
Add AppFuse class and its JNI module.

BUG=25756145

Change-Id: I10597e3377cf860412e006a118cd979b6f108af3

8 years agoMerge "Add a class Javadoc for MediaBrowser.MediaItem"
Jae Seo [Mon, 21 Dec 2015 01:00:06 +0000 (01:00 +0000)]
Merge "Add a class Javadoc for MediaBrowser.MediaItem"

8 years agoAdd support for archives to ExternalStorageProvider.
Tomasz Mikolajewski [Wed, 25 Nov 2015 03:54:25 +0000 (12:54 +0900)]
Add support for archives to ExternalStorageProvider.

Bug: 20176812
Change-Id: If27cf7d6198d0abcd4458bfbfd27f870ad6d8f30

8 years agoMerge "Make JobSchedulerService encryption aware."
Jeff Sharkey [Sun, 20 Dec 2015 22:40:43 +0000 (22:40 +0000)]
Merge "Make JobSchedulerService encryption aware."

8 years agoMake JobSchedulerService encryption aware.
Jeff Sharkey [Sun, 20 Dec 2015 22:34:01 +0000 (15:34 -0700)]
Make JobSchedulerService encryption aware.

When a user is started, but a persisted job component doesn't appear
in the normal resolution list, we avoid enqueuing the job.  Later
when the user is unlocked, we take another pass over the pending
jobs to see if they became available.

Load keyboard layouts from XML metadata regardless of crypto status,
since we don't need to spin up any remote code.

Add MATCH_SYSTEM_ONLY to make system logic easier to write when
looking for trusted components.

Sprinkle more annotations on ArrayUtils methods.

Bug: 26279465
Change-Id: Iec28e0bb46862b07d740b12a79f6360de68dab0f

8 years agoTrack libcore commit 85d69e16fe1e59e50c1ad228e754abf325088362.
Narayan Kamath [Sun, 20 Dec 2015 20:17:40 +0000 (20:17 +0000)]
Track libcore commit 85d69e16fe1e59e50c1ad228e754abf325088362.

Unhide Pattern.UNICODE_CHARACTER_CLASS.

Change-Id: I5734a3bbe69c825b2563739c953bbf6d98627ab3

8 years agoFixed the maximum number of lines for the bigtext view
Selim Cinek [Fri, 18 Dec 2015 01:01:17 +0000 (17:01 -0800)]
Fixed the maximum number of lines for the bigtext view

Since the summary is now in the header, we can allow one
more line in bigtext. Also made it look nicer if the
bigtext was empty, in case we always want to use bigtext
by default.

Change-Id: I13679de084757ef174b3bf53e75837a4d95ddc99

8 years agoFixed that the expandButton was sometimes visible when it shouldnt
Selim Cinek [Fri, 18 Dec 2015 00:39:06 +0000 (16:39 -0800)]
Fixed that the expandButton was sometimes visible when it shouldnt

This happened when the collapsed height had the same height as the
expanded one.

Bug: 26185377
Change-Id: I9c37a8239cc87bf2192f48bc008700faf4afb5d9

8 years agoMade the layout consistent for the bigText style
Selim Cinek [Thu, 17 Dec 2015 23:36:53 +0000 (15:36 -0800)]
Made the layout consistent for the bigText style

When using BigText style with only 1 line the layout was inconsistent
leading to jumps in the layout.

Change-Id: I86234d4d4732183df738c387d2f9d5dd311b70f3

8 years agoMeasuring the notifications at wrap_content height now
Selim Cinek [Thu, 17 Dec 2015 03:02:19 +0000 (19:02 -0800)]
Measuring the notifications at wrap_content height now

The notifications are now measured at wrap_content such
that the layout still looks good even if the text
was ommited instead of arbitrarily making it bigger.
This also fixes some small rounding issues where the
expanded notification was just a pixel bigger than
the collapsed version.

Bug: 26185377
Change-Id: Ie3339ff75680ab512446605055304576e058f588

8 years agoFixed the minimum height of groups on the lockscreen
Selim Cinek [Thu, 17 Dec 2015 01:26:49 +0000 (17:26 -0800)]
Fixed the minimum height of groups on the lockscreen

Also caching the notification minheight in the algorithm
far less agressively, because it led to bugs.

Change-Id: I57155103bf2700be2e98e686fdd0077ce8e8405b

8 years agoReusing the notification algorithm now when rotating
Selim Cinek [Wed, 16 Dec 2015 01:01:44 +0000 (17:01 -0800)]
Reusing the notification algorithm now when rotating

The notification algorithm had some state which was simply
dropped on rotation and therefore weird things could happen.
This is now fixed.

Change-Id: Ibb3d007b3298f745743bd3a5889bccebebf8105a

8 years agoFixed the redacted layout for groups
Selim Cinek [Tue, 15 Dec 2015 19:45:36 +0000 (11:45 -0800)]
Fixed the redacted layout for groups

Also fixed a bug where the guts didn't have the
right size and in general cleaned up the intrinsic
height. The guts also animate nicely and the position
of their animation starts on the finger.

Change-Id: I62447dd77ace36161740dfdf3d18103524e2eb21

8 years agoFixed the public notifications views on the lockscreen
Selim Cinek [Tue, 15 Dec 2015 05:00:02 +0000 (21:00 -0800)]
Fixed the public notifications views on the lockscreen

The views were based on a legacy systemUI notification.
We are now creating it in Notification.java in order to
always have the latest visuals and avoiding duplicate work.

Change-Id: I3f544cad069a8eab34d4464404d020e06d7f6626

8 years agoFixed a measuring bug with the notification children container
Selim Cinek [Sat, 12 Dec 2015 01:28:12 +0000 (17:28 -0800)]
Fixed a measuring bug with the notification children container

The notification children didn't respect the given dimensions
when measuring and was simply measuring itself as high as desired.
This lead to a bug where the parent could crash when a layer was
set on it.
We are now measuring the container at most with the height of
the given size and let children draw over our view bounds.
In oder to still allow touch in those regions we also
override the touch rect.
This also simplifies the rest of the touch handling.

Bug: 26159274
Change-Id: I728553a6386455e6632e2511be8a3e7cb447e89b

8 years agoFixed a hole in the shade that could exist with heads up
Selim Cinek [Sat, 12 Dec 2015 01:02:17 +0000 (17:02 -0800)]
Fixed a hole in the shade that could exist with heads up

Change-Id: Ia7c36c717287e1c63218c105da83b41f0a40bc4b

8 years agoMerge "Better named encryption flags, start triaging."
Jeff Sharkey [Sat, 19 Dec 2015 22:04:48 +0000 (22:04 +0000)]
Merge "Better named encryption flags, start triaging."

8 years agoBetter named encryption flags, start triaging.
Jeff Sharkey [Fri, 18 Dec 2015 17:57:58 +0000 (10:57 -0700)]
Better named encryption flags, start triaging.

Create distinct flags for encryption aware, unaware, and both, and
name them like the other MATCH_ flags.

Start adding logic to help triage all system internal callers to
verify that they've done their homework and thought about how to
handle apps while locked.  Call sites in the system should either
ask for explicit matching behavior, or explicitly use the DEFAULT
match flag to indicate that they've been triaged to use the
default state-based matching.

Bug: 26250295
Change-Id: I86214e5c4f71a6dc72f06930800388713aecd107

8 years agoMerge "common_time_server.cpp: more O_CLOEXEC" am: 78d5f90d98
Nick Kralevich [Sat, 19 Dec 2015 07:13:21 +0000 (07:13 +0000)]
Merge "common_time_server.cpp: more O_CLOEXEC" am: 78d5f90d98
am: a87b9287a4

* commit 'a87b9287a4801ce39f30dbd84c3eac2f66c99992':
  common_time_server.cpp: more O_CLOEXEC

8 years agoMerge "common_time_server.cpp: more O_CLOEXEC"
Nick Kralevich [Sat, 19 Dec 2015 07:08:22 +0000 (07:08 +0000)]
Merge "common_time_server.cpp: more O_CLOEXEC"
am: 78d5f90d98

* commit '78d5f90d98365987937b680862c4d88f3beaa4a3':
  common_time_server.cpp: more O_CLOEXEC

8 years agoMerge "common_time_server.cpp: more O_CLOEXEC"
Nick Kralevich [Sat, 19 Dec 2015 06:58:58 +0000 (06:58 +0000)]
Merge "common_time_server.cpp: more O_CLOEXEC"

8 years agoAdd a class Javadoc for MediaBrowser.MediaItem
Jae Seo [Sat, 19 Dec 2015 05:38:48 +0000 (14:38 +0900)]
Add a class Javadoc for MediaBrowser.MediaItem

Also fixed a typo in MediaBrowserService.

Bug: 26181781, Bug: 26182458
Change-Id: I1f672f8111a70ad9c16e9969d0fad0e504fefb8a

8 years agocommon_time_server.cpp: more O_CLOEXEC
Nick Kralevich [Sat, 19 Dec 2015 04:47:02 +0000 (20:47 -0800)]
common_time_server.cpp: more O_CLOEXEC

Change-Id: I2185a462d72e11f5a015c525d2d37c52ecc3e430

8 years agoMerge "Point "unlocked" logic at lower level."
Jeff Sharkey [Sat, 19 Dec 2015 02:19:02 +0000 (02:19 +0000)]
Merge "Point "unlocked" logic at lower level."

8 years agoPoint "unlocked" logic at lower level.
Jeff Sharkey [Sat, 19 Dec 2015 00:18:09 +0000 (17:18 -0700)]
Point "unlocked" logic at lower level.

There is a race when starting a non-encryption-aware launcher before
we've gone through the user lifecycle to enter the "running unlocked"
state.  This can cause the launcher to choke when it's denied access
to widgets that are still considered locked.

For now, relax the notion of a user being unlocked to reflect the
on-disk state, instead of looking at the user lifecycle.

Also add logging of encryption commands.

Bug: 26267450
Change-Id: Ie330d07418cf10413e0b4380f6d6781684f01952

8 years agoMerge "Use shared namespace for bundled app classloader"
Dimitry Ivanov [Sat, 19 Dec 2015 00:49:08 +0000 (00:49 +0000)]
Merge "Use shared namespace for bundled app classloader"

8 years agoMerge "Introduce pointer capture API."
Jun Mukai [Fri, 18 Dec 2015 23:30:10 +0000 (23:30 +0000)]
Merge "Introduce pointer capture API."

8 years agoMerge "Temporarily disable forcing of drawing status bar background."
Filip Gruszczynski [Fri, 18 Dec 2015 23:29:58 +0000 (23:29 +0000)]
Merge "Temporarily disable forcing of drawing status bar background."

8 years agoTemporarily disable forcing of drawing status bar background.
Filip Gruszczynski [Fri, 18 Dec 2015 22:19:35 +0000 (14:19 -0800)]
Temporarily disable forcing of drawing status bar background.

Forcing status bar background drawing causes all windows to be
considered fullscreen. As a result alert dialog windows have incorrect
containing frames and aren't repositioned when IME appears.

Until a better solution is implemented for forcing drawing the status
bar, we disable it to have correct old behavior.

Bug: 26050571
Bug: 24365214
Change-Id: Ic27a394711a587fa152a238699cd19751e91a732

8 years agoMerge "Remove duplicate Bluetooth profiles." into cw-e-dev am: 9c27969385 am: d980b8c...
Bryce Lee [Fri, 18 Dec 2015 23:25:27 +0000 (23:25 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am: 9c27969385 am: d980b8c7a0 am: 1b695edc97
am: 76656c6b48

* commit '76656c6b48d3fa3e5538e864929ba63b692d5764':
  Remove duplicate Bluetooth profiles.

8 years agoMerge "Remove duplicate Bluetooth profiles." into cw-e-dev am: 9c27969385 am: d980b8c7a0
Bryce Lee [Fri, 18 Dec 2015 23:19:18 +0000 (23:19 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am: 9c27969385 am: d980b8c7a0
am: 1b695edc97

* commit '1b695edc97c227a64ef810daee7dc9f3b35206a7':
  Remove duplicate Bluetooth profiles.

8 years agoMerge "Remove duplicate Bluetooth profiles." into cw-e-dev am: 9c27969385
Bryce Lee [Fri, 18 Dec 2015 23:13:51 +0000 (23:13 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am: 9c27969385
am: d980b8c7a0

* commit 'd980b8c7a05a2dc51145c3465c14f1f106a8bc47':
  Remove duplicate Bluetooth profiles.

8 years agoMerge "Remove duplicate Bluetooth profiles." into cw-e-dev
Bryce Lee [Fri, 18 Dec 2015 23:07:49 +0000 (23:07 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev
am: 9c27969385

* commit '9c27969385d7a59a535ba3274c279ae96a155d49':
  Remove duplicate Bluetooth profiles.

8 years agoMerge "Implement bucketed sorting in DocumentsUI."
Ben Kwa [Fri, 18 Dec 2015 23:06:13 +0000 (23:06 +0000)]
Merge "Implement bucketed sorting in DocumentsUI."

8 years agoImplement bucketed sorting in DocumentsUI.
Ben Kwa [Thu, 17 Dec 2015 03:42:08 +0000 (19:42 -0800)]
Implement bucketed sorting in DocumentsUI.

Change the sort code in the Model to bucket items into two separate
categories (folders and documents) and then sort the two buckets
separately.

Add code to the adapter to insert a visual break in the UI, between
folders and documents.

Change-Id: I759fedcef829aba9ad61554326489a9e62641cc7

8 years agoMerge "Remove duplicate Bluetooth profiles." into cw-e-dev
Bryce Lee [Fri, 18 Dec 2015 23:02:40 +0000 (23:02 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev

8 years agoMerge "Fix problem where enter and space key do nothing on ListView."
George Mount [Fri, 18 Dec 2015 22:32:58 +0000 (22:32 +0000)]
Merge "Fix problem where enter and space key do nothing on ListView."

8 years agoMerge "Adding a locale picker with two-step selection: language, then region."
Mihai Niță [Fri, 18 Dec 2015 21:55:32 +0000 (21:55 +0000)]
Merge "Adding a locale picker with two-step selection: language, then region."

8 years agoMerge "Frameworks/base: Change android.util.Log multiline logging"
Andreas Gampe [Fri, 18 Dec 2015 21:27:18 +0000 (21:27 +0000)]
Merge "Frameworks/base: Change android.util.Log multiline logging"

8 years agoAdding a locale picker with two-step selection: language, then region.
Mihai Nita [Wed, 16 Dec 2015 00:06:20 +0000 (16:06 -0800)]
Adding a locale picker with two-step selection: language, then region.

This is intended to replace the UI part of the LocalePicker, at
least for the main "Settings" application (under "Language & Input")
and for the "Setup Wizard".

The UI part in the old LocalePicker can be removed once all the
components that use it are migrated to the new one.

Bug: 25800339
Change-Id: I2f264cdb7b7fc586124dd58fad2c68060d5b7aa8

8 years agoMerge "Differentiate between apps that use topics and those that don't."
Julia Reynolds [Fri, 18 Dec 2015 21:09:45 +0000 (21:09 +0000)]
Merge "Differentiate between apps that use topics and those that don't."

8 years agoMerge "Making ViewRootImpl drop input events when the Activity is in ambient mode...
Daniel Koulomzin [Fri, 18 Dec 2015 21:04:41 +0000 (21:04 +0000)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am: cbef517d02 am: 898e330aae am: 94794af6be
am: 3f66df086a

* commit '3f66df086a210bc0dec7a0bd86081f6f79b3a712':
  Making ViewRootImpl drop input events when the Activity is in ambient mode.

8 years agoresolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b79...
Robert Greenwalt [Fri, 18 Dec 2015 21:02:54 +0000 (21:02 +0000)]
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce am: f1530bf3d7 am: fba515f614 am: 2ce61fb68a
am: c57d50c0fb

* commit 'c57d50c0fbffe2a4f479469b490be751cdcf45fa':
  Protect some new broadcasts.

8 years agoFix problem where enter and space key do nothing on ListView.
George Mount [Fri, 18 Dec 2015 21:00:46 +0000 (13:00 -0800)]
Fix problem where enter and space key do nothing on ListView.

Enter should select the currently focused item. It was doing
nothing.

Change-Id: I149ed72804234c1c1da4a7a9be8c9f405722d4ec

8 years agoFix system watchdog timeout when reading too many usage events. am: 8877120173 am...
Mark Lu [Fri, 18 Dec 2015 21:00:42 +0000 (21:00 +0000)]
Fix system watchdog timeout when reading too many usage events. am: 8877120173 am: 370567d1f5
am: 8f968ae1a2

* commit '8f968ae1a22f940f68ac2bf08c4ffcfde539e93b':
  Fix system watchdog timeout when reading too many usage events.

8 years agoMerge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f...
Robert Greenwalt [Fri, 18 Dec 2015 20:59:02 +0000 (20:59 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f am: a652b7161d am: c99c41781c am: b5f6115092
am: 740e5da062

* commit '740e5da0624f8ede5a8ddaa20bfdbb2bd1cfa13a':
  Check permissions on getDeviceId.

8 years agoDifferentiate between apps that use topics and those that don't.
Julia Reynolds [Fri, 18 Dec 2015 14:04:34 +0000 (09:04 -0500)]
Differentiate between apps that use topics and those that don't.

Bug: 22451710
Change-Id: Idb567a4fc511a03cb999179765cfa4cbeb63dcb7

8 years agoMerge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 am: 064eb2a7...
Robert Greenwalt [Fri, 18 Dec 2015 20:57:33 +0000 (20:57 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 am: 064eb2a7cc am: 5d7bb383b8 am: 50843b1708
am: 15912efe72

* commit '15912efe72fe27d9ce212d203227687fe8d98867':
  Check permissions on getDeviceId.

8 years agoMerge "Making ViewRootImpl drop input events when the Activity is in ambient mode...
Daniel Koulomzin [Fri, 18 Dec 2015 20:15:10 +0000 (12:15 -0800)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am: cbef517d02 am: 898e330aae
am: 94794af6be

* commit '94794af6bee35c249857f0440c361d589b77aa5d':
  Making ViewRootImpl drop input events when the Activity is in ambient mode.

8 years agoresolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b79...
Robert Greenwalt [Fri, 18 Dec 2015 20:09:54 +0000 (12:09 -0800)]
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce am: f1530bf3d7 am: fba515f614
am: 2ce61fb68a

* commit '2ce61fb68a598622343047aa8a202513a61566c2':
  Protect some new broadcasts.

8 years agoMerge "Making ViewRootImpl drop input events when the Activity is in ambient mode...
Daniel Koulomzin [Fri, 18 Dec 2015 20:09:35 +0000 (20:09 +0000)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am: cbef517d02
am: 898e330aae

* commit '898e330aaedbfa9e41d649187800c307e3d84169':
  Making ViewRootImpl drop input events when the Activity is in ambient mode.

8 years agoMerge "Fix broken user removal"
Amith Yamasani [Fri, 18 Dec 2015 19:59:19 +0000 (19:59 +0000)]
Merge "Fix broken user removal"

8 years agoMerge "Making ViewRootImpl drop input events when the Activity is in ambient mode...
Daniel Koulomzin [Fri, 18 Dec 2015 19:55:52 +0000 (11:55 -0800)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev
am: cbef517d02

* commit 'cbef517d02f4f3680e155cc1a704ebf5c959d03f':
  Making ViewRootImpl drop input events when the Activity is in ambient mode.

8 years agoMerge "Add a framework service tracking VR mode state."
Ruben Brunk [Fri, 18 Dec 2015 19:50:24 +0000 (19:50 +0000)]
Merge "Add a framework service tracking VR mode state."

8 years agoMerge "Making ViewRootImpl drop input events when the Activity is in ambient mode...
Daniel Koulomzin [Fri, 18 Dec 2015 19:49:18 +0000 (19:49 +0000)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev

8 years agoMerge "Added PRIVATE_FLAG_LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME window flag"
Wale Ogunwale [Fri, 18 Dec 2015 19:47:13 +0000 (19:47 +0000)]
Merge "Added PRIVATE_FLAG_LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME window flag"

8 years agoresolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b79...
Robert Greenwalt [Fri, 18 Dec 2015 19:42:58 +0000 (11:42 -0800)]
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce am: f1530bf3d7
am: fba515f614

* commit 'fba515f614c1df7a30f2d003f2861bc14bc8fbda':
  Protect some new broadcasts.

8 years agoresolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b79...
Robert Greenwalt [Fri, 18 Dec 2015 19:36:54 +0000 (19:36 +0000)]
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce
am: f1530bf3d7

* commit 'f1530bf3d72315256dd7a2c18ba383dc15445b54':
  Protect some new broadcasts.

8 years agoRemove duplicate Bluetooth profiles.
Bryce Lee [Fri, 18 Dec 2015 19:34:20 +0000 (11:34 -0800)]
Remove duplicate Bluetooth profiles.

Change-Id: I04fd867511713dd02ef249b113f7a46c69f22f98

8 years agoresolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b79...
Robert Greenwalt [Fri, 18 Dec 2015 19:31:54 +0000 (11:31 -0800)]
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926
am: 3927089cce

* commit '3927089cce9d43a0b517f53fd6a542f07cb0955b':
  Protect some new broadcasts.

8 years agoresolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b79...
Robert Greenwalt [Fri, 18 Dec 2015 19:24:53 +0000 (11:24 -0800)]
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5
am: 1e04dfb926

* commit '1e04dfb926040a6fad073fca0835777123d155e7':
  Protect some new broadcasts.

8 years agoFix broken user removal
Amith Yamasani [Fri, 18 Dec 2015 19:21:31 +0000 (11:21 -0800)]
Fix broken user removal

Check target user instead of current user, when deciding if
user can be stopped.

Bug: 26207032
Change-Id: Ibf9cb827943f8fbf8fa3b96a9e04c96d11a36d0a

8 years agoresolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b79...
Robert Greenwalt [Fri, 18 Dec 2015 19:17:58 +0000 (19:17 +0000)]
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3
am: 81674b1ff5

* commit '81674b1ff5deedcf2f1a79f07441e506a4f66354':
  Protect some new broadcasts.

8 years agoresolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798
Robert Greenwalt [Fri, 18 Dec 2015 19:04:25 +0000 (19:04 +0000)]
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798
am: 2ecc918bd3

* commit '2ecc918bd3c7f63ea70a7395b3a622c7f1a40f84':
  Protect some new broadcasts.

8 years agoresolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489
Robert Greenwalt [Fri, 18 Dec 2015 18:48:59 +0000 (18:48 +0000)]
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489
am: 5946a9b798

* commit '5946a9b798f9a4b0e9eacd2685fc5ec9d6cc9ed6':
  Protect some new broadcasts.

8 years agoFix system watchdog timeout when reading too many usage events. am: 8877120173
Mark Lu [Fri, 18 Dec 2015 18:45:39 +0000 (18:45 +0000)]
Fix system watchdog timeout when reading too many usage events. am: 8877120173
am: 370567d1f5

* commit '370567d1f5be189c858836746bd93e7482c9571a':
  Fix system watchdog timeout when reading too many usage events.

8 years agoMerge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f...
Robert Greenwalt [Fri, 18 Dec 2015 18:43:05 +0000 (18:43 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f am: a652b7161d am: c99c41781c
am: b5f6115092

* commit 'b5f611509276516eb26d86fe63e845b7148bec86':
  Check permissions on getDeviceId.

8 years agoAdded PRIVATE_FLAG_LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME window flag
Wale Ogunwale [Fri, 18 Dec 2015 18:42:42 +0000 (10:42 -0800)]
Added PRIVATE_FLAG_LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME window flag

Allows us to differentiate between child windows that always want to be
laid-out in the parent frame regardless of multi-windowing mode
(PopupWindows) and those that don't (SurfaceViews).

Bug: 26255254
Change-Id: Icbc245a24f9a38698444196846ddb25016ef7e2a

8 years agoMerge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 am: 064eb2a7...
Robert Greenwalt [Fri, 18 Dec 2015 18:41:23 +0000 (18:41 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 am: 064eb2a7cc am: 5d7bb383b8
am: 50843b1708

* commit '50843b1708f7662f9be661001125d91e0ef544d7':
  Check permissions on getDeviceId.

8 years agoresolve merge conflicts of 9887f2f50a to lmp-sprout-dev.
Robert Greenwalt [Fri, 18 Dec 2015 18:38:10 +0000 (18:38 +0000)]
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev.
am: 5a77651489

* commit '5a77651489ace080671034a85e5771c6ddc73525':
  Protect some new broadcasts.

8 years agoMerge changes Ieabfedfd,I7159d757
Jeff Sharkey [Fri, 18 Dec 2015 18:25:28 +0000 (18:25 +0000)]
Merge changes Ieabfedfd,I7159d757

* changes:
  Sometimes to move forward you need to move backwards.
  Sometimes to move forward you need to move backwards.

8 years agoSometimes to move forward you need to move backwards.
Jeff Sharkey [Fri, 18 Dec 2015 18:24:20 +0000 (11:24 -0700)]
Sometimes to move forward you need to move backwards.

Part B.

Bug: 26118802

Change-Id: Ieabfedfd0ebff5b1f3dc32d1de43aef9974f15d2

8 years agoSometimes to move forward you need to move backwards.
Jeff Sharkey [Fri, 18 Dec 2015 18:23:29 +0000 (11:23 -0700)]
Sometimes to move forward you need to move backwards.

Part A.

Bug: 26118802
Change-Id: I7159d757caa92c590c79cacf62128d1324978c46

8 years agoIntroduce pointer capture API.
Jun Mukai [Thu, 3 Dec 2015 09:13:31 +0000 (01:13 -0800)]
Introduce pointer capture API.

This depends on I4189eb4d93f50c2865b7a325727be5ceebcc71f8 of
frameworks/native.

Bug: 5452473
Change-Id: Ie21e521f3e5c581f976dc0feb5d84bfa48b046cd

8 years agoMerge "Add field QUOTA_OCCUPIED and QUOTA_TOTAL to VoicemailContract.Status"
Ta-wei Yen [Fri, 18 Dec 2015 18:22:10 +0000 (18:22 +0000)]
Merge "Add field QUOTA_OCCUPIED and QUOTA_TOTAL to VoicemailContract.Status"

8 years agoMerge "Collect activity starting logic into ActivityStarter class."
Filip Gruszczynski [Fri, 18 Dec 2015 18:17:02 +0000 (18:17 +0000)]
Merge "Collect activity starting logic into ActivityStarter class."

8 years agoMerge "Fix merged op clipping issue"
Chris Craik [Fri, 18 Dec 2015 18:07:50 +0000 (18:07 +0000)]
Merge "Fix merged op clipping issue"

8 years agoFix merged op clipping issue
Chris Craik [Fri, 18 Dec 2015 02:42:44 +0000 (18:42 -0800)]
Fix merged op clipping issue

Change-Id: I48cd5e92f3e62dcd189a4411a71aa7a40ce5498c

8 years agoMaking ViewRootImpl drop input events when the Activity is in ambient
Daniel Koulomzin [Wed, 16 Dec 2015 22:52:25 +0000 (17:52 -0500)]
Making ViewRootImpl drop input events when the Activity is in ambient
mode.

WearableActivityController tells ViewRootImpl about ambient mode.

Bug: 25912259
Bug: 25973146
Bug: 25714113
Change-Id: Idcca2b254db3145039f50f2a7dfd38a224ec287e

8 years agoMerge "Use buffering when reading preferred apps"
Fyodor Kupolov [Fri, 18 Dec 2015 17:22:07 +0000 (17:22 +0000)]
Merge "Use buffering when reading preferred apps"

8 years agoMerge "Optimized database creation for a new user"
Fyodor Kupolov [Fri, 18 Dec 2015 17:22:04 +0000 (17:22 +0000)]
Merge "Optimized database creation for a new user"

8 years agoCollect activity starting logic into ActivityStarter class.
Filip Gruszczynski [Thu, 17 Dec 2015 22:16:38 +0000 (14:16 -0800)]
Collect activity starting logic into ActivityStarter class.

Change-Id: If1c074d6c278647ec55f2313483945f24aca8b3b

8 years agoMerge "Correctly set mContainingFrame for PopupWindows in multi-window mode"
Wale Ogunwale [Fri, 18 Dec 2015 16:44:15 +0000 (16:44 +0000)]
Merge "Correctly set mContainingFrame for PopupWindows in multi-window mode"

8 years agoMerge "Allow library spec and app configs to be read from odm partition"
Jeff Sharkey [Fri, 18 Dec 2015 16:34:26 +0000 (16:34 +0000)]
Merge "Allow library spec and app configs to be read from odm partition"

8 years agoCorrectly set mContainingFrame for PopupWindows in multi-window mode
Wale Ogunwale [Fri, 18 Dec 2015 16:25:47 +0000 (08:25 -0800)]
Correctly set mContainingFrame for PopupWindows in multi-window mode

For child windows we want to base their containing frame on their
parent frame and not the task bounds.

Bug: 26255254
Change-Id: Ic211c31e69df16fdbdb7b7ba2022379c5f4a87c0

8 years agoMerge "Alt-up moves focus to the toolbar in action bar mode."
George Mount [Fri, 18 Dec 2015 15:46:31 +0000 (15:46 +0000)]
Merge "Alt-up moves focus to the toolbar in action bar mode."

8 years agoAlt-up moves focus to the toolbar in action bar mode.
George Mount [Tue, 15 Dec 2015 21:36:01 +0000 (13:36 -0800)]
Alt-up moves focus to the toolbar in action bar mode.

Bug 24811572

Change-Id: Ie065fa13ba76131e700e73984a99fc60a7aa513c

8 years agoMerge "Reset accessibility after Activity enter transition."
George Mount [Fri, 18 Dec 2015 15:29:52 +0000 (15:29 +0000)]
Merge "Reset accessibility after Activity enter transition."

8 years agoMerge "Print "Success" on success"
Todd Kennedy [Fri, 18 Dec 2015 15:16:19 +0000 (15:16 +0000)]
Merge "Print "Success" on success"

8 years agoHiding pinned stack tasks from overview
Winson Chung [Fri, 18 Dec 2015 15:03:12 +0000 (10:03 -0500)]
Hiding pinned stack tasks from overview

Bug: 25381158
Change-Id: Iad442b7f5dc49109529cb5dab2168b19837af6e3

8 years agoMerge "Show MTP device as root when it has multiple/zero storages."
Daichi Hirono [Fri, 18 Dec 2015 05:33:38 +0000 (05:33 +0000)]
Merge "Show MTP device as root when it has multiple/zero storages."