OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Implementing breadcrumb for tablet devices for navigation in the bar."
TreeHugger Robot [Fri, 17 Jun 2016 19:01:51 +0000 (19:01 +0000)]
Merge "Implementing breadcrumb for tablet devices for navigation in the bar."

8 years agoMerge \"Merge \\\"Include cause when reporting errors.\\\" into nyc-dev am: 60585e6c5...
Steve McKay [Fri, 17 Jun 2016 18:33:53 +0000 (18:33 +0000)]
Merge \"Merge \\\"Include cause when reporting errors.\\\" into nyc-dev am: 60585e6c54 am: ba7fc3b35f\" into nyc-mr1-dev-plus-aosp
am: 5338c243c9

Change-Id: I53e32bd640eb60f407238aa6f37865515066df73

8 years agoMerge \\\"Include cause when reporting errors.\\\" into nyc-dev am: 60585e6c54 am...
Steve McKay [Fri, 17 Jun 2016 18:33:50 +0000 (18:33 +0000)]
Merge \\\"Include cause when reporting errors.\\\" into nyc-dev am: 60585e6c54 am: be8b6e6164
am: 7dfb6fa15e

Change-Id: Iade90d4bfb323bcc1bb7a771fcb2b64656c25d57

8 years agoMerge \"Merge \\\"Check extra type before blindingly casting to Parcelable.\\\" into...
Felipe Leme [Fri, 17 Jun 2016 18:33:48 +0000 (18:33 +0000)]
Merge \"Merge \\\"Check extra type before blindingly casting to Parcelable.\\\" into nyc-dev am: 47c3afa10b am: f2326e947c\" into nyc-mr1-dev-plus-aosp
am: 6548d3ad83

Change-Id: I88c6d7a40488c18e6462325ee4cf1fafc4d57851

8 years agoMerge \\\"Check extra type before blindingly casting to Parcelable.\\\" into nyc...
Felipe Leme [Fri, 17 Jun 2016 18:27:04 +0000 (18:27 +0000)]
Merge \\\"Check extra type before blindingly casting to Parcelable.\\\" into nyc-dev am: 47c3afa10b am: 9b36b6d3d8
am: b1c898ed65

Change-Id: I8b53612e8716233b444a28882028cfb94cb56e0a

8 years agoMerge \\"Merge \\\"Fix issue #29371078: Foreground jobs should not count...\\\" into...
Dianne Hackborn [Fri, 17 Jun 2016 18:27:00 +0000 (18:27 +0000)]
Merge \\"Merge \\\"Fix issue #29371078: Foreground jobs should not count...\\\" into nyc-dev am: 47cfac6803\\" into nyc-mr1-dev am: ab84ab5f35
am: 7aa2137c31

Change-Id: Iac9fde0171a021a19398d0f83d91aa00a5050fdf

8 years agoMerge \\"Add better configurability for dialog theme colours.\\" into nyc-mr1-dev...
Michael Kwan [Fri, 17 Jun 2016 18:26:57 +0000 (18:26 +0000)]
Merge \\"Add better configurability for dialog theme colours.\\" into nyc-mr1-dev am: c637d4bde2
am: 2a68269a44

Change-Id: I0e30dfd1b9c970843e119b8058cea9553e7cb423

8 years agoMerge \\\"Fix issue #29371078: Foreground jobs should not count...\\\" into nyc-dev...
Dianne Hackborn [Fri, 17 Jun 2016 18:26:54 +0000 (18:26 +0000)]
Merge \\\"Fix issue #29371078: Foreground jobs should not count...\\\" into nyc-dev am: 47cfac6803 am: 403e103eb2
am: e022330079

Change-Id: Iadc898f174ffce99e622d272e1699017acb292f8

8 years agoMerge \"Merge \\\"Support using uninstalled WebView packages as WebView implementatio...
Gustav Sennton [Fri, 17 Jun 2016 18:26:50 +0000 (18:26 +0000)]
Merge \"Merge \\\"Support using uninstalled WebView packages as WebView implementation.\\\" into nyc-dev am: e25c8532b6 am: 4a352d2c41\" into nyc-mr1-dev-plus-aosp
am: 1cfb92097c

Change-Id: I5c8fee73cb32b27b9f6514c129285cca39d0755d

8 years agoImplementing breadcrumb for tablet devices for navigation in the bar.
Ben Lin [Fri, 10 Jun 2016 19:13:27 +0000 (12:13 -0700)]
Implementing breadcrumb for tablet devices for navigation in the bar.

Bug: 29214736
Change-Id: I37de2c39a55c33d7111496e896a0c85e1c7fa553
(cherry picked from commit 6fb1dfcc47b795b7071550a4524667d2f8f4d9a2)

8 years agoMerge "Fix spelling error in Core App Quality docs."
Aurimas Liutikas [Fri, 17 Jun 2016 16:26:55 +0000 (16:26 +0000)]
Merge "Fix spelling error in Core App Quality docs."

8 years agoMerge "UsbMidiDevice: Clean up terminology and fix comments"
Mikhail Naganov [Fri, 17 Jun 2016 15:32:00 +0000 (15:32 +0000)]
Merge "UsbMidiDevice: Clean up terminology and fix comments"

8 years agoUsbMidiDevice: Clean up terminology and fix comments
Mikhail Naganov [Fri, 17 Jun 2016 11:11:25 +0000 (04:11 -0700)]
UsbMidiDevice: Clean up terminology and fix comments

When working with physical MIDI devices, an *input* stream is used
for reading from *output* port of the device, and vice versa. Thus,
using "input" and "output" without specifying whether it's a stream
or a port is confusing.

Clarify names of counter variables, and fix a couple of comments
that were incorrect due to this confusion. No functional changes.

Change-Id: If561eaca4bade94e9296d2c703c9fcebc91296e2

8 years agoMerge "resolve merge conflicts of 6cbf137 to master"
Gustav Sennton [Fri, 17 Jun 2016 10:49:53 +0000 (10:49 +0000)]
Merge "resolve merge conflicts of 6cbf137 to master"

8 years agoresolve merge conflicts of 6cbf137 to master
Gustav Sennton [Thu, 16 Jun 2016 19:24:23 +0000 (20:24 +0100)]
resolve merge conflicts of 6cbf137 to master

Change-Id: Idc548a46e96464c11193cf8480d9fb4e07aa438f

8 years agoMerge "Follow the minikin namespace changes"
Seigo Nonaka [Fri, 17 Jun 2016 03:59:51 +0000 (03:59 +0000)]
Merge "Follow the minikin namespace changes"

8 years agoMerge "Add bluetooth folder type information to MediaDescription and MediaMetadata"
Donghyun Cho [Fri, 17 Jun 2016 02:03:12 +0000 (02:03 +0000)]
Merge "Add bluetooth folder type information to MediaDescription and MediaMetadata"

8 years agoMerge "[multi-part] Eliminate 1k selection limit"
TreeHugger Robot [Fri, 17 Jun 2016 01:33:47 +0000 (01:33 +0000)]
Merge "[multi-part] Eliminate 1k selection limit"

8 years agoMerge "Quick fix for Files crashing on start up."
TreeHugger Robot [Fri, 17 Jun 2016 01:28:52 +0000 (01:28 +0000)]
Merge "Quick fix for Files crashing on start up."

8 years agoMerge "Test scene that mocks list view with text items faded on left edge."
Sergei Vasilinetc [Fri, 17 Jun 2016 00:57:50 +0000 (00:57 +0000)]
Merge "Test scene that mocks list view with text items faded on left edge."

8 years ago[multi-part] Eliminate 1k selection limit
Steve McKay [Thu, 9 Jun 2016 17:46:07 +0000 (10:46 -0700)]
[multi-part] Eliminate 1k selection limit

* Save selection to disk, delete old selections on app startup.
* Do clipper work in background for copy/cut.
* Pull DragShadowBuilder out of DirFragment.
* Reorganize selection handling to avoid creation of large lists of objects.
* Eliminate getAll from selection, make it iterable, remove unused method.
* Avoid creating DocumentInfo instances for full selection when initiating drag and drop.

Next step will be to pass selection tokens to FileOperationService.

Change-Id: Ia3e30a88ebf328e5b045d06b0df15dbd26a01a42
(cherry picked from commit 69b63de63ddae8d1a3ad8fa49a0beb1ff6f921e1)

8 years agoTest scene that mocks list view with text items faded on left edge.
sergeyv [Thu, 16 Jun 2016 21:52:20 +0000 (14:52 -0700)]
Test scene that mocks list view with text items faded on left edge.

Change-Id: I6159f02fa511241beaff4f0eb605c4f0bee360d1

8 years agoQuick fix for Files crashing on start up.
Ben Lin [Thu, 16 Jun 2016 21:06:05 +0000 (14:06 -0700)]
Quick fix for Files crashing on start up.

Change-Id: I98df90b6bdf5caacb7565ead7051e507abfff23d

8 years agoMerge "Poll jobs' status to update notifications."
TreeHugger Robot [Thu, 16 Jun 2016 20:31:23 +0000 (20:31 +0000)]
Merge "Poll jobs' status to update notifications."

8 years agoMerge "Implementation of Right-click context menus for docs/files."
TreeHugger Robot [Thu, 16 Jun 2016 20:21:16 +0000 (20:21 +0000)]
Merge "Implementation of Right-click context menus for docs/files."

8 years agoMerge "Merge \\"Include cause when reporting errors.\\" into nyc-dev am: 60585e6c54...
Android Build Merger (Role) [Thu, 16 Jun 2016 19:24:14 +0000 (19:24 +0000)]
Merge "Merge \\"Include cause when reporting errors.\\" into nyc-dev am: 60585e6c54 am: ba7fc3b35f" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Include cause when reporting errors.\\" into nyc-dev am: 60585e6c54
Steve McKay [Thu, 16 Jun 2016 19:23:50 +0000 (19:23 +0000)]
Merge \\"Include cause when reporting errors.\\" into nyc-dev am: 60585e6c54
am: ba7fc3b35f

Change-Id: Ia6cbd90cbc5cca915d1c89a64cc2ca006ce9369c

8 years agoMerge \\"Include cause when reporting errors.\\" into nyc-dev am: 60585e6c54
Steve McKay [Thu, 16 Jun 2016 19:23:07 +0000 (19:23 +0000)]
Merge \\"Include cause when reporting errors.\\" into nyc-dev am: 60585e6c54
am: be8b6e6164

Change-Id: Id636e7d4e803aafc1aae768e09e9d79cba7522ed

8 years agoMerge \"Include cause when reporting errors.\" into nyc-dev
Steve McKay [Thu, 16 Jun 2016 19:18:45 +0000 (19:18 +0000)]
Merge \"Include cause when reporting errors.\" into nyc-dev
am: 60585e6c54

Change-Id: I014009e3c8e8b167b3d322886cadc20f2d9f6eaf

8 years agoMerge \"Include cause when reporting errors.\" into nyc-dev
Steve McKay [Thu, 16 Jun 2016 19:18:28 +0000 (19:18 +0000)]
Merge \"Include cause when reporting errors.\" into nyc-dev
am: 60585e6c54

Change-Id: I9a0ba14d358fedd7287e4bd0c5710953a9f21d27

8 years agoFix spelling error in Core App Quality docs.
Aurimas Liutikas [Thu, 16 Jun 2016 19:15:56 +0000 (12:15 -0700)]
Fix spelling error in Core App Quality docs.

Bug:
https://code.google.com/p/android/issues/detail?id=213248

Change-Id: Idf83eb4fdc09bc3c78a7786b4bf11707178092c7

8 years agoMerge "Include cause when reporting errors." into nyc-dev
TreeHugger Robot [Thu, 16 Jun 2016 19:14:04 +0000 (19:14 +0000)]
Merge "Include cause when reporting errors." into nyc-dev

8 years agoMerge "Merge \\"Check extra type before blindingly casting to Parcelable.\\" into...
Android Build Merger (Role) [Thu, 16 Jun 2016 18:58:42 +0000 (18:58 +0000)]
Merge "Merge \\"Check extra type before blindingly casting to Parcelable.\\" into nyc-dev am: 47c3afa10b am: f2326e947c" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Check extra type before blindingly casting to Parcelable.\\" into nyc-dev...
Felipe Leme [Thu, 16 Jun 2016 18:58:08 +0000 (18:58 +0000)]
Merge \\"Check extra type before blindingly casting to Parcelable.\\" into nyc-dev am: 47c3afa10b
am: f2326e947c

Change-Id: I9bbf3df043b5a62823a4a1a50a1dc47a1970cbd3

8 years agoMerge \\"Check extra type before blindingly casting to Parcelable.\\" into nyc-dev...
Felipe Leme [Thu, 16 Jun 2016 18:57:30 +0000 (18:57 +0000)]
Merge \\"Check extra type before blindingly casting to Parcelable.\\" into nyc-dev am: 47c3afa10b
am: 9b36b6d3d8

Change-Id: I24fc920fc54e4fd5865bc4b77d78b5c4ce919052

8 years agoMerge "merge fix"
Richard Ho [Thu, 16 Jun 2016 18:57:27 +0000 (18:57 +0000)]
Merge "merge fix"

8 years agoMerge \"Check extra type before blindingly casting to Parcelable.\" into nyc-dev
Felipe Leme [Thu, 16 Jun 2016 18:53:47 +0000 (18:53 +0000)]
Merge \"Check extra type before blindingly casting to Parcelable.\" into nyc-dev
am: 47c3afa10b

Change-Id: I4cb74a467a10ee3d38db91fde077263179bf9359

8 years agoMerge \"Check extra type before blindingly casting to Parcelable.\" into nyc-dev
Felipe Leme [Thu, 16 Jun 2016 18:52:50 +0000 (18:52 +0000)]
Merge \"Check extra type before blindingly casting to Parcelable.\" into nyc-dev
am: 47c3afa10b

Change-Id: I60c54353bdbd57818bcf5bcc47d55328d46ce6b9

8 years agoMerge \"Merge \\"Fix issue #29371078: Foreground jobs should not count...\\" into...
Dianne Hackborn [Thu, 16 Jun 2016 18:49:47 +0000 (18:49 +0000)]
Merge \"Merge \\"Fix issue #29371078: Foreground jobs should not count...\\" into nyc-dev am: 47cfac6803\" into nyc-mr1-dev
am: ab84ab5f35

Change-Id: I548579a05c05a01df05c6fbfb82315e53d90bd78

8 years agoMerge \"Add better configurability for dialog theme colours.\" into nyc-mr1-dev
Michael Kwan [Thu, 16 Jun 2016 18:49:44 +0000 (18:49 +0000)]
Merge \"Add better configurability for dialog theme colours.\" into nyc-mr1-dev
am: c637d4bde2

Change-Id: If2fe85982fd704d501d7dfb61494ea088b79c6c2

8 years agoMerge "Check extra type before blindingly casting to Parcelable." into nyc-dev
TreeHugger Robot [Thu, 16 Jun 2016 18:47:50 +0000 (18:47 +0000)]
Merge "Check extra type before blindingly casting to Parcelable." into nyc-dev

8 years agoMerge \\"Fix issue #29371078: Foreground jobs should not count...\\" into nyc-dev...
Dianne Hackborn [Thu, 16 Jun 2016 18:46:43 +0000 (18:46 +0000)]
Merge \\"Fix issue #29371078: Foreground jobs should not count...\\" into nyc-dev am: 47cfac6803
am: 403e103eb2

Change-Id: Ief9539ea61813129a9aa2f122178e084ebd5a010

8 years agoMerge "Merge \"Fix issue #29371078: Foreground jobs should not count...\" into nyc...
Android Build Merger (Role) [Thu, 16 Jun 2016 18:44:17 +0000 (18:44 +0000)]
Merge "Merge \"Fix issue #29371078: Foreground jobs should not count...\" into nyc-dev am: 47cfac6803" into nyc-mr1-dev

8 years agoMerge "Add better configurability for dialog theme colours." into nyc-mr1-dev
Michael Kwan [Thu, 16 Jun 2016 18:44:13 +0000 (18:44 +0000)]
Merge "Add better configurability for dialog theme colours." into nyc-mr1-dev

8 years agoMerge \"Fix issue #29371078: Foreground jobs should not count...\" into nyc-dev
Dianne Hackborn [Thu, 16 Jun 2016 18:43:57 +0000 (18:43 +0000)]
Merge \"Fix issue #29371078: Foreground jobs should not count...\" into nyc-dev
am: 47cfac6803

Change-Id: I94a6674bcb0327bc55fbfc1d18c4a5d6d723a52e

8 years agoMerge \"Fix issue #29371078: Foreground jobs should not count...\" into nyc-dev
Dianne Hackborn [Thu, 16 Jun 2016 18:43:37 +0000 (18:43 +0000)]
Merge \"Fix issue #29371078: Foreground jobs should not count...\" into nyc-dev
am: 47cfac6803

Change-Id: I1de87ba1e5d14f5f9bd66cde733517e3fc5e71f3

8 years agoPoll jobs' status to update notifications.
Garfield, Tan [Thu, 9 Jun 2016 19:04:22 +0000 (12:04 -0700)]
Poll jobs' status to update notifications.

Bug: 27249491
Change-Id: I8912c781582af1789c8f76dea06879a3dde75d34

8 years agoMerge "Fix issue #29371078: Foreground jobs should not count..." into nyc-dev
Dianne Hackborn [Thu, 16 Jun 2016 18:39:02 +0000 (18:39 +0000)]
Merge "Fix issue #29371078: Foreground jobs should not count..." into nyc-dev

8 years agoImplementation of Right-click context menus for docs/files.
Ben Lin [Fri, 3 Jun 2016 20:46:52 +0000 (13:46 -0700)]
Implementation of Right-click context menus for docs/files.

Bug: 24416336
Change-Id: I675baf4abf6308bc1f6c3b4171f7251b0f3fd6e4
(cherry picked from commit be70710de3e1507292381cd14a9e1c1343ff2524)

8 years agoMerge "Merge \\"Support using uninstalled WebView packages as WebView implementation...
Android Build Merger (Role) [Thu, 16 Jun 2016 17:53:59 +0000 (17:53 +0000)]
Merge "Merge \\"Support using uninstalled WebView packages as WebView implementation.\\" into nyc-dev am: e25c8532b6 am: 4a352d2c41" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Support using uninstalled WebView packages as WebView implementation.\\...
Gustav Sennton [Thu, 16 Jun 2016 17:53:35 +0000 (17:53 +0000)]
Merge \\"Support using uninstalled WebView packages as WebView implementation.\\" into nyc-dev am: e25c8532b6
am: 4a352d2c41

Change-Id: Ib71525eb35c9e4f125e679fce9c453fb349016e6

8 years agoMerge \\"Support using uninstalled WebView packages as WebView implementation.\\...
Gustav Sennton [Thu, 16 Jun 2016 17:53:03 +0000 (17:53 +0000)]
Merge \\"Support using uninstalled WebView packages as WebView implementation.\\" into nyc-dev am: e25c8532b6
am: 939f8caec2

Change-Id: If40694c4a8ca87fe5467374abfc1f6de867d8733

8 years agoMerge \"Support using uninstalled WebView packages as WebView implementation.\" into...
Gustav Sennton [Thu, 16 Jun 2016 17:47:21 +0000 (17:47 +0000)]
Merge \"Support using uninstalled WebView packages as WebView implementation.\" into nyc-dev
am: e25c8532b6

Change-Id: Idf2b200364c7b760f82f5138b7aba0bd63bcf12b

8 years agoMerge \"Support using uninstalled WebView packages as WebView implementation.\" into...
Gustav Sennton [Thu, 16 Jun 2016 17:46:53 +0000 (17:46 +0000)]
Merge \"Support using uninstalled WebView packages as WebView implementation.\" into nyc-dev
am: e25c8532b6

Change-Id: Ie9f405765c146d21f1399037dd236d440902f0f9

8 years agoInclude cause when reporting errors.
Steve McKay [Tue, 14 Jun 2016 22:56:50 +0000 (15:56 -0700)]
Include cause when reporting errors.

Bug: 29191892
Change-Id: I5f904da3a8564ec68ca634c28e3eda7f496a5c1c

8 years agoMerge "Support using uninstalled WebView packages as WebView implementation." into...
Gustav Sennton [Thu, 16 Jun 2016 17:40:08 +0000 (17:40 +0000)]
Merge "Support using uninstalled WebView packages as WebView implementation." into nyc-dev

8 years agoMerge \\\\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\\\" am...
Yi Kong [Thu, 16 Jun 2016 17:26:48 +0000 (17:26 +0000)]
Merge \\\\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\\\" am: 1850851670 am: f5bdd8eae6 am: b72fa52282
am: a05075f743

Change-Id: Idb7d4edd9de00025ae4af04c446654b1e7d8819b

8 years agoCheck extra type before blindingly casting to Parcelable.
Felipe Leme [Thu, 16 Jun 2016 17:02:38 +0000 (10:02 -0700)]
Check extra type before blindingly casting to Parcelable.

BUG: 29402928
Change-Id: If1729b8a4fcde724372b0a23cfae723a5d9b4faa

8 years agoMerge \\"Shortcut: Reset throttling upon inline reply\\" into nyc-mr1-dev am: 489bafbb4b
Makoto Onuki [Thu, 16 Jun 2016 17:17:56 +0000 (17:17 +0000)]
Merge \\"Shortcut: Reset throttling upon inline reply\\" into nyc-mr1-dev am: 489bafbb4b
am: 58b2258506

Change-Id: I7034cc9ef130c9dccfa35a8cb75940d717a2a15d

8 years agoMerge \\\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\\" am: 18508...
Yi Kong [Thu, 16 Jun 2016 17:14:43 +0000 (17:14 +0000)]
Merge \\\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\\" am: 1850851670 am: f5bdd8eae6
am: b72fa52282

Change-Id: I512681e5a601e5d1e36979afef1fa3c443b2222c

8 years agoresolve merge conflicts of 20d55a7 to stage-aosp-master am: 5f551b3fdc am: fd1854cdfa
Dan Willemsen [Thu, 16 Jun 2016 17:12:02 +0000 (17:12 +0000)]
resolve merge conflicts of 20d55a7 to stage-aosp-master am: 5f551b3fdc am: fd1854cdfa
am: 04e9d830b0

Change-Id: I4add0a1b114c4e56343484acb9e855137e720be3

8 years agoMerge \"Shortcut: Reset throttling upon inline reply\" into nyc-mr1-dev
Makoto Onuki [Thu, 16 Jun 2016 17:10:42 +0000 (17:10 +0000)]
Merge \"Shortcut: Reset throttling upon inline reply\" into nyc-mr1-dev
am: 489bafbb4b

Change-Id: I5c8dc7f3c1e5860ea870d88b2ff7fc2a86a4ba39

8 years agoMerge \\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" am: 1850851670
Yi Kong [Thu, 16 Jun 2016 17:08:09 +0000 (17:08 +0000)]
Merge \\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" am: 1850851670
am: f5bdd8eae6

Change-Id: Iea16189bfbce1b11fa4a91501daba94c2c83a380

8 years agoresolve merge conflicts of 20d55a7 to stage-aosp-master am: 5f551b3fdc
Dan Willemsen [Thu, 16 Jun 2016 17:07:15 +0000 (17:07 +0000)]
resolve merge conflicts of 20d55a7 to stage-aosp-master am: 5f551b3fdc
am: fd1854cdfa

Change-Id: I6942aa753a512f0a24725de0ea72ed20c067ad15

8 years agoMerge "Shortcut: Reset throttling upon inline reply" into nyc-mr1-dev
Makoto Onuki [Thu, 16 Jun 2016 17:05:54 +0000 (17:05 +0000)]
Merge "Shortcut: Reset throttling upon inline reply" into nyc-mr1-dev

8 years agoMerge \"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\"
Yi Kong [Thu, 16 Jun 2016 17:02:37 +0000 (17:02 +0000)]
Merge \"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\"
am: 1850851670

Change-Id: I6997e3b34d87cb091be99318ea1743c972ca1c84

8 years agoresolve merge conflicts of 20d55a7 to stage-aosp-master
Dan Willemsen [Thu, 16 Jun 2016 17:01:55 +0000 (17:01 +0000)]
resolve merge conflicts of 20d55a7 to stage-aosp-master
am: 5f551b3fdc

Change-Id: I327901f4bcca937a8376c1a6d604d7293828b0c9

8 years agoMerge \\"Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem\\" into...
Mahaver Chopra [Thu, 16 Jun 2016 17:00:06 +0000 (17:00 +0000)]
Merge \\"Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem\\" into nyc-mr1-dev am: 186768150f
am: d3a0f10b8d

Change-Id: I3cc8d0ff8cc97b57262edfb09c07fc91f06cf56c

8 years agoresolve merge conflicts of 20d55a7 to stage-aosp-master
Dan Willemsen [Thu, 16 Jun 2016 16:54:28 +0000 (09:54 -0700)]
resolve merge conflicts of 20d55a7 to stage-aosp-master

Change-Id: Ie2a1beb527ab60f8a3966a14e66330e69a148b59

8 years agoMerge \"Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem\" into...
Mahaver Chopra [Thu, 16 Jun 2016 16:53:43 +0000 (16:53 +0000)]
Merge \"Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem\" into nyc-mr1-dev
am: 186768150f

Change-Id: Id35463500a31ff6e6d834c706e228d05c5d15918

8 years agoMerge "Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem" into...
Mahaver Chopra [Thu, 16 Jun 2016 16:49:10 +0000 (16:49 +0000)]
Merge "Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem" into nyc-mr1-dev

8 years agoMerge \"Merge \\\"Make sure we\\\'re locked\\\" into nyc-dev am: 32d67fab83 am: 092d9...
Todd Kennedy [Thu, 16 Jun 2016 16:40:44 +0000 (16:40 +0000)]
Merge \"Merge \\\"Make sure we\\\'re locked\\\" into nyc-dev am: 32d67fab83 am: 092d961367\" into nyc-mr1-dev-plus-aosp
am: b901e4c4e6

Change-Id: Id83cd214744a5114b518236bb7091d2578d47849

8 years agoMerge \\\"Make sure we\\\'re locked\\\" into nyc-dev am: 32d67fab83 am: e084a08ff5
Todd Kennedy [Thu, 16 Jun 2016 16:40:42 +0000 (16:40 +0000)]
Merge \\\"Make sure we\\\'re locked\\\" into nyc-dev am: 32d67fab83 am: e084a08ff5
am: 5574a0618d

Change-Id: I20c7f3dd9ed062a470227ae8c7c7e305cb65730e

8 years agoMerge "Merge \\"Make sure we\\'re locked\\" into nyc-dev am: 32d67fab83 am: 092d96136...
Android Build Merger (Role) [Thu, 16 Jun 2016 16:38:10 +0000 (16:38 +0000)]
Merge "Merge \\"Make sure we\\'re locked\\" into nyc-dev am: 32d67fab83 am: 092d961367" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Make sure we\\'re locked\\" into nyc-dev am: 32d67fab83
Todd Kennedy [Thu, 16 Jun 2016 16:37:44 +0000 (16:37 +0000)]
Merge \\"Make sure we\\'re locked\\" into nyc-dev am: 32d67fab83
am: 092d961367

Change-Id: Ifbea2336bcb5a38ec71147e905a593b8b3f55416

8 years agoMerge \\"Make sure we\\'re locked\\" into nyc-dev am: 32d67fab83
Todd Kennedy [Thu, 16 Jun 2016 16:37:23 +0000 (16:37 +0000)]
Merge \\"Make sure we\\'re locked\\" into nyc-dev am: 32d67fab83
am: e084a08ff5

Change-Id: I7cbdcd5d7e917fa290775260d3c30726948d4f4d

8 years agoMerge \"Make sure we\'re locked\" into nyc-dev
Todd Kennedy [Thu, 16 Jun 2016 16:34:34 +0000 (16:34 +0000)]
Merge \"Make sure we\'re locked\" into nyc-dev
am: 32d67fab83

Change-Id: I2f80a7af0ddd6f282cde6c8d9ea79e0c614fba6b

8 years agoMerge \"Make sure we\'re locked\" into nyc-dev
Todd Kennedy [Thu, 16 Jun 2016 16:34:11 +0000 (16:34 +0000)]
Merge \"Make sure we\'re locked\" into nyc-dev
am: 32d67fab83

Change-Id: Iff90d36636b01542ed8a7e088f403b6554cbd91a

8 years agoMerge "Merge \\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\"...
Android Build Merger (Role) [Thu, 16 Jun 2016 16:33:42 +0000 (16:33 +0000)]
Merge "Merge \\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" into nyc-dev-plus-aosp am: 53cf79e185 am: 75aee6f266"

8 years agoMerge \\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" into nyc...
Yi Kong [Thu, 16 Jun 2016 16:33:13 +0000 (16:33 +0000)]
Merge \\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" into nyc-dev-plus-aosp am: 53cf79e185
am: 75aee6f266

Change-Id: I30a3bc53262cc1f27b3c745af2a9b6a4d6357649

8 years agoMerge "Keyboard shortcuts: A11Y fixes"
Andrei Stingaceanu [Thu, 16 Jun 2016 16:29:23 +0000 (16:29 +0000)]
Merge "Keyboard shortcuts: A11Y fixes"

8 years agomerge fix
Richard Ho [Thu, 16 Jun 2016 16:29:07 +0000 (09:29 -0700)]
merge fix

Change-Id: Ib937f672769dc19b8706c8a0b695ed8a08398df4

8 years agoMerge "Make sure we're locked" into nyc-dev
Todd Kennedy [Thu, 16 Jun 2016 16:22:53 +0000 (16:22 +0000)]
Merge "Make sure we're locked" into nyc-dev

8 years agoMerge \"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\" into nyc...
Yi Kong [Thu, 16 Jun 2016 16:21:03 +0000 (16:21 +0000)]
Merge \"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\" into nyc-dev-plus-aosp
am: 53cf79e185

Change-Id: I7444bfc95144d4d00c20347512a5a5fc0cceebc8

8 years agoKeyboard shortcuts: A11Y fixes
Andrei Stingaceanu [Mon, 13 Jun 2016 16:26:39 +0000 (17:26 +0100)]
Keyboard shortcuts: A11Y fixes

* Letters are no more announced as capitals
* Focus now moves into the function key buttons (images)
* The keyboard shortcuts are not being verbalized individually
but instead the whole group is now verbalized in one go.

Bug: 29267887
Bug: 29259734
Bug: 29260915
Change-Id: Ie2cf519338cbb7d07c2d52b419dcf6b5a9e14147

8 years agoMerge "Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92" into nyc-dev...
Yi Kong [Thu, 16 Jun 2016 16:17:48 +0000 (16:17 +0000)]
Merge "Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92" into nyc-dev-plus-aosp

8 years agoMerge "Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92"
Yi Kong [Thu, 16 Jun 2016 16:16:00 +0000 (16:16 +0000)]
Merge "Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92"

8 years agoTrack libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92
Yi Kong [Mon, 13 Jun 2016 20:14:35 +0000 (21:14 +0100)]
Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92

Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
(cherry picked from commit af823e0ebf987d5715d6df80b3c9335b4e3a2cdb)

8 years agoTrack libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c am: 7d09db2830
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 16:10:47 +0000 (16:10 +0000)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c am: 7d09db2830
am: 81368e08e0

Change-Id: Ifa2ca4ef2b9144db318b61cd248000c6e3eb96fe

8 years agoTrack libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 16:07:49 +0000 (16:07 +0000)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
am: 7d09db2830

Change-Id: I57f72e630688d91ca56adfb910232358746777e0

8 years agoTrack libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 14:15:17 +0000 (15:15 +0100)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c

test-current.txt update

Bug: 28666126
Change-Id: Ib03eaba0277fbfbd3088044651295971aebf7a64
(cherry picked from commit aa021e854ef84f7a7aff109b5bec824190f9ebfa)

8 years agoMerge "Remove unused link to libcutils"
Treehugger Robot [Thu, 16 Jun 2016 15:56:50 +0000 (15:56 +0000)]
Merge "Remove unused link to libcutils"

8 years agoMerge \\\"Fix that work apps settings page crash after changing work profile to use...
Victor Chang [Thu, 16 Jun 2016 15:35:00 +0000 (15:35 +0000)]
Merge \\\"Fix that work apps settings page crash after changing work profile to use separated lock\\\" into nyc-dev am: 6437205648 am: 9feb501659
am: 2b59387499

Change-Id: I65b9ecc84c763721ce5c943fdd9a7f682f770da4

8 years agoMerge \\\"Fix that work apps settings page crash after changing work profile to use...
Victor Chang [Thu, 16 Jun 2016 15:29:56 +0000 (15:29 +0000)]
Merge \\\"Fix that work apps settings page crash after changing work profile to use separated lock\\\" into nyc-dev am: 6437205648 am: 1e29965a85
am: bba7856588

Change-Id: Iba5f5f63a78e7f9e68465fa5598d6c6baf555771

8 years agoMerge \\"Fix that work apps settings page crash after changing work profile to use...
Victor Chang [Thu, 16 Jun 2016 15:28:55 +0000 (15:28 +0000)]
Merge \\"Fix that work apps settings page crash after changing work profile to use separated lock\\" into nyc-dev am: 6437205648
am: 9feb501659

Change-Id: I0cd6a92a70d8f3310ab1a07709aefe6d42a57412

8 years agoMerge \\"Fix that work apps settings page crash after changing work profile to use...
Victor Chang [Thu, 16 Jun 2016 15:24:23 +0000 (15:24 +0000)]
Merge \\"Fix that work apps settings page crash after changing work profile to use separated lock\\" into nyc-dev am: 6437205648
am: 1e29965a85

Change-Id: Iad489061a9f91d17097f45ff10da50f9210733a1

8 years agoMerge \"Fix that work apps settings page crash after changing work profile to use...
Victor Chang [Thu, 16 Jun 2016 15:21:12 +0000 (15:21 +0000)]
Merge \"Fix that work apps settings page crash after changing work profile to use separated lock\" into nyc-dev
am: 6437205648

Change-Id: Id19fe2488406a3891cd433d8b1e9273a28b48fbb

8 years agoMerge \"Fix that work apps settings page crash after changing work profile to use...
Victor Chang [Thu, 16 Jun 2016 15:21:07 +0000 (15:21 +0000)]
Merge \"Fix that work apps settings page crash after changing work profile to use separated lock\" into nyc-dev
am: 6437205648

Change-Id: If23d7b5ab2c79874714a9f6a67625b09e7f83699

8 years agoMerge "Fix that work apps settings page crash after changing work profile to use...
Victor Chang [Thu, 16 Jun 2016 15:13:32 +0000 (15:13 +0000)]
Merge "Fix that work apps settings page crash after changing work profile to use separated lock" into nyc-dev

8 years agoSupport using uninstalled WebView packages as WebView implementation.
Gustav Sennton [Tue, 14 Jun 2016 14:32:19 +0000 (15:32 +0100)]
Support using uninstalled WebView packages as WebView implementation.

A package can be uninstalled for the system user but still be installed
on the device. Currently, we do not use such a package as WebView
implementation which means we fall back to using the fallback WebView
package.
However, if the fallback package is not valid (because it needs to be
updated first) loading WebView will fail.

With this change we fetch allow the fetching of information from
packages that are uninstalled for the system user so that we can still
load WebView when the only valid WebView provider is uninstalled for the
system user.

Also listen to package additions/changes/removals for all users -
otherwise we won't notice when a package becomes replaced if it was
already uninstalled for the system user.

Bug: 29321185
Change-Id: Ia23c4493844877aea1b4eab7e666fd37540c4f97