OSDN Git Service

android-x86/frameworks-base.git
8 years agoDocument framework metrics meanings.
Zach Alcorn [Tue, 2 Feb 2016 19:57:55 +0000 (11:57 -0800)]
Document framework metrics meanings.

Change-Id: I5d9be781aecc3cbf8df8e8dc27b6d2bac7e0bf82

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 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 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 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 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 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

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

8 years agoMerge changes I5ca69f96,I15623fe8
Ben Wagner [Mon, 8 Feb 2016 19:16:43 +0000 (19:16 +0000)]
Merge changes I5ca69f96,I15623fe8

* changes:
  Deduplicate font file mappings.
  Add support for gx font variation axes.

8 years agoSettings drawer work
Jason Monk [Mon, 8 Feb 2016 19:15:45 +0000 (19:15 +0000)]
Settings drawer work
am: cafda1f90e

* commit 'cafda1f90ebf79ec3a56d43d8d3c0d63c9d84cb2':
  Settings drawer work

8 years agoSettings drawer work
Jason Monk [Mon, 8 Feb 2016 19:15:34 +0000 (19:15 +0000)]
Settings drawer work
am: cafda1f90e

* commit 'cafda1f90ebf79ec3a56d43d8d3c0d63c9d84cb2':
  Settings drawer work

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

* commit 'ae0f0da91b4017a84665dbe51ce13c0af54d862c':
  Update DND visual interruption choices.

8 years agoPermit setRetainInstance(true) on nested fragments, framework edition
Adam Powell [Fri, 5 Feb 2016 00:20:37 +0000 (16:20 -0800)]
Permit setRetainInstance(true) on nested fragments, framework edition

Save arbitrarily nested fragments across config changes as
nonconfiguration objects. This permits the use of retain-instance
child fragments as arbitrary opaque dependencies within other
fragments.

Change-Id: Ia6640b76cfcf7ec28ba252628957a0c14863e957
(cherry picked from commit 7466be66263d5ebffb786ea402d9ed6e36c254f0)

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

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

8 years agoFragmentTransaction.commitNow, framework edition
Adam Powell [Thu, 4 Feb 2016 23:38:20 +0000 (15:38 -0800)]
FragmentTransaction.commitNow, framework edition

Offer commitNow and commitNowAllowingStateLoss methods on Fragment for
use by encapsulated components using fragments as implementation
details. This can help prevent unexpected ordering side effects at the
app level when a call to a library method wants to commit and
immediately initialize a fragment as an implementation detail.

Note that this change still does not permit reentrant FragmentManager
operations. It is still an error to add/remove/change fragments in the
same FragmentManager while a fragment transaction is being executed.

Have the commonly used ViewPager adapters use commitNow instead of
executePendingTransactions.

Change-Id: Ia37a871234a287423063f0c2c3e4c93d69116cad
(cherry picked from commit f6b30662f87f7339d0d3946dcf71e930c2fead9b)

8 years agoPreserve compatibility for ViewGroup#showContextMenuForChild
Adam Powell [Fri, 5 Feb 2016 23:52:02 +0000 (15:52 -0800)]
Preserve compatibility for ViewGroup#showContextMenuForChild

Have the new showContextMenuForChild(View, float, float) call through
to the old showContextMenuForChild(View) before recursing up to its
parent. This ensures that existing apps with custom views that
override the old method still get called as expected if they implement
custom behavior.

Unlike some other similar circumstances we aren't implementing this to
be bidirectional as the new behavior doesn't need to be triggered by
invoking the old. If the older method is invoked explicitly we will
still show old-style dialog context menus instead of the newer popup
style since we won't have a good place to visually anchor a popup.

Bug 26919262

Change-Id: Ie09f922d322b5a24789c7867820c4bc43824c385
(cherry picked from commit 759a4c54004af6ac9f42c9c42496a5eb73c461ff)

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

8 years agoMerge changes Ia6640b76,Ia37a8712
Adam Powell [Mon, 8 Feb 2016 18:35:41 +0000 (18:35 +0000)]
Merge changes Ia6640b76,Ia37a8712

* changes:
  Permit setRetainInstance(true) on nested fragments, framework edition
  FragmentTransaction.commitNow, framework edition

8 years agoMerge "Preserve compatibility for ViewGroup#showContextMenuForChild"
Adam Powell [Mon, 8 Feb 2016 18:34:01 +0000 (18:34 +0000)]
Merge "Preserve compatibility for ViewGroup#showContextMenuForChild"

8 years agoTIF: Update the internal input list with new TvInputInfo
Jae Seo [Fri, 29 Jan 2016 03:13:04 +0000 (19:13 -0800)]
TIF: Update the internal input list with new TvInputInfo

Bug: 26864151, Bug: 26863281
Change-Id: I33e357aac74bceda50c794eb6057c363de9250b8
(cherry picked from commit 89a9937927e05a86938aa297a79047ce1a7c7d2d)

8 years agoMerge "TIF: Update the internal input list with new TvInputInfo"
Jae Seo [Mon, 8 Feb 2016 18:19:20 +0000 (18:19 +0000)]
Merge "TIF: Update the internal input list with new TvInputInfo"

8 years agoMerge "Replaced 'touch' by 'tap'." into nyc-dev
Felipe Leme [Mon, 8 Feb 2016 18:10:18 +0000 (18:10 +0000)]
Merge "Replaced 'touch' by 'tap'." into nyc-dev

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

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 8 Feb 2016 18:08:54 +0000 (18:08 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 17:54:37 +0000 (23:24 +0530)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 17:54:30 +0000 (18:54 +0100)]
Import translations. DO NOT MERGE

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

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

8 years agoReplaced 'touch' by 'tap'.
Felipe Leme [Mon, 8 Feb 2016 17:42:52 +0000 (09:42 -0800)]
Replaced 'touch' by 'tap'.

BUG: 26884266
Change-Id: Ic3d7be8a10b768101b161644e46c92cd872621db

8 years agoMerge "Update the subdir icon to svg."
Ben Kwa [Mon, 8 Feb 2016 17:41:22 +0000 (17:41 +0000)]
Merge "Update the subdir icon to svg."

8 years agoUpdate the subdir icon to svg.
Ben Kwa [Sat, 6 Feb 2016 00:05:14 +0000 (16:05 -0800)]
Update the subdir icon to svg.

BUG=21705832

Change-Id: I400b5402c0efd34d79be3e8b05b2154dd8c48735

8 years agoClarify synchronization between PrintActivity and RemotePrintDocument
Philip P. Moltmann [Wed, 3 Feb 2016 19:03:16 +0000 (11:03 -0800)]
Clarify synchronization between PrintActivity and RemotePrintDocument

The general theme of these changes is to always delay any action until
the printDocument finishes a command. This is done:
- Before callinng for into a different activity to select a name for the
  PDF
- Before finishing

The second theme is to fix the canceling behavior of
RemotePrintDocument.AsyncCommand.

There are four bugs fixed in this review:

(1)
When the RemotePrintDocument.AsyncCommand is canceled it goes into the
"canceling" state. When it is canceled again it should stay in this
state. Before it went to "canceled" but the command was still running.
(see AsyncCommand#cancel()).

(2)
When finishing the PrintActivity in PrintActivity.doFinish() we cancel
the RemotePrintDocument. If there is a command still in progress (i.e.
isUpdating()) and it finished as canceled we used to call doFinish()
again and then try to double-clean up which lead to exceptions.

The new behavior is that is the PrintActivity is calling doFinish()
while a command is still in progress (i.e. isUpdating()) we delay the
cleanup until the command finishes. The command might finish as
canceled, completed or failed. Hence we have to call doFinish() in the
callbacks for all three cases.

(3)
When canceling there might have still been a nextCommand ready, hence
canceling does not stop execution of the RemotePrintDocument which could
lead to running commands while finshing.

(4)
When getting the location to store the PDF at a command might still be
in progress. This lead to half executed commands and caused issues once
we try to continue after the select-location-activity returns

Bug: 24713704
Bug: 24973884
Change-Id: Ied90fe8dc9bd6ea7f8b3e4ce4f922e477015568d

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 17:22:34 +0000 (22:52 +0530)]
Import translations. DO NOT MERGE

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