OSDN Git Service

android-x86/frameworks-base.git
8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 6 Jul 2016 02:37:55 +0000 (19:37 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "IpConn metrics: use @IntDef" into nyc-mr1-dev
TreeHugger Robot [Tue, 5 Jul 2016 14:39:46 +0000 (14:39 +0000)]
Merge "IpConn metrics: use @IntDef" into nyc-mr1-dev

8 years agoIpConn metrics: use @IntDef
Hugo Benichi [Mon, 4 Jul 2016 02:28:05 +0000 (11:28 +0900)]
IpConn metrics: use @IntDef

Change-Id: Iae23f04abd3d1a43e7217f4fd641cd5fa61a7a1b

8 years agoMerge "IpConn metrics: correctly read RA lifetimes" into nyc-mr1-dev
Hugo Benichi [Tue, 5 Jul 2016 12:25:54 +0000 (12:25 +0000)]
Merge "IpConn metrics: correctly read RA lifetimes" into nyc-mr1-dev

8 years agoIpConn metrics: add dhcp transition times
Hugo Benichi [Fri, 1 Jul 2016 01:06:56 +0000 (10:06 +0900)]
IpConn metrics: add dhcp transition times

This patch adds lifetime durations of DhcpClient states to
DhcpClientEvents.

To record the duration of a state, the event is now recorded when the
DhcpClient state machine exits that state.

In addition this patch removes event logging of StoppedState,
DhcpState and DhcpHaveLeaseState.

Change-Id: Ibd37b5e3070f35113b6b45942b1e1ff19c27a90b

8 years agoIpConn metrics: correctly read RA lifetimes
Hugo Benichi [Mon, 4 Jul 2016 00:22:30 +0000 (09:22 +0900)]
IpConn metrics: correctly read RA lifetimes

This patch
  - adds a Builder class for RaEvent.
  - uses this Builder class for correctly recording the minimum
    lifetime seen for every ICMP6 options tracked, instead of
    recording the last lifetime seen.
  - adds unit test coverage for RaEvent logging.

Change-Id: I6443932f5cf7a613a5c695c65a60eab01e60602a

8 years agoMerge "Add test coverage for a bug in the lingering code." into nyc-mr1-dev
TreeHugger Robot [Tue, 5 Jul 2016 03:35:39 +0000 (03:35 +0000)]
Merge "Add test coverage for a bug in the lingering code." into nyc-mr1-dev

8 years agoMerge "Unbreak unregisterNetworkCallback." into nyc-mr1-dev
Lorenzo Colitti [Tue, 5 Jul 2016 02:07:04 +0000 (02:07 +0000)]
Merge "Unbreak unregisterNetworkCallback." into nyc-mr1-dev

8 years agoUnbreak unregisterNetworkCallback.
Lorenzo Colitti [Mon, 4 Jul 2016 16:22:13 +0000 (01:22 +0900)]
Unbreak unregisterNetworkCallback.

http://ag/1194313 broke unregisterNetworkCallback because the
system does not parcel the type of the request back to the app.
So when the app calls unregisterNetworkCallback, the
NetworkRequest that's passed in does not have a type and thus
doesn't match the request in mNetworkRequests.

Fix this by parceling over the type as well.

This was not caught by the unit test because the unit test all
runs in the same process with no parceling.

Bug: 23113288
Change-Id: I58b2ed651b9bf5cbdcca5b25c3ca24db53cffdf1

8 years agoMerge "Annotate public methods in ConnectivityService." into nyc-mr1-dev
TreeHugger Robot [Mon, 4 Jul 2016 16:07:32 +0000 (16:07 +0000)]
Merge "Annotate public methods in ConnectivityService." into nyc-mr1-dev

8 years agoMake registerDefaultNetwork work on metered networks.
Lorenzo Colitti [Fri, 1 Jul 2016 04:20:10 +0000 (13:20 +0900)]
Make registerDefaultNetwork work on metered networks.

Bug: 29927488
Change-Id: I3b705c2ab0d1493546ffa5185bb5b07d5e25c897

8 years agoAdd test coverage for a bug in the lingering code.
Lorenzo Colitti [Mon, 4 Jul 2016 07:24:16 +0000 (16:24 +0900)]
Add test coverage for a bug in the lingering code.

Bug: 23113288
Change-Id: I573ee5908b9d973931234eb7d2db8ea0aaa4b31e

8 years agoAnnotate public methods in ConnectivityService.
Lorenzo Colitti [Mon, 4 Jul 2016 03:55:44 +0000 (12:55 +0900)]
Annotate public methods in ConnectivityService.

Ensure every public method is annotated with why it's public.
This can be either an @Override or @VisibleForTesting annotation
or a comment explaining why it's public.

Bug: 29927488
Change-Id: I3582aef7997dc0d723718ca5e3dd115647d22979

8 years agoMerge "Update DocumentsUI to use theme colors." into nyc-mr1-dev
Andrew Sapperstein [Sat, 2 Jul 2016 02:57:21 +0000 (02:57 +0000)]
Merge "Update DocumentsUI to use theme colors." into nyc-mr1-dev

8 years agoUpdate DocumentsUI to use theme colors.
Andrew Sapperstein [Sat, 2 Jul 2016 00:59:07 +0000 (17:59 -0700)]
Update DocumentsUI to use theme colors.

Properly assigns the app's colors for primary, primaryDark, accent, etc
to the colors used by the framework.

Moves a couple colors that are alternate shades of the accent color
into the framework for ease of overlaying.

Deletes a few unused colors as well.

Finally, fixes a bug where colorControlActivated was not being
properly set due to the theme depending upon AppCompat. To
workaround this undefined behavior, we explicitly set
colorControlActivated to colorAccent which is what the framework
sets it to.

Change-Id: Ie0cba19b1b83a21f65692102df91bf4daf27dc44
Fixes: 29581883

8 years agoMerge \"Docs: Performance final changes\" into nyc-dev
David Friedman [Sat, 2 Jul 2016 00:26:14 +0000 (00:26 +0000)]
Merge \"Docs: Performance final changes\" into nyc-dev
am: 7e8d17d73e

Change-Id: I3ecd311bdd1374cfec29d95c303df70bfa868816

8 years agoMerge "Docs: Performance final changes" into nyc-dev
Joe Fernandez [Sat, 2 Jul 2016 00:15:20 +0000 (00:15 +0000)]
Merge "Docs: Performance final changes" into nyc-dev

8 years agoDocs: Performance final changes
David Friedman [Sat, 2 Jul 2016 00:11:02 +0000 (17:11 -0700)]
Docs: Performance final changes

Change-Id: I50e7a2e7b455ca3032da339e48a217ce713d1c40

8 years agoMerge "Clarify documentation of Display#getSize()" into nyc-mr1-dev
Andrii Kulian [Fri, 1 Jul 2016 23:49:37 +0000 (23:49 +0000)]
Merge "Clarify documentation of Display#getSize()" into nyc-mr1-dev

8 years agoMerge \"docs: performance: Reduce APK Sizes\" into nyc-dev
Eric Schmidt [Fri, 1 Jul 2016 23:26:05 +0000 (23:26 +0000)]
Merge \"docs: performance: Reduce APK Sizes\" into nyc-dev
am: d08b0e9969

Change-Id: If4153a0e3f3845d7640290b511da8c19f977a56f

8 years agoMerge "docs: performance: Reduce APK Sizes" into nyc-dev
Joe Fernandez [Fri, 1 Jul 2016 23:21:34 +0000 (23:21 +0000)]
Merge "docs: performance: Reduce APK Sizes" into nyc-dev

8 years agoMerge "Allow voice interaction window to control system bars" into nyc-mr1-dev
TreeHugger Robot [Fri, 1 Jul 2016 23:16:06 +0000 (23:16 +0000)]
Merge "Allow voice interaction window to control system bars" into nyc-mr1-dev

8 years agoMerge \"Docs: Job-scheduling doc for new DAC Performance section.\" into nyc-dev
David Friedman [Fri, 1 Jul 2016 23:13:31 +0000 (23:13 +0000)]
Merge \"Docs: Job-scheduling doc for new DAC Performance section.\" into nyc-dev
am: 1f64ea546b

Change-Id: Iabdad26cb23d6a318c93218328c5bffc31c515e5

8 years agoMerge \\\\\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\\\\" into lmp-dev...
fionaxu [Fri, 1 Jul 2016 23:08:50 +0000 (23:08 +0000)]
Merge \\\\\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\\\\" into lmp-dev am: 521efcd1e3  -s ours am: 7bd0eea999 am: 0828455ca9 am: caabaab8bc  -s ours am: 67f8e822ac am: f82ca1f3e9 am: 0f741391c3 am: 4000bdb3ea  -s ours
am: 1d5fbe43ab

Change-Id: Id1224508ffee2c49243c958159bea70c14d55b91

8 years agoMerge "Docs: Job-scheduling doc for new DAC Performance section." into nyc-dev
Joe Fernandez [Fri, 1 Jul 2016 23:08:47 +0000 (23:08 +0000)]
Merge "Docs: Job-scheduling doc for new DAC Performance section." into nyc-dev

8 years agoDocs: Job-scheduling doc for new DAC Performance section.
David Friedman [Fri, 1 Jul 2016 00:23:29 +0000 (17:23 -0700)]
Docs: Job-scheduling doc for new DAC Performance section.

Change-Id: Iccdbfcede6774bd7b5e368c53637ca8e194c7ec5

8 years agoMerge \\\\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\\\" into lmp-dev...
Chen Xu [Fri, 1 Jul 2016 23:02:11 +0000 (23:02 +0000)]
Merge \\\\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\\\" into lmp-dev am: 521efcd1e3  -s ours am: 7bd0eea999 am: 0828455ca9 am: caabaab8bc  -s ours am: 67f8e822ac am: f82ca1f3e9 am: 0f741391c3
am: 4000bdb3ea  -s ours

Change-Id: I7a010f957438467d2edfb10a28a364527dac492e

8 years agodocs: performance: Reduce APK Sizes
Eric Schmidt [Fri, 24 Jun 2016 18:30:24 +0000 (11:30 -0700)]
docs: performance: Reduce APK Sizes

Bug: 29152053
Change-Id: I5aa4e7d59c32ef5d6897a47263e055358b1c9dda

8 years agoMerge \\\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\\" into lmp-dev am...
fionaxu [Fri, 1 Jul 2016 22:55:45 +0000 (22:55 +0000)]
Merge \\\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\\" into lmp-dev am: 521efcd1e3  -s ours am: 7bd0eea999 am: 0828455ca9 am: caabaab8bc  -s ours am: 67f8e822ac am: f82ca1f3e9
am: 0f741391c3

Change-Id: I9748b9d7b065a6d2bbd9c2a3061409c58b53d261

8 years agoMerge \\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\" into lmp-dev am...
Chen Xu [Fri, 1 Jul 2016 22:45:46 +0000 (22:45 +0000)]
Merge \\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\" into lmp-dev am: 521efcd1e3  -s ours am: 7bd0eea999 am: 0828455ca9 am: caabaab8bc  -s ours am: 67f8e822ac
am: f82ca1f3e9

Change-Id: Ib714c74aa3bede2bea496204b7d1cb7ff2380dca

8 years agoMerge \"Docs: Final edits for initial release of this doc for Performance section...
David Friedman [Fri, 1 Jul 2016 22:38:29 +0000 (22:38 +0000)]
Merge \"Docs: Final edits for initial release of this doc for Performance section of DAC.\" into nyc-dev
am: 106f69c8a6

Change-Id: I87fada8679688beef00f7df07fbe4a7e6e06852f

8 years agoMerge \\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\" into lmp-dev am: 521ef...
fionaxu [Fri, 1 Jul 2016 22:38:28 +0000 (22:38 +0000)]
Merge \\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\" into lmp-dev am: 521efcd1e3  -s ours am: 7bd0eea999 am: 0828455ca9 am: caabaab8bc  -s ours
am: 67f8e822ac

Change-Id: I54214d329e81a59e418cc9f4a5ff150b6348a8c2

8 years agoMerge \\\\"DO NOT MERGE revert public api loadSafeLabel\\\\" into lmp-dev am: 521efcd...
Chen Xu [Fri, 1 Jul 2016 22:32:05 +0000 (22:32 +0000)]
Merge \\\\"DO NOT MERGE revert public api loadSafeLabel\\\\" into lmp-dev am: 521efcd1e3  -s ours am: 7bd0eea999 am: 0828455ca9
am: caabaab8bc  -s ours

Change-Id: If1a5d01375b2a4e503ddf93bba5e009754889d44

8 years agoMerge "Docs: Final edits for initial release of this doc for Performance section...
Joe Fernandez [Fri, 1 Jul 2016 22:21:29 +0000 (22:21 +0000)]
Merge "Docs: Final edits for initial release of this doc for Performance section of DAC." into nyc-dev

8 years agoMerge \\\"DO NOT MERGE revert public api loadSafeLabel\\\" into lmp-dev am: 521efcd1e...
fionaxu [Fri, 1 Jul 2016 22:16:10 +0000 (22:16 +0000)]
Merge \\\"DO NOT MERGE revert public api loadSafeLabel\\\" into lmp-dev am: 521efcd1e3  -s ours am: 7bd0eea999
am: 0828455ca9

Change-Id: Ie1d5e38af7c3c49eb69f61e379096b17dd004961

8 years agoMerge \\"DO NOT MERGE revert public api loadSafeLabel\\" into lmp-dev am: 521efcd1e3...
Chen Xu [Fri, 1 Jul 2016 22:09:39 +0000 (22:09 +0000)]
Merge \\"DO NOT MERGE revert public api loadSafeLabel\\" into lmp-dev am: 521efcd1e3  -s ours
am: 7bd0eea999

Change-Id: I4ae23825fcef45856aa8551725c38fba0dd4892a

8 years agoMerge \"Docs: Performance section\" into nyc-dev
David Friedman [Fri, 1 Jul 2016 21:59:26 +0000 (21:59 +0000)]
Merge \"Docs: Performance section\" into nyc-dev
am: a3d9b5c22e

Change-Id: I826858e55856a4a4d2e519a45324fbdedf85df9b

8 years agoMerge \"DO NOT MERGE revert public api loadSafeLabel\" into lmp-dev
fionaxu [Fri, 1 Jul 2016 21:59:03 +0000 (21:59 +0000)]
Merge \"DO NOT MERGE revert public api loadSafeLabel\" into lmp-dev
am: 521efcd1e3  -s ours

Change-Id: I278455eb32488b221de93acd52b64956149cad54

8 years agoMerge "update GlSurfaceView:onPause/Resume docs" into nyc-mr1-dev
John Reck [Fri, 1 Jul 2016 21:49:55 +0000 (21:49 +0000)]
Merge "update GlSurfaceView:onPause/Resume docs" into nyc-mr1-dev

8 years agoMerge \"Docs: Launch-time performance doc for upcoming Performance section on DAC...
David Friedman [Fri, 1 Jul 2016 21:46:33 +0000 (21:46 +0000)]
Merge \"Docs: Launch-time performance doc for upcoming Performance section on DAC.\" into nyc-dev
am: a8fa5ffbbc

Change-Id: If224c8c8d0fd3875ad5d8d895577047ead33b5e8

8 years agoMerge "DO NOT MERGE revert public api loadSafeLabel" into lmp-dev
Chen Xu [Fri, 1 Jul 2016 21:44:05 +0000 (21:44 +0000)]
Merge "DO NOT MERGE revert public api loadSafeLabel" into lmp-dev

8 years agoMerge "Always send task stack change updates if PiP is enabled" into nyc-mr1-dev
Andrii Kulian [Fri, 1 Jul 2016 21:39:38 +0000 (21:39 +0000)]
Merge "Always send task stack change updates if PiP is enabled" into nyc-mr1-dev

8 years agoMerge "Don't update task to return to type for last task over home" into nyc-mr1-dev
Andrii Kulian [Fri, 1 Jul 2016 21:38:43 +0000 (21:38 +0000)]
Merge "Don't update task to return to type for last task over home" into nyc-mr1-dev

8 years agoMerge "Docs: Performance section" into nyc-dev
Joe Fernandez [Fri, 1 Jul 2016 21:37:29 +0000 (21:37 +0000)]
Merge "Docs: Performance section" into nyc-dev

8 years agoAllow voice interaction window to control system bars
Jorim Jaggi [Tue, 28 Jun 2016 23:25:23 +0000 (16:25 -0700)]
Allow voice interaction window to control system bars

Fixes: 29777675
Change-Id: I452bfa46cfdeb6ffa1f36c718df9bc7184fa74f7

8 years agoDocs: Performance section
David Friedman [Fri, 29 Apr 2016 21:57:31 +0000 (14:57 -0700)]
Docs: Performance section

Change-Id: I97d10159ca9f7698741ce0ff23f87e4866848b1d

8 years agoDocs: New doc on optimizing view hierarchies for upcoming Performance section
David Friedman [Fri, 1 Jul 2016 21:35:13 +0000 (21:35 +0000)]
Docs: New doc on optimizing view hierarchies for upcoming Performance section
am: 448bb5762a

Change-Id: I1134905309cf12f68f0d92c16db00b9d137b21ab

8 years agoMerge "Docs: Launch-time performance doc for upcoming Performance section on DAC...
Joe Fernandez [Fri, 1 Jul 2016 21:29:30 +0000 (21:29 +0000)]
Merge "Docs: Launch-time performance doc for upcoming Performance section on DAC." into nyc-dev

8 years agoMerge \"Docs: Add page about threads to the upcoming DAC Performance site area.\...
David Friedman [Fri, 1 Jul 2016 21:20:29 +0000 (21:20 +0000)]
Merge \"Docs: Add page about threads to the upcoming DAC Performance site area.\" into nyc-dev
am: 868a92f11b

Change-Id: I7ddb54aa8be6ee9d8db0f70a35e430dea4f601ed

8 years agoDocs: Final edits for initial release of this doc for Performance section of DAC.
David Friedman [Fri, 1 Jul 2016 21:19:10 +0000 (14:19 -0700)]
Docs: Final edits for initial release of this doc for Performance section of DAC.

Change-Id: I1e9ec2bb7c79455ec87545c7bb6db812adfa97ae

8 years agoDocs: New doc on optimizing view hierarchies for upcoming Performance section
David Friedman [Mon, 20 Jun 2016 23:13:56 +0000 (16:13 -0700)]
Docs: New doc on optimizing view hierarchies for upcoming Performance section

Bug: 29514404

This is part of the new Performance section to be launched on DAC soon.

Change-Id: Ib590a97f9b7696251edbdecb28305933014483b7

8 years agoMerge "Docs: Add page about threads to the upcoming DAC Performance site area." into...
Joe Fernandez [Fri, 1 Jul 2016 21:05:58 +0000 (21:05 +0000)]
Merge "Docs: Add page about threads to the upcoming DAC Performance site area." into nyc-dev

8 years agoMerge "Clarify Picture docs on playback" into nyc-mr1-dev
John Reck [Fri, 1 Jul 2016 20:41:22 +0000 (20:41 +0000)]
Merge "Clarify Picture docs on playback" into nyc-mr1-dev

8 years agoMerge "Telephony multi-endpoint disconnect causes." into nyc-mr1-dev
Tyler Gunn [Fri, 1 Jul 2016 20:23:15 +0000 (20:23 +0000)]
Merge "Telephony multi-endpoint disconnect causes." into nyc-mr1-dev

8 years agoClarify documentation of Display#getSize()
Andrii Kulian [Wed, 29 Jun 2016 01:41:42 +0000 (18:41 -0700)]
Clarify documentation of Display#getSize()

Bug: 25945436
Change-Id: I8574faf56427f4a6fb7155c08e31ef1e0bdb2cfa

8 years agoMerge "Force lock icon animations on UI thread" into nyc-mr1-dev
TreeHugger Robot [Fri, 1 Jul 2016 19:32:49 +0000 (19:32 +0000)]
Merge "Force lock icon animations on UI thread" into nyc-mr1-dev

8 years agoMerge changes I38cff63b,Id3739bbc,If052cd8c into nyc-mr1-dev
TreeHugger Robot [Fri, 1 Jul 2016 19:27:35 +0000 (19:27 +0000)]
Merge changes I38cff63b,Id3739bbc,If052cd8c into nyc-mr1-dev

* changes:
  Fix synchronization error for Seamless rotation.
  Disable seamless rotation while animating.
  Force CROSSFADE rotation when launching from double tap gesture.

8 years agoAlways send task stack change updates if PiP is enabled
Andrii Kulian [Fri, 1 Jul 2016 00:51:32 +0000 (17:51 -0700)]
Always send task stack change updates if PiP is enabled

PiP stack repositioning is triggered when task stack change
is detected. Usually these updates are sent when there was
a visibility change since last pause. In case when we're
navigating from setting back to launcher on TV there is no
visibility change. This happened to work in most cases
because PipOverlayActivity was shown or hidden somewhere
between user actions.

This CL always notifies about task stack changes if pinned
stack is present on activity pause.

Bug: 29344059
Change-Id: I5ab3f2b8a97983fcb79d58626b6494f8ec31dbf3

8 years agoMerge "Merge \"Delete the NDK docs from Git. They\'re now in Piper, as per: https...
Android Build Merger (Role) [Fri, 1 Jul 2016 19:17:34 +0000 (19:17 +0000)]
Merge "Merge \"Delete the NDK docs from Git. They\'re now in Piper, as per: https://critique.corp.google.com/#review/126357681\" into nyc-dev am: 5460fef952" into nyc-mr1-dev

8 years agoMerge "Fix navigation bar order in seascape" into nyc-mr1-dev
Adrian Roos [Fri, 1 Jul 2016 19:17:13 +0000 (19:17 +0000)]
Merge "Fix navigation bar order in seascape" into nyc-mr1-dev

8 years agoMerge \"Delete the NDK docs from Git. They\'re now in Piper, as per: https://critique...
smain@google.com [Fri, 1 Jul 2016 19:17:10 +0000 (19:17 +0000)]
Merge \"Delete the NDK docs from Git. They\'re now in Piper, as per: https://critique.corp.google.com/#review/126357681\" into nyc-dev
am: 5460fef952

Change-Id: I7c9c8b7091a974b01b72cf192651f3c44ed7ee87

8 years agoMerge "Delete the NDK docs from Git. They're now in Piper, as per: https://critique...
Scott Main [Fri, 1 Jul 2016 19:07:29 +0000 (19:07 +0000)]
Merge "Delete the NDK docs from Git. They're now in Piper, as per: https://critique.corp.google.com/#review/126357681" into nyc-dev

8 years agoMerge "null check jarfile before using" into nyc-mr1-dev
TreeHugger Robot [Fri, 1 Jul 2016 19:00:55 +0000 (19:00 +0000)]
Merge "null check jarfile before using" into nyc-mr1-dev

8 years agoFix synchronization error for Seamless rotation.
Robert Carr [Thu, 30 Jun 2016 22:20:37 +0000 (15:20 -0700)]
Fix synchronization error for Seamless rotation.

Missing synchronized block in timeout codepath.

Bug: 28823590
Change-Id: I38cff63b559b5f8cd65698af27a1100208ff2600

8 years agoDisable seamless rotation while animating.
Robert Carr [Thu, 30 Jun 2016 21:36:27 +0000 (14:36 -0700)]
Disable seamless rotation while animating.

Neither the animation code or the seamless rotation
code is equipped to handle it.

Bug: 28838855
Change-Id: Id3739bbc4335936cf3647af4ff97dd4efc134b65

8 years agoForce CROSSFADE rotation when launching from double tap gesture.
Robert Carr [Wed, 29 Jun 2016 23:41:50 +0000 (16:41 -0700)]
Force CROSSFADE rotation when launching from double tap gesture.

When activity transition triggers a rotation change, the starting
window will normally be the top window at the time we try
to select the window animation. However, these layout params won't
have the apps rotation animation set (as the client code will set that
on the real window, not the starting window). Eventually we would
like to add API to specify rotation animation via manifest to solve
this problem cleanly. In the mean time, we can force a specific rotation
animation from the double tap gesture, and clean up some camera
ugliness. We accomplish this by attaching an animation hint to
ActivityOptions.

Bug: 28838855
Change-Id: If052cd8cbae76651da43f3b4c590cd9dcc1afc0f

8 years agoMerge "Use category DEFAULT home actions" into nyc-mr1-dev
TreeHugger Robot [Fri, 1 Jul 2016 17:48:34 +0000 (17:48 +0000)]
Merge "Use category DEFAULT home actions" into nyc-mr1-dev

8 years agoMerge \"Revert \"Revert \"docs: Add Videos section to N Preview landing page\"\"...
Joe Fernandez [Fri, 1 Jul 2016 17:39:50 +0000 (17:39 +0000)]
Merge \"Revert \"Revert \"docs: Add Videos section to N Preview landing page\"\"\" into nyc-dev
am: 9dc8ede619

Change-Id: Ib67ebea43044f8866f81234f966bfced4242afc7

8 years agoMerge "Revert "Revert "docs: Add Videos section to N Preview landing page""" into...
Joe Fernandez [Fri, 1 Jul 2016 17:28:40 +0000 (17:28 +0000)]
Merge "Revert "Revert "docs: Add Videos section to N Preview landing page""" into nyc-dev

8 years agonull check jarfile before using
Todd Kennedy [Fri, 1 Jul 2016 17:20:20 +0000 (10:20 -0700)]
null check jarfile before using

Bug: 29937423
Change-Id: I14f8530523bedf6c287a7f89d3e54919d98454c9

8 years agoMerge "Make sure re-published dynamic shortcuts are always enabled" into nyc-mr1-dev
Makoto Onuki [Fri, 1 Jul 2016 16:40:24 +0000 (16:40 +0000)]
Merge "Make sure re-published dynamic shortcuts are always enabled" into nyc-mr1-dev

8 years agoMerge "ShortcutManager: Make sure persisted default launcher still exists." into...
Makoto Onuki [Fri, 1 Jul 2016 16:32:39 +0000 (16:32 +0000)]
Merge "ShortcutManager: Make sure persisted default launcher still exists." into nyc-mr1-dev

8 years agoMerge \\\\"Always apply config updates.\\\\" into mnc-dr-dev am: f437bd068c am: 2a448...
Julia Reynolds [Fri, 1 Jul 2016 16:29:42 +0000 (16:29 +0000)]
Merge \\\\"Always apply config updates.\\\\" into mnc-dr-dev am: f437bd068c am: 2a44859c21 am: 005394cd01  -s ours
am: 7e2ae2b143

Change-Id: I17b031b52b826bb288090bc737a41a8863cbde95

8 years agoMerge \\\"Always apply config updates.\\\" into mnc-dr-dev am: f437bd068c am: 2a44859c21
Julia Reynolds [Fri, 1 Jul 2016 16:23:48 +0000 (16:23 +0000)]
Merge \\\"Always apply config updates.\\\" into mnc-dr-dev am: f437bd068c am: 2a44859c21
am: 005394cd01  -s ours

Change-Id: I45ff9548eb6091ecbcf9e45e0fddb2cbcebc889d

8 years agoMerge "QS: Make edit non-clickable when collapsed" into nyc-mr1-dev
TreeHugger Robot [Fri, 1 Jul 2016 16:06:22 +0000 (16:06 +0000)]
Merge "QS: Make edit non-clickable when collapsed" into nyc-mr1-dev

8 years agoMerge "Add metrics for toll-free/travel-abroad buttons in Settings" into nyc-mr1-dev
Fan Zhang [Fri, 1 Jul 2016 16:04:12 +0000 (16:04 +0000)]
Merge "Add metrics for toll-free/travel-abroad buttons in Settings" into nyc-mr1-dev

8 years agoMerge "Prevent PrintRegistry callbacks when finishing" into nyc-mr1-dev
TreeHugger Robot [Fri, 1 Jul 2016 15:41:59 +0000 (15:41 +0000)]
Merge "Prevent PrintRegistry callbacks when finishing" into nyc-mr1-dev

8 years agoMerge "N MR1 is API 25" into nyc-mr1-dev
TreeHugger Robot [Fri, 1 Jul 2016 15:34:12 +0000 (15:34 +0000)]
Merge "N MR1 is API 25" into nyc-mr1-dev

8 years agoMerge \\"Always apply config updates.\\" into mnc-dr-dev am: f437bd068c
Julia Reynolds [Fri, 1 Jul 2016 15:31:52 +0000 (15:31 +0000)]
Merge \\"Always apply config updates.\\" into mnc-dr-dev am: f437bd068c
am: 2a44859c21

Change-Id: I1462c5cc78001f6be749f518c861c7fcc771f90f

8 years agoMerge \"Always apply config updates.\" into mnc-dr-dev
Julia Reynolds [Fri, 1 Jul 2016 15:26:58 +0000 (15:26 +0000)]
Merge \"Always apply config updates.\" into mnc-dr-dev
am: f437bd068c

Change-Id: I899b923c075a5f3351c4791a23a94adf123d1247

8 years agoMerge "Always apply config updates." into mnc-dr-dev
Julia Reynolds [Fri, 1 Jul 2016 15:21:23 +0000 (15:21 +0000)]
Merge "Always apply config updates." into mnc-dr-dev

8 years agoMerge changes from topic 'networkrequest_private' into nyc-mr1-dev
Lorenzo Colitti [Fri, 1 Jul 2016 15:12:52 +0000 (15:12 +0000)]
Merge changes from topic 'networkrequest_private' into nyc-mr1-dev

* changes:
  Make the NetworkRequest list private to NetworkAgentInfo.
  Move the request type from NetworkRequestInfo to NetworkRequest.

8 years agoQS: Make edit non-clickable when collapsed
Jason Monk [Fri, 1 Jul 2016 14:25:16 +0000 (10:25 -0400)]
QS: Make edit non-clickable when collapsed

Change-Id: I44e289b3692a41f7cdc1491c1d45c446612546ee
Fixes: 29521073

8 years agoUse category DEFAULT home actions
Todd Kennedy [Fri, 1 Jul 2016 13:55:41 +0000 (06:55 -0700)]
Use category DEFAULT home actions

When querying for activities that support action HOME, only consider
those that also have category DEFAULT.

Bug: 29899206
Change-Id: I0cd95c90dff5ed90896205eb6c0ec9be1306eb25

8 years agoN MR1 is API 25
Michael Wright [Wed, 29 Jun 2016 14:47:16 +0000 (15:47 +0100)]
N MR1 is API 25

Also, finalize resource IDs for N MR1

Bug: 29816674
Change-Id: Ie880adb2544f4e2e32b439fe975a68a3928e6fe5

8 years agoMerge "add neko metrics" into nyc-mr1-dev
Chris Wren [Fri, 1 Jul 2016 13:41:35 +0000 (13:41 +0000)]
Merge "add neko metrics" into nyc-mr1-dev

8 years agoMerge "QS: Fix clipping for some font sizes" into nyc-mr1-dev
Jason Monk [Fri, 1 Jul 2016 13:25:09 +0000 (13:25 +0000)]
Merge "QS: Fix clipping for some font sizes" into nyc-mr1-dev

8 years agoMerge "Quick settings icons have focus" into nyc-mr1-dev
TreeHugger Robot [Fri, 1 Jul 2016 13:24:29 +0000 (13:24 +0000)]
Merge "Quick settings icons have focus" into nyc-mr1-dev

8 years agoMake the NetworkRequest list private to NetworkAgentInfo.
Lorenzo Colitti [Thu, 30 Jun 2016 16:37:11 +0000 (01:37 +0900)]
Make the NetworkRequest list private to NetworkAgentInfo.

This allows us to keep track of how many live requests a network
is satisfying without having to count them every time.

Bug: 23113288
Change-Id: Ic4756676491e09071dbf80b7c48da3be028d68eb

8 years agoMove the request type from NetworkRequestInfo to NetworkRequest.
Lorenzo Colitti [Fri, 1 Jul 2016 04:19:21 +0000 (13:19 +0900)]
Move the request type from NetworkRequestInfo to NetworkRequest.

This will allow us to simplify code that deals with
NetworkRequests outside ConnectivityService.

Bug: 23113288
Change-Id: I9b3a859d0c68cad73d7f6baa4b584d13ffd2ae36

8 years agoForce lock icon animations on UI thread
Jorim Jaggi [Fri, 1 Jul 2016 02:11:38 +0000 (19:11 -0700)]
Force lock icon animations on UI thread

Change-Id: Ibe1936a09f475a9ec2ba5c838a66dffb9fd8f99b
Fixes: 29900888

8 years agoMerge "Disabling account modification on demo users" into nyc-mr1-dev
TreeHugger Robot [Fri, 1 Jul 2016 01:17:32 +0000 (01:17 +0000)]
Merge "Disabling account modification on demo users" into nyc-mr1-dev

8 years agoMerge "Automatically grant URI permission as needed." into nyc-mr1-dev
Yohei Yukawa [Fri, 1 Jul 2016 01:09:54 +0000 (01:09 +0000)]
Merge "Automatically grant URI permission as needed." into nyc-mr1-dev

8 years agoDon't update task to return to type for last task over home
Andrii Kulian [Tue, 28 Jun 2016 23:34:02 +0000 (16:34 -0700)]
Don't update task to return to type for last task over home

Resizing docked stack to fullscreen size results in dismissal of
docked stack and moving of tasks to fullscreen stack. When tasks,
which were originally launched from home or recents, are inserted
on top of fullscreen stack, their mTaskToReturnTo value was
overwritten.
This CL doesn't allow to overwrite this field of task if there is
no next task in stack and it was launched from home or recents.

Also this reveals issue b/29342752. When app is moved to PiP mode,
system UI shows another overlay activity in separate task in PiP
stack with hint to user. In ActivityStarter#startActivityUnchecked
some logic assumes that new activity is launched from focused stack.
But PiP stack is not focusable, so we end up thinking that overlay
activity was launched from home stack. This sets mTaskToReturnTo of
overlay task to HOME_ACTIVITY_TYPE instead of
APPLICATION_ACTIVITY_TYPE.
This CL checks if stack id is specified and checks preferred stack
if available instead of currently focused one.

Bug: 29237751
Change-Id: I3a55b84d6a57be758705db51dec60592683e4e02

8 years agoShortcutManager: Make sure persisted default launcher still exists.
Makoto Onuki [Thu, 30 Jun 2016 00:34:02 +0000 (17:34 -0700)]
ShortcutManager: Make sure persisted default launcher still exists.

- Also make sure to ignore unexported activities.
(e.g. unexported activities shouldn't have shortcuts.)

- Also add unit tests for package manager related operations.

- Also remove stale TODOs (per-activity shortcut count check is
implemented already.)

Bug 29699769
Bug 29516954

Change-Id: Ia18301baf6bec1ad71ae195d9ae3d10bd8386fc4

8 years agoMake sure SELinux labels are correct after move-to operations
Christopher Tate [Fri, 1 Jul 2016 00:29:33 +0000 (00:29 +0000)]
Make sure SELinux labels are correct after move-to operations
am: fa7d97fa15

Change-Id: I913e54c6269f75b10b51030d0b2921007107281d

8 years agoMake sure SELinux labels are correct after move-to operations
Christopher Tate [Thu, 30 Jun 2016 19:21:57 +0000 (12:21 -0700)]
Make sure SELinux labels are correct after move-to operations

In some circumstances wallpaper-related files are moved into position,
and must then take proper effect.  Make sure that they have the
correct SELinux labels afterwards to avoid preventing some valid
accesses.

Bug 29469965

Change-Id: I6d7c86be63d568fa0ad8841d109a7ff2149fdd54

8 years agoMake sure re-published dynamic shortcuts are always enabled
Makoto Onuki [Fri, 1 Jul 2016 00:07:25 +0000 (17:07 -0700)]
Make sure re-published dynamic shortcuts are always enabled

- Originally there was explicit code to take over the disabled flag,
which was simply not necessary.

- Also fix the startShortcut() tests that have temporarily
been disabled.

(Also remove the stale TODOs to avoid conflict with Ia18301ba)

Bug 29633681

Change-Id: I58b12ad6918d7fef4b79059b0c2c7f2df6e32269

8 years agoDO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 am: a0263a9909 am: a3b851...
fionaxu [Thu, 30 Jun 2016 23:45:10 +0000 (23:45 +0000)]
DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 am: a0263a9909 am: a3b851d352  -s ours am: f52501d2d4  -s ours am: cbb7b8c7a4 am: c666ebef33 am: 1e1974705b  -s ours am: c7824b3de3 am: 0b2c2b2a8c am: b281795c12 am: 17414d65fa  -s ours
am: 4ce343881c

Change-Id: Iead6e156fdf407e2cadc992bffd8c2df2322f25f

8 years agoAdd metrics for toll-free/travel-abroad buttons in Settings
Fan Zhang [Thu, 30 Jun 2016 19:26:55 +0000 (12:26 -0700)]
Add metrics for toll-free/travel-abroad buttons in Settings

Bug: 29105266
Change-Id: I44cf2bdc3b01d0755e0305e8c26e6bf871ae9d52