OSDN Git Service

android-x86/frameworks-base.git
8 years agoMake permission RECEIVE_EMERGENCY_BROADCAST public. am: c08268e647
Amit Mahajan [Mon, 8 Feb 2016 23:05:29 +0000 (23:05 +0000)]
Make permission RECEIVE_EMERGENCY_BROADCAST public. am: c08268e647
am: 510e0ee392

* commit '510e0ee39276fb687d50874b4f3097313a195e2b':
  Make permission RECEIVE_EMERGENCY_BROADCAST public.

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Tao Bao [Mon, 8 Feb 2016 23:02:03 +0000 (23:02 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Add system APIs for A/B update." into nyc-dev am: 6af1d75a0c
Tao Bao [Mon, 8 Feb 2016 22:59:28 +0000 (22:59 +0000)]
Merge "Add system APIs for A/B update." into nyc-dev am: 6af1d75a0c
am: bfc03b7a93

* commit 'bfc03b7a93a26ed26fcc0516436e383b0106175e':
  Add system APIs for A/B update.

8 years agoMerge "Add system APIs for A/B update." into nyc-dev am: 6af1d75a0c
Tao Bao [Mon, 8 Feb 2016 22:57:31 +0000 (22:57 +0000)]
Merge "Add system APIs for A/B update." into nyc-dev am: 6af1d75a0c
am: bfc03b7a93

* commit 'bfc03b7a93a26ed26fcc0516436e383b0106175e':
  Add system APIs for A/B update.

8 years agoMerge "Password security for FBE disk encryption keys" into nyc-dev am: 23b588c7b3
Paul Crowley [Mon, 8 Feb 2016 22:53:02 +0000 (22:53 +0000)]
Merge "Password security for FBE disk encryption keys" into nyc-dev am: 23b588c7b3
am: d386008899

* commit 'd386008899ff359a0e8cea629523d6bf305896b9':
  Password security for FBE disk encryption keys

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Wale Ogunwale [Mon, 8 Feb 2016 22:51:23 +0000 (22:51 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge branch \'nyc-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-androi...
Wale Ogunwale [Mon, 8 Feb 2016 22:49:24 +0000 (22:49 +0000)]
Merge branch \'nyc-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp
am: 6845ea8681

* commit '6845ea868194226768e119a9fa1fca3ad0a1e7b3':

8 years agoMerge branch \'nyc-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-androi...
Wale Ogunwale [Mon, 8 Feb 2016 22:46:43 +0000 (22:46 +0000)]
Merge branch \'nyc-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp
am: 6845ea8681

* commit '6845ea868194226768e119a9fa1fca3ad0a1e7b3':

8 years agoFixed issue with drag resize state when animating pinned stack. am: ce14452a27
Wale Ogunwale [Mon, 8 Feb 2016 22:44:15 +0000 (22:44 +0000)]
Fixed issue with drag resize state when animating pinned stack. am: ce14452a27
am: 90dd5cc30f

* commit '90dd5cc30f35fe2e9ec078219a431a96893ba443':
  Fixed issue with drag resize state when animating pinned stack.

8 years agoMake permission RECEIVE_EMERGENCY_BROADCAST public.
Amit Mahajan [Mon, 8 Feb 2016 22:43:58 +0000 (22:43 +0000)]
Make permission RECEIVE_EMERGENCY_BROADCAST public.
am: c08268e647

* commit 'c08268e647f89f8ddfd9c6fb1f6ac4f99b13b9cf':
  Make permission RECEIVE_EMERGENCY_BROADCAST public.

8 years agoMerge "Add system APIs for A/B update." into nyc-dev
Tao Bao [Mon, 8 Feb 2016 22:42:07 +0000 (22:42 +0000)]
Merge "Add system APIs for A/B update." into nyc-dev
am: 6af1d75a0c

* commit '6af1d75a0c1cf814404e5142c3a7932ff9deade9':
  Add system APIs for A/B update.

8 years agoMerge "Password security for FBE disk encryption keys" into nyc-dev
Paul Crowley [Mon, 8 Feb 2016 22:40:23 +0000 (22:40 +0000)]
Merge "Password security for FBE disk encryption keys" into nyc-dev
am: 23b588c7b3

* commit '23b588c7b3b1a817e35bf3e6916cd99ab1c58a2c':
  Password security for FBE disk encryption keys

8 years agoMerge branch 'nyc-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_...
Wale Ogunwale [Mon, 8 Feb 2016 22:38:27 +0000 (22:38 +0000)]
Merge branch 'nyc-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp

8 years agoFixed issue with drag resize state when animating pinned stack.
Wale Ogunwale [Mon, 8 Feb 2016 22:37:25 +0000 (22:37 +0000)]
Fixed issue with drag resize state when animating pinned stack.
am: ce14452a27

* commit 'ce14452a27acf0492d799ec88c619add3a630a88':
  Fixed issue with drag resize state when animating pinned stack.

8 years agoFixed issue with drag resize state when animating pinned stack.
Wale Ogunwale [Mon, 8 Feb 2016 22:36:12 +0000 (22:36 +0000)]
Fixed issue with drag resize state when animating pinned stack.
am: ce14452a27

* commit 'ce14452a27acf0492d799ec88c619add3a630a88':
  Fixed issue with drag resize state when animating pinned stack.

8 years agoDo not update Record.visible if not setting visibility am: e66edb1056
Jorim Jaggi [Mon, 8 Feb 2016 22:34:58 +0000 (22:34 +0000)]
Do not update Record.visible if not setting visibility am: e66edb1056
am: f981ef570a

* commit 'f981ef570ab720cdae5d9d683b8313832ded08cb':
  Do not update Record.visible if not setting visibility

8 years agoMulti-window optimizations #3 am: e161f08e98
Jorim Jaggi [Mon, 8 Feb 2016 22:32:50 +0000 (22:32 +0000)]
Multi-window optimizations #3 am: e161f08e98
am: cee1f6f3c8

* commit 'cee1f6f3c81d815c3a2b9ea04d686fa1285e6364':
  Multi-window optimizations #3

8 years agoMerge "Do not save TextView text when freezesText is false"
Siyamed Sinir [Mon, 8 Feb 2016 22:22:22 +0000 (22:22 +0000)]
Merge "Do not save TextView text when freezesText is false"

8 years agoMake permission RECEIVE_EMERGENCY_BROADCAST public.
Amit Mahajan [Fri, 5 Feb 2016 02:08:30 +0000 (18:08 -0800)]
Make permission RECEIVE_EMERGENCY_BROADCAST public.

It is required to receive intent SMS_EMERGENCY_CB_RECEIVED_ACTION
which is already public.

Bug: 24914029
Change-Id: I2d5461fcedb2cb347c818ab6f94577008f6af242
(cherry picked from commit 45d9b36fc6a609893022b812084987cda3e3717d)

8 years agoMerge "Make permission RECEIVE_EMERGENCY_BROADCAST public."
Amit Mahajan [Mon, 8 Feb 2016 22:17:28 +0000 (22:17 +0000)]
Merge "Make permission RECEIVE_EMERGENCY_BROADCAST public."

8 years agoMerge "Add system APIs for A/B update." into nyc-dev
Tao Bao [Mon, 8 Feb 2016 22:07:04 +0000 (22:07 +0000)]
Merge "Add system APIs for A/B update." into nyc-dev

8 years agoMulti-window optimizations #2 am: c3fb3143a2
Jorim Jaggi [Mon, 8 Feb 2016 21:50:37 +0000 (21:50 +0000)]
Multi-window optimizations #2 am: c3fb3143a2
am: ec3c66966b

* commit 'ec3c66966bf339e71cb9dd314aaf536356089f27':
  Multi-window optimizations #2

8 years agoMerge branch \'nyc-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-androi...
Jorim Jaggi [Mon, 8 Feb 2016 21:49:35 +0000 (21:49 +0000)]
Merge branch \'nyc-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp
am: fcf34c91e5

* commit 'fcf34c91e56ddaa2e54410983dc0cafa9c2f9bf7':

8 years agoMulti-window optimizations #1 am: 69abc194f3
Jorim Jaggi [Mon, 8 Feb 2016 21:47:53 +0000 (21:47 +0000)]
Multi-window optimizations #1 am: 69abc194f3
am: 6d8567d60d

* commit '6d8567d60d43647942cbf344ff94e2fa63fcbc25':
  Multi-window optimizations #1

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Jorim Jaggi [Mon, 8 Feb 2016 21:47:15 +0000 (21:47 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoDo not update Record.visible if not setting visibility
Jorim Jaggi [Mon, 8 Feb 2016 21:46:17 +0000 (21:46 +0000)]
Do not update Record.visible if not setting visibility
am: e66edb1056

* commit 'e66edb10564fa2fd0fb5a9fef2d176870f345646':
  Do not update Record.visible if not setting visibility

8 years agoFix disappearing translucent status bar background am: 0a13bfdefc
Jorim Jaggi [Mon, 8 Feb 2016 21:46:12 +0000 (21:46 +0000)]
Fix disappearing translucent status bar background am: 0a13bfdefc
am: 3938dcc39c

* commit '3938dcc39c2548c104b5e6e63505c20923da529c':
  Fix disappearing translucent status bar background

8 years agoMerge "Added an api to uninstall a packge with active DAs"
Suprabh Shukla [Mon, 8 Feb 2016 21:46:00 +0000 (21:46 +0000)]
Merge "Added an api to uninstall a packge with active DAs"

8 years agoMerge "Password security for FBE disk encryption keys" into nyc-dev
Paul Crowley [Mon, 8 Feb 2016 21:45:45 +0000 (21:45 +0000)]
Merge "Password security for FBE disk encryption keys" into nyc-dev

8 years agoMulti-window optimizations #3
Jorim Jaggi [Mon, 8 Feb 2016 21:44:33 +0000 (21:44 +0000)]
Multi-window optimizations #3
am: e161f08e98

* commit 'e161f08e98fdbe6fe83f70ffa1ea11142a027ebe':
  Multi-window optimizations #3

8 years agoAdded an api to uninstall a packge with active DAs
Suprabh Shukla [Fri, 29 Jan 2016 02:05:14 +0000 (18:05 -0800)]
Added an api to uninstall a packge with active DAs

The api deactivates all the active admins in the package, then force
stops the package and starts the uninstall intent for the package. This
is intended to provide an easy way for a user to delete a misbehaving
Device Admin

Bug: b/22359208
Change-Id: Ic7ddd89ef6db53e7e76f805808d9e806100374db

8 years agoFixed issue with drag resize state when animating pinned stack.
Wale Ogunwale [Sat, 6 Feb 2016 06:51:01 +0000 (22:51 -0800)]
Fixed issue with drag resize state when animating pinned stack.

When animating the pinned stack, we set drag resizing on the top
most task in the stack. This has a couple of issues.
- Only the top most task is put in drag sizing mode and all other
task in the stack will not be in resizing mode.
- The top most task of the stack can change during the animation,
so we fail to clear the drag resize flag on the previous top task.

We now track drag sizing at the stack level and have the stack
drag resizing state affect its tasks drag resizing states.

Also added concept of continuing a bounds animation if the same
target called BoundsAnimationController.animateBounds before the
current animation is done. We don't send onAnimationEnd() for the
current animation that is been cancelled and don't send
onAnimationStarted() for the animation that will be replacing it.

Bug: 25672053
Change-Id: I64e89ed09d81e4802dacebc5818dfa1deb0d588f

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev am: e074f31c0d -s ours
Geoff Mendal [Mon, 8 Feb 2016 21:41:50 +0000 (21:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am: e074f31c0d  -s ours
am: a7831e4fa7  -s ours

* commit 'a7831e4fa7f8051abdd3f1fc761f3f7b6d48ac87':
  Import translations. DO NOT MERGE

8 years agoMulti-window optimizations #2
Jorim Jaggi [Mon, 8 Feb 2016 21:41:44 +0000 (21:41 +0000)]
Multi-window optimizations #2
am: c3fb3143a2

* commit 'c3fb3143a2f01e6960f6f50cc58abd845942b342':
  Multi-window optimizations #2

8 years agoMerge branch 'nyc-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_...
Jorim Jaggi [Mon, 8 Feb 2016 21:40:16 +0000 (21:40 +0000)]
Merge branch 'nyc-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp

8 years agoMulti-window optimizations #1
Jorim Jaggi [Mon, 8 Feb 2016 21:38:45 +0000 (21:38 +0000)]
Multi-window optimizations #1
am: 69abc194f3

* commit '69abc194f32b5c955ac7beaf6db37269d596172d':
  Multi-window optimizations #1

8 years agoMulti-window optimizations #1
Jorim Jaggi [Mon, 8 Feb 2016 21:37:43 +0000 (21:37 +0000)]
Multi-window optimizations #1
am: 69abc194f3

* commit '69abc194f32b5c955ac7beaf6db37269d596172d':
  Multi-window optimizations #1

8 years agoFix disappearing translucent status bar background
Jorim Jaggi [Mon, 8 Feb 2016 21:36:31 +0000 (21:36 +0000)]
Fix disappearing translucent status bar background
am: 0a13bfdefc

* commit '0a13bfdefc8a74a147bdf64b44e9f50c097c1599':
  Fix disappearing translucent status bar background

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 21:35:26 +0000 (21:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: e074f31c0d  -s ours

* commit 'e074f31c0dbd1ee33cdaa809311cae6eb5e2dec7':
  Import translations. DO NOT MERGE

8 years agoDo not update Record.visible if not setting visibility
Jorim Jaggi [Fri, 5 Feb 2016 20:41:17 +0000 (12:41 -0800)]
Do not update Record.visible if not setting visibility

In resumeTopActivityInnerLocked we only update the visibility
if not already visible, to avoid a black flicker. However, in the
interaction when docking a task from recents, makeVisible was
called but the conditions weren't met to make it actually visible,
but Record.visible was still set, leading that we didn't call
WM.setAppVisibility in resumeTopActivityInnerLocked

Bug: 27041808
Change-Id: I400470a5b31881542fedd3edb6a97e524666a8a3

8 years agoMulti-window optimizations #3
Jorim Jaggi [Fri, 5 Feb 2016 22:26:16 +0000 (14:26 -0800)]
Multi-window optimizations #3

- Make sure divider is pushing frames only if necessary
- When starting recents while docking, make sure no unnecessary
animations are played to reduce system load.

Change-Id: I536f009aef7282ed85dde79b853aeae62644f3e3

8 years agoMulti-window optimizations #2
Jorim Jaggi [Fri, 5 Feb 2016 03:49:28 +0000 (19:49 -0800)]
Multi-window optimizations #2

- Do not relaunch activities in stacks that are not visible during
resize.

Change-Id: Ia6bd17882c17db045450a466ba5347ce53e9b837

8 years agoMulti-window optimizations #1
Jorim Jaggi [Fri, 5 Feb 2016 03:34:00 +0000 (19:34 -0800)]
Multi-window optimizations #1

- When the window doesn't have a surface, do not add it to
mResizingWindows, so we don't report unnecessary resizes
- computeDragResizing => false when window is not visible, so we
never enter resizing mode even if the window decides to relayout
in the background

Change-Id: I8e6cdef86f1579d128973d4f2f12e87bf9b65524

8 years agoFix disappearing translucent status bar background
Jorim Jaggi [Fri, 5 Feb 2016 02:34:50 +0000 (18:34 -0800)]
Fix disappearing translucent status bar background

When relaunching an activity while preserving the window, the content
view was put on top of the status bar background, making it disappear
in case of translucent status bar backgrounds.

Change-Id: I1edff29c10616bf5386e982d7336327135f0f7a0

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 21:14:32 +0000 (21:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 21:10:39 +0000 (13:10 -0800)]
Import translations. DO NOT MERGE

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

8 years agoEnsure surfaces stay alive until activity stop. am: e12aece4ca
Robert Carr [Mon, 8 Feb 2016 20:59:35 +0000 (20:59 +0000)]
Ensure surfaces stay alive until activity stop. am: e12aece4ca
am: af444ef758

* commit 'af444ef7582bb7d76f3f6fc9782ed6bbdf7e6ebd':
  Ensure surfaces stay alive until activity stop.

8 years agoEnsure surfaces stay alive until activity stop.
Robert Carr [Mon, 8 Feb 2016 20:56:09 +0000 (20:56 +0000)]
Ensure surfaces stay alive until activity stop.
am: e12aece4ca

* commit 'e12aece4cad849efbbe6a806f132613a56699230':
  Ensure surfaces stay alive until activity stop.

8 years agoFix Fade transition interrupt. am: 5affef0773
George Mount [Mon, 8 Feb 2016 20:47:22 +0000 (20:47 +0000)]
Fix Fade transition interrupt. am: 5affef0773
am: dd22f16e71

* commit 'dd22f16e71e1e62797340544bd22f5919dec974c':
  Fix Fade transition interrupt.

8 years agoEnsure surfaces stay alive until activity stop.
Robert Carr [Wed, 3 Feb 2016 06:43:27 +0000 (22:43 -0800)]
Ensure surfaces stay alive until activity stop.

Prior to this commit in this case of activity pause, with finishing=true
the activity manager will notify us of app visibility and we will begin
an exit animation. When this exit animation finishes, we will destroy
the application surface (unless its eligible for saving). However there
are two cases where this breaks down:

1. The exit animation finishes before the activity thread handles
the stop transition. Many activities stop rendering on Pause
but many do not and it is totally legal to do so. Sometimes this
results in non fatal dequeue buffer errors and sometimes results in
fatal errors with Pixel Buffers, etc...
2. We may resume the activity shortly after asking the window manager
to pause it. If the window wasn't eligible for animation, we will
immediately destroy it after being told of the visibility change
following PAUSE_FINISHING. It's possible for this to complete
before we process the resume. On the other hand the client
happilly processes the resume and transitions back from PAUSE
and then crashes once it attempts to use it's surface.

In this commit we have the activity manager notify the window manager
when an application has actually finished (or we have timed out
waiting). For windows which have not been explicitly removed by the
client, we defer destruction until we have received both this signal
and the animation has completed.

Bug: 26793431
Change-Id: Ib6ee8fbdd1f03450fbbfd62468a19e97774befab

8 years agoFix Fade transition interrupt.
George Mount [Mon, 8 Feb 2016 20:41:17 +0000 (20:41 +0000)]
Fix Fade transition interrupt.
am: 5affef0773

* commit '5affef077316e73337eb42a098a126b01d20568e':
  Fix Fade transition interrupt.

8 years agoFix Fade transition interrupt.
George Mount [Thu, 4 Feb 2016 23:24:30 +0000 (15:24 -0800)]
Fix Fade transition interrupt.

Bug 26963113

When a Fade transition is interrupted and reversed, the
View started the animation from the beginning. This change
captures the previous transitionAlpha and starts the animation
from the previous alpha state.

Change-Id: I801fe9ade6af4cf8446838e231bdc71841668a18
(cherry picked from commit 3cf9fa3db0231d035142c27992818d8f7827ac3e)

8 years agoMerge "Fix Fade transition interrupt."
George Mount [Mon, 8 Feb 2016 20:33:34 +0000 (20:33 +0000)]
Merge "Fix Fade transition interrupt."

8 years agoMerge "Move graphics and JIT caches to DE storage." into nyc-dev am: 95728a5db6
Jeff Sharkey [Mon, 8 Feb 2016 20:25:56 +0000 (20:25 +0000)]
Merge "Move graphics and JIT caches to DE storage." into nyc-dev am: 95728a5db6
am: 13348d8c50

* commit '13348d8c50952b3887f76c5d1995718cc9ad30fc':
  Move graphics and JIT caches to DE storage.

8 years agoMerge "Whitelist camera permission for SetupWizard"
Steven Ng [Mon, 8 Feb 2016 20:24:09 +0000 (20:24 +0000)]
Merge "Whitelist camera permission for SetupWizard"

8 years agoFix Fade transition interrupt.
George Mount [Thu, 4 Feb 2016 23:24:30 +0000 (15:24 -0800)]
Fix Fade transition interrupt.

Bug 26963113

When a Fade transition is interrupted and reversed, the
View started the animation from the beginning. This change
captures the previous transitionAlpha and starts the animation
from the previous alpha state.

Change-Id: I801fe9ade6af4cf8446838e231bdc71841668a18

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev am: d1bbdeb86e -s ours
Geoff Mendal [Mon, 8 Feb 2016 20:15:29 +0000 (20:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am: d1bbdeb86e  -s ours
am: 4772309519  -s ours

* commit '477230951990588cfed453f8312d23fd5042a6a3':
  Import translations. DO NOT MERGE

8 years agoPermit setRetainInstance(true) on nested fragments, framework edition am: 44ba79e47d
Adam Powell [Mon, 8 Feb 2016 20:13:53 +0000 (20:13 +0000)]
Permit setRetainInstance(true) on nested fragments, framework edition am: 44ba79e47d
am: 711ae546b3

* commit '711ae546b3d2d96c5909d6e53305922d9036fe56':
  Permit setRetainInstance(true) on nested fragments, framework edition

8 years agoFragmentTransaction.commitNow, framework edition am: 8585ed66b9
Adam Powell [Mon, 8 Feb 2016 20:11:42 +0000 (20:11 +0000)]
FragmentTransaction.commitNow, framework edition am: 8585ed66b9
am: 793cb962d4

* commit '793cb962d49b3a7723747ceaea3906d187f01c57':
  FragmentTransaction.commitNow, framework edition

8 years agoPreserve compatibility for ViewGroup#showContextMenuForChild am: 2af189a0a7
Adam Powell [Mon, 8 Feb 2016 20:09:48 +0000 (20:09 +0000)]
Preserve compatibility for ViewGroup#showContextMenuForChild am: 2af189a0a7
am: af6a103933

* commit 'af6a10393355889a3a0e618d15cfb64da520c95d':
  Preserve compatibility for ViewGroup#showContextMenuForChild

8 years agoMerge branch \'nyc-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-androi...
Philip P. Moltmann [Mon, 8 Feb 2016 20:04:42 +0000 (20:04 +0000)]
Merge branch \'nyc-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp
am: e84c64c4a3

* commit 'e84c64c4a3d08df21f9d9c7a516e0b66a90a35b9':

8 years agoMerge "Clarify synchronization between PrintActivity and RemotePrintDocument" into...
Philip P. Moltmann [Mon, 8 Feb 2016 20:03:28 +0000 (20:03 +0000)]
Merge "Clarify synchronization between PrintActivity and RemotePrintDocument" into nyc-dev am: 199cb4dfe5
am: ae4d6e4daf

* commit 'ae4d6e4daf105952cf73a2a102678465a4c28aae':
  Clarify synchronization between PrintActivity and RemotePrintDocument

8 years agoTIF: Update the internal input list with new TvInputInfo am: abda420b9d
Jae Seo [Mon, 8 Feb 2016 20:01:15 +0000 (20:01 +0000)]
TIF: Update the internal input list with new TvInputInfo am: abda420b9d
am: 214818f596

* commit '214818f596c1b20fbfcacf62f830c45872da8c1f':
  TIF: Update the internal input list with new TvInputInfo

8 years agoMerge "Move graphics and JIT caches to DE storage." into nyc-dev
Jeff Sharkey [Mon, 8 Feb 2016 20:00:05 +0000 (20:00 +0000)]
Merge "Move graphics and JIT caches to DE storage." into nyc-dev
am: 95728a5db6

* commit '95728a5db6595e473acf8f428f238afc2fdbbe80':
  Move graphics and JIT caches to DE storage.

8 years agoMerge branch \'nyc-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-androi...
Felipe Leme [Mon, 8 Feb 2016 19:58:54 +0000 (19:58 +0000)]
Merge branch \'nyc-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp
am: 7a6a6d40dc

* commit '7a6a6d40dcc9b329dca3b1abf7fab833ae00c9c6':

8 years agoMerge "Replaced \'touch\' by \'tap\'." into nyc-dev am: ed330c7f7d
Felipe Leme [Mon, 8 Feb 2016 19:57:11 +0000 (19:57 +0000)]
Merge "Replaced \'touch\' by \'tap\'." into nyc-dev am: ed330c7f7d
am: 78da2a0a2e

* commit '78da2a0a2e59c3221697d4f0704c68393d7286e5':

8 years agoMerge "Replaced \'touch\' by \'tap\'." into nyc-dev am: ed330c7f7d
Felipe Leme [Mon, 8 Feb 2016 19:53:27 +0000 (19:53 +0000)]
Merge "Replaced \'touch\' by \'tap\'." into nyc-dev am: ed330c7f7d
am: ddbe34d8b5

* commit 'ddbe34d8b560b901539b3ae49136e9e411f17840':
  Replaced 'touch' by 'tap'.

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev am: 83f7ae9628 -s ours
Geoff Mendal [Mon, 8 Feb 2016 19:51:40 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 83f7ae9628  -s ours
am: 46f68a8dff  -s ours

* commit '46f68a8dff8f0039f085519c8491ac7663d4f1cf':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 19:50:43 +0000 (19:50 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: d1bbdeb86e  -s ours

* commit 'd1bbdeb86e5b6b83465440947dffc89de46a3f93':
  Import translations. DO NOT MERGE

8 years agoPermit setRetainInstance(true) on nested fragments, framework edition
Adam Powell [Mon, 8 Feb 2016 19:47:48 +0000 (19:47 +0000)]
Permit setRetainInstance(true) on nested fragments, framework edition
am: 44ba79e47d

* commit '44ba79e47d6db54e5501f994880fa09eb880c185':
  Permit setRetainInstance(true) on nested fragments, framework edition

8 years agoMerge "Move graphics and JIT caches to DE storage." into nyc-dev
Jeff Sharkey [Mon, 8 Feb 2016 19:47:20 +0000 (19:47 +0000)]
Merge "Move graphics and JIT caches to DE storage." into nyc-dev

8 years agoFragmentTransaction.commitNow, framework edition
Adam Powell [Mon, 8 Feb 2016 19:45:31 +0000 (19:45 +0000)]
FragmentTransaction.commitNow, framework edition
am: 8585ed66b9

* commit '8585ed66b947ef30d6a43f0bb91885ed0c5ebfb4':
  FragmentTransaction.commitNow, framework edition

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev am: 0d005fee78 -s ours
Geoff Mendal [Mon, 8 Feb 2016 19:45:04 +0000 (19:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 0d005fee78  -s ours
am: f7edd3accd  -s ours

* commit 'f7edd3accd7746b01f1b195b2659d8022ae8b695':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev am: f872232b45 -s ours
Geoff Mendal [Mon, 8 Feb 2016 19:43:01 +0000 (19:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am: f872232b45  -s ours
am: c805b74a32  -s ours

* commit 'c805b74a321084df1ef7ff9fb5dbce541462c347':
  Import translations. DO NOT MERGE

8 years agoPreserve compatibility for ViewGroup#showContextMenuForChild
Adam Powell [Mon, 8 Feb 2016 19:42:31 +0000 (19:42 +0000)]
Preserve compatibility for ViewGroup#showContextMenuForChild
am: 2af189a0a7

* commit '2af189a0a7962501b808cd50499d978a7cd10d81':
  Preserve compatibility for ViewGroup#showContextMenuForChild

8 years agoMerge branch 'nyc-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_...
Philip P. Moltmann [Mon, 8 Feb 2016 19:41:15 +0000 (19:41 +0000)]
Merge branch 'nyc-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp

8 years agoMerge "Clarify synchronization between PrintActivity and RemotePrintDocument" into...
Philip P. Moltmann [Mon, 8 Feb 2016 19:38:56 +0000 (19:38 +0000)]
Merge "Clarify synchronization between PrintActivity and RemotePrintDocument" into nyc-dev
am: 199cb4dfe5

* commit '199cb4dfe58bd5a4198cd414dcefd2b02d48548d':
  Clarify synchronization between PrintActivity and RemotePrintDocument

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev am: 1e2c97f9bc -s ours
Geoff Mendal [Mon, 8 Feb 2016 19:38:11 +0000 (19:38 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 1e2c97f9bc  -s ours
am: ec19a0c8c3  -s ours

* commit 'ec19a0c8c3af9044cc8bdac8bb90269bf1dcbea7':
  Import translations. DO NOT MERGE

8 years agoMerge "Clarify synchronization between PrintActivity and RemotePrintDocument" into...
Philip P. Moltmann [Mon, 8 Feb 2016 19:36:55 +0000 (19:36 +0000)]
Merge "Clarify synchronization between PrintActivity and RemotePrintDocument" into nyc-dev
am: 199cb4dfe5

* commit '199cb4dfe58bd5a4198cd414dcefd2b02d48548d':
  Clarify synchronization between PrintActivity and RemotePrintDocument

8 years agoMerge branch 'nyc-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_...
Jae Seo [Mon, 8 Feb 2016 19:36:55 +0000 (19:36 +0000)]
Merge branch 'nyc-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp

8 years agoTIF: Update the internal input list with new TvInputInfo
Jae Seo [Mon, 8 Feb 2016 19:35:44 +0000 (19:35 +0000)]
TIF: Update the internal input list with new TvInputInfo
am: abda420b9d

* commit 'abda420b9d2959776093230cd2e157a6080f2f64':
  TIF: Update the internal input list with new TvInputInfo

8 years agoImport translations. DO NOT MERGE am: 839aa9db82 -s ours
Geoff Mendal [Mon, 8 Feb 2016 19:35:36 +0000 (19:35 +0000)]
Import translations. DO NOT MERGE am: 839aa9db82  -s ours
am: 0a08b595d2  -s ours

* commit '0a08b595d29f4428479852cb46dbde330e4a4d63':
  Import translations. DO NOT MERGE

8 years agoTIF: Update the internal input list with new TvInputInfo
Jae Seo [Mon, 8 Feb 2016 19:34:55 +0000 (19:34 +0000)]
TIF: Update the internal input list with new TvInputInfo
am: abda420b9d

* commit 'abda420b9d2959776093230cd2e157a6080f2f64':
  TIF: Update the internal input list with new TvInputInfo

8 years agoMerge branch 'nyc-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_...
Felipe Leme [Mon, 8 Feb 2016 19:33:45 +0000 (19:33 +0000)]
Merge branch 'nyc-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp

8 years agoMerge "Replaced \'touch\' by \'tap\'." into nyc-dev
Felipe Leme [Mon, 8 Feb 2016 19:32:35 +0000 (19:32 +0000)]
Merge "Replaced \'touch\' by \'tap\'." into nyc-dev
am: ed330c7f7d

* commit 'ed330c7f7d98eabce8562ce34d5877a323c745ac':
  Replaced 'touch' by 'tap'.

8 years agoMerge "Replaced \'touch\' by \'tap\'." into nyc-dev
Felipe Leme [Mon, 8 Feb 2016 19:31:47 +0000 (19:31 +0000)]
Merge "Replaced \'touch\' by \'tap\'." into nyc-dev
am: ed330c7f7d

* commit 'ed330c7f7d98eabce8562ce34d5877a323c745ac':
  Replaced 'touch' by 'tap'.

8 years agoMerge "Update DND visual interruption choices." into nyc-dev am: ae0f0da91b
Julia Reynolds [Mon, 8 Feb 2016 19:29:26 +0000 (19:29 +0000)]
Merge "Update DND visual interruption choices." into nyc-dev am: ae0f0da91b
am: 044bb48d71

* commit '044bb48d71181790f79c9be11abc0563fee1ae44':
  Update DND visual interruption choices.

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 19:29:23 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 83f7ae9628  -s ours

* commit '83f7ae9628f7514373a23b0e42ded71874731702':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 19:27:36 +0000 (19:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 0d005fee78  -s ours

* commit '0d005fee78039155779b155639e0b95c5cbc87c6':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 19:25:33 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMove graphics and JIT caches to DE storage.
Jeff Sharkey [Mon, 8 Feb 2016 19:16:00 +0000 (12:16 -0700)]
Move graphics and JIT caches to DE storage.

We confirmed with the graphics and JIT teams that no sensitive
user data is written to these caches, so they're safe to point at DE
storage.

Since we don't have control over what is written by the app, we need
to keep the cache environment variable pointing at CE storage.

Fix ensurePrivateDirExists() to always return a path, instead of
returning null which can cause scary bugs.

Change packages.list to no longer canonicalize data paths, since
these fail when CE storage is still locked.

Bug: 27069522
Change-Id: Ifff64a036fa4aa1e61aa0dd98486bc711fbf8f4a

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 19:22:21 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: f872232b45  -s ours

* commit 'f872232b454363fd0f23b2d40dd3b0983306ad4e':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 19:22:17 +0000 (11:22 -0800)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev am: d65d343481 -s ours
Geoff Mendal [Mon, 8 Feb 2016 19:21:52 +0000 (19:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am: d65d343481  -s ours
am: 157ee3c01c  -s ours

* commit '157ee3c01c6c6f623c5820854cbfcfd479c2bbe4':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 19:20:15 +0000 (19:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 1e2c97f9bc  -s ours

* commit '1e2c97f9bc194502d8d7d561b4c3a4a71ec62c0f':
  Import translations. DO NOT MERGE

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Jason Monk [Mon, 8 Feb 2016 19:19:31 +0000 (19:19 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 19:18:52 +0000 (19:18 +0000)]
Import translations. DO NOT MERGE
am: 839aa9db82  -s ours

* commit '839aa9db820952cf58f5598cbdebd723310d885f':
  Import translations. DO NOT MERGE

8 years agoAdd support for auto-adding tiles
Jason Monk [Mon, 8 Feb 2016 19:18:50 +0000 (19:18 +0000)]
Add support for auto-adding tiles
am: c3f42c1024

* commit 'c3f42c102422f70f5bbe67105e16515ce9c306a3':
  Add support for auto-adding tiles

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Jason Monk [Mon, 8 Feb 2016 19:18:47 +0000 (19:18 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoAdd support for auto-adding tiles
Jason Monk [Mon, 8 Feb 2016 19:18:12 +0000 (19:18 +0000)]
Add support for auto-adding tiles
am: c3f42c1024

* commit 'c3f42c102422f70f5bbe67105e16515ce9c306a3':
  Add support for auto-adding tiles