Commit Graph

246497 Commits

Author SHA1 Message Date
Cheryl Potter
4363c43a67 Merge "docs: Update SDK Manager for 2.0 changes b/26385384" into mnc-mr-docs
am: 0f6ab24

* commit '0f6ab24210bac24d459cc85a04f0887208f420f9':
  docs: Update SDK Manager for 2.0 changes b/26385384

Change-Id: I3eecf754f8750f0c150c82d3c5fb2eb3adf709d7
2016-04-25 23:47:28 +00:00
Cheryl Potter
559648aa17 docs: Update SDK Manager for 2.0 changes b/26385384
am: 5f153b5

* commit '5f153b5cb001697b85dd9f6baa8239bcff4bb6e3':
  docs: Update SDK Manager for 2.0 changes b/26385384

Change-Id: I363a534c8789db06cea48a15186ebdfcc7ca9861
2016-04-25 23:47:26 +00:00
Cheryl Potter
5f153b5cb0 docs: Update SDK Manager for 2.0 changes
b/26385384

Change-Id: Ib343c46bbfb6d07aea418a43ec03e992a4883980
(cherry picked from commit b558743ca3)
2016-04-25 23:35:04 +00:00
Cheryl Potter
0f6ab24210 Merge "docs: Update SDK Manager for 2.0 changes b/26385384" into mnc-mr-docs 2016-04-25 23:34:43 +00:00
Oren Blasberg
7b457455c4 Don't show icons for top level menus unless forced.
Prior to this CL, the cascading implementation would evaluate the
contents of the menu to determine whether to show an icon for this case.
However, the policy we have upheld is that top level menus should
never show an icon for this case. (Unless setForceShowIcon(true) was
called.)

Bug: 28275346
Change-Id: I09423596d49742aa7a9ba7245702c099581c0b48
2016-04-25 16:17:18 -07:00
Dirk Dougherty
5a029439be Remove static _book.yaml in favor of generated version (samples_navtree_data.cs).
Change-Id: I3c42e4573cf2b6e89c68bb32bf65a763071dc862
2016-04-25 16:10:43 -07:00
Shreyas Basarge
a4ac5ab850 Wait for JobService to start before scheduling syncs
Add code to wait for SycJobService to pass back an
instance of itself after boot before allowing syncs
to be scheduled. 

Also removes unused constant MESSAGE_SYNC_EXPIRED.

Bug: 28380795
Change-Id: I616ba5c74578a81ff1e37ba4bd1fd937ce5c006d
2016-04-25 23:04:32 +00:00
Oren Blasberg
93c195894d Show cascading popup menus if screen is big enough.
...even if in split screen mode.

Bug: 28175404
Change-Id: I63ff60090e299e48f2273477dc3b820d4d95db8d
2016-04-25 15:58:46 -07:00
Lajos Molnar
e50413b1cf Merge "CodecCapabilities: handle legacy VP9 codecs with no profiles" into nyc-dev
am: af8be42

* commit 'af8be42b9f6aa17c8d17d999b53227f0a1d6da5b':
  CodecCapabilities: handle legacy VP9 codecs with no profiles

Change-Id: Ice672823612c02a832e8550ad62d3ba56fa1ae57
2016-04-25 22:51:22 +00:00
Lajos Molnar
268d09be84 Merge "clarify MediaCodec.setVideoScalingMode behavior" into nyc-dev
am: 4710431

* commit '4710431dc4751e9674b9e2e620f425603cf24643':
  clarify MediaCodec.setVideoScalingMode behavior

Change-Id: Ic92672b020aa9547a111e0bc728cb8edfa4a1656
2016-04-25 22:51:20 +00:00
TreeHugger Robot
af8be42b9f Merge "CodecCapabilities: handle legacy VP9 codecs with no profiles" into nyc-dev 2016-04-25 22:43:30 +00:00
Wale Ogunwale
2208ef3c24 Merge "Fixed issue with wrong stack fullscreen state on configuration change" into nyc-dev
am: b59beff

* commit 'b59beffa89b6bc4f0c2d9469443c5730787ed362':
  Fixed issue with wrong stack fullscreen state on configuration change

Change-Id: Ib683c2584aaf47dccc9e4ff9957d766ccc353297
2016-04-25 22:39:16 +00:00
Lajos Molnar
4710431dc4 Merge "clarify MediaCodec.setVideoScalingMode behavior" into nyc-dev 2016-04-25 22:36:55 +00:00
Felipe Leme
70c8b9b660 Tethering and Data Saver: There Can Be Only One!
If tethering is on when Data Saver mode is turned on, tethering should
be disabled, and vice-versa.

BUG: 28313291
Change-Id: I7f3dadbd97ea1492ab76b41043dea7487c1db02d
2016-04-25 15:36:25 -07:00
TreeHugger Robot
b59beffa89 Merge "Fixed issue with wrong stack fullscreen state on configuration change" into nyc-dev 2016-04-25 22:27:58 +00:00
Alan Viverette
1c9388a0af Merge "Check for null drawable during LayerDrawable.jumpToCurrentState()" into nyc-dev
am: 68d180b

* commit '68d180bbd1892ee5112c76be842a40a7251ed5a5':
  Check for null drawable during LayerDrawable.jumpToCurrentState()

Change-Id: Ida4daa96fdbee8b2d566ddb054f82af9120a86f3
2016-04-25 22:27:19 +00:00
Jeff Sharkey
5bc622e45b Merge "Destroy both CE and DE data when corrupted." into nyc-dev
am: 436308f

* commit '436308f88b8f165f834a6b37f7638d6d4b7a6ca7':
  Destroy both CE and DE data when corrupted.

Change-Id: Ic60599ed7ee0cd200d1b95690e5e687bd403cfad
2016-04-25 22:15:16 +00:00
Jeff Sharkey
44c38e3d86 Merge "Track down Contexts without data directories." into nyc-dev
am: 3a10c1e

* commit '3a10c1e86db9843462660d825a9673a3c72ccdd6':
  Track down Contexts without data directories.

Change-Id: Ib185bbc865fe2f1704a33b3f7557fd6c5226be1f
2016-04-25 22:15:15 +00:00
TreeHugger Robot
68d180bbd1 Merge "Check for null drawable during LayerDrawable.jumpToCurrentState()" into nyc-dev 2016-04-25 22:10:37 +00:00
Alex Light
68aab5b0b4 Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev
am: 57413a7

* commit '57413a74777060d9368f89966e9abcf96e33af8e':
  Make fake libart for misbehaving apps be loaded.

Change-Id: I2ac86c136182d5bf84ace20a6c2dda2dffe57d40
2016-04-25 22:03:43 +00:00
Jeff Sharkey
436308f88b Merge "Destroy both CE and DE data when corrupted." into nyc-dev 2016-04-25 21:59:59 +00:00
Jeff Sharkey
3a10c1e86d Merge "Track down Contexts without data directories." into nyc-dev 2016-04-25 21:59:41 +00:00
TreeHugger Robot
57413a7477 Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev 2016-04-25 21:53:31 +00:00
Amith Yamasani
14d6e5fd93 Merge "Fix deadlock between VrManager, ActivityManager and WindowManager" into nyc-dev
am: 1d66995

* commit '1d66995f47d548efe7863e88a8cc7bd2c66661a0':
  Fix deadlock between VrManager, ActivityManager and WindowManager

Change-Id: I26ea57a0a49e78e063117f71b0f6fede8b413e7c
2016-04-25 21:45:13 +00:00
Amith Yamasani
1d66995f47 Merge "Fix deadlock between VrManager, ActivityManager and WindowManager" into nyc-dev 2016-04-25 21:37:17 +00:00
Chong Zhang
86461e692e Merge "Wait for next app to be visible if current activity is marked visible" into nyc-dev
am: 98afb34

* commit '98afb342df74a657e69a478b5ace19450b579660':
  Wait for next app to be visible if current activity is marked visible

Change-Id: I6fa1dd67f8bff23596277d3c55869961ffa6b220
2016-04-25 21:26:57 +00:00
Chong Zhang
98afb342df Merge "Wait for next app to be visible if current activity is marked visible" into nyc-dev 2016-04-25 21:13:29 +00:00
Jorim Jaggi
1dba322b85 Merge "Fix bug with cancelled drag" into nyc-dev
am: df89cd1

* commit 'df89cd1b39bcebdd37b29185c76aa005863e8c2f':
  Fix bug with cancelled drag

Change-Id: I9ebb6f5252349cb5ec7e423ee18f49d6c34c64e0
2016-04-25 21:09:04 +00:00
Wale Ogunwale
5952f9aea4 Fixed issue with wrong stack fullscreen state on configuration change
- No need to run TaskStack#updateBoundsAfterConfigChange if the stack
is fullscreen as the bounds will already be updated to when the display
content changed due to rotation.
- Correctly set mTmpRect2 that we are using to calculate the rotated
bounds to the current mBounds.

Bug: 28319277
Bug: 27870534
Change-Id: Ic3d9407b735210351c28297de79bf035909afcfe
2016-04-25 14:04:04 -07:00
Jorim Jaggi
df89cd1b39 Merge "Fix bug with cancelled drag" into nyc-dev 2016-04-25 20:59:40 +00:00
Chris Wren
076bddde4b cancel group children before summaries
Bug:28190616
Change-Id: I1b716417119cfa3f4ffdd159ab5197cbfa714a8d
2016-04-25 16:44:53 -04:00
Felipe Leme
af096719c0 Don't opt-out of warning dialog by default on user builds.
BUG: 28341946
Change-Id: I9ce6bf52a02a14055d4ded41aac50c79abdb4ee9
2016-04-25 13:41:28 -07:00
Dongwon Kang
53fc5d3d40 Merge "TIF: Be consistent with argument name for startRecording" into nyc-dev
am: 0751a83

* commit '0751a83a99dc4481533ed706a942b8bb9caf8834':
  TIF: Be consistent with argument name for startRecording

Change-Id: I0701d1e106c57f310e30c65bc178c5b6b4e7344a
2016-04-25 20:33:09 +00:00
Jeff Sharkey
59ad404677 Merge "API changes for DownloadManager and JobScheduler." into nyc-dev
am: c79a568

* commit 'c79a568f18dde1590d361989ff0cb6b19a61b2e9':
  API changes for DownloadManager and JobScheduler.

Change-Id: I67bf3af62fdc61cb603fd362e6e361aeee85b439
2016-04-25 20:33:07 +00:00
Kweku Adams
6087b71933 Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev
am: 3cabb2a

* commit '3cabb2a6b3ae1c120a56cc4c2eaf2ba853cb3e32':
  Removing extraneous field from batterystats dumpsys.

Change-Id: Ice80b3d9fce92c90d9cda3908c1e628d6bf7dde8
2016-04-25 20:33:05 +00:00
Ruben Brunk
f56c9f432b Add manifest attribute for VR activities.
- Allow jank-free VR->VR activity transitions, even during
  long activity transitions.

Bug: 28115931
Change-Id: I1e3fd1a5245bac3433ea6282cb1c7a71f0e0266f
2016-04-25 13:32:03 -07:00
Lajos Molnar
a477a6e288 clarify MediaCodec.setVideoScalingMode behavior
Bug: 28131249
Change-Id: I4fd3a5333cbdc0ebec683c9a43ce071478a79d90
2016-04-25 13:28:53 -07:00
Lajos Molnar
8acc164738 CodecCapabilities: handle legacy VP9 codecs with no profiles
Bug: 26935336
Change-Id: I1049b9da8e6c984f86e307990000401b66119693
2016-04-25 13:28:06 -07:00
Chong Zhang
592bf0b7d5 Wait for next app to be visible if current activity is marked visible
WM's AppWindowToken.updateReportedVisibilityLocked() may not report
nowVisible if the app has animation set. So nowVisibible could be false
for a while after the app is already on screen. If we finish the app in
this state, we still need to wait for next app to be visible.

bug: 28019637
Change-Id: I4f9f8e138f5d011a9ab393913159ed2978d26e0d
2016-04-25 20:24:18 +00:00
Dongwon Kang
0751a83a99 Merge "TIF: Be consistent with argument name for startRecording" into nyc-dev 2016-04-25 20:16:22 +00:00
Dongwon Kang
0cb5244e52 TIF: Be consistent with argument name for startRecording
Change-Id: Icb0125049cc92c5664e0810cdb86f1cb0903405f
2016-04-25 13:15:18 -07:00
Jeff Sharkey
c79a568f18 Merge "API changes for DownloadManager and JobScheduler." into nyc-dev 2016-04-25 20:14:59 +00:00
Kweku Adams
3cabb2a6b3 Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev 2016-04-25 20:09:41 +00:00
Jorim Jaggi
f300badbf1 Fix bug with cancelled drag
Bug: 28257206
Change-Id: Ic7342f4284185486e884836220b05423e308f7ae
2016-04-25 13:00:27 -07:00
Jorim Jaggi
7be78a1e7b Merge "Fix stuck windows in multi-window" into nyc-dev
am: 4a96538

* commit '4a9653841b9a011c6c2dc2a841ef21bb501602ad':
  Fix stuck windows in multi-window

Change-Id: I7618c6852b03ca12887fbc9761839b42428b3a50
2016-04-25 19:48:32 +00:00
Janis Danisevskis
b25a17b3ea Clarifies that filesystem permission 0700 is not enforced as an invariant
The 0700 permission on apps' home directories is not
enforced as a invariant. This change to the behavior
changes documentation reflects this.

Change-Id: I2257796b804574f3c6c7d273957625f4458fe81b
2016-04-25 20:35:08 +01:00
Jorim Jaggi
ee148e354d Merge "Fix layout for child windows" into nyc-dev
am: 17178d9

* commit '17178d95f2d324f4a74e5572ae403ecc58f65e40':
  Fix layout for child windows

Change-Id: I279c8b4b4686d6d9092fbbccb04dbacb13367b92
2016-04-25 19:34:44 +00:00
Dan Sandler
d2258fa300 Merge changes from topic \'substitute-notification-app-name\' into nyc-dev
am: 955009f

* commit '955009f9d384d1b19ebb441814ca0a3fac0fbc47':
  Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
  Show "Android System" instead of "System UI" in screenshot notifications.

Change-Id: Ic0b4b2460c11426c3e6b529baec3ddd3db0a6f0a
2016-04-25 19:34:42 +00:00
Dan Sandler
d683cb8816 Merge "Tap, don\'t touch." into nyc-dev
am: 4c40888

* commit '4c40888673752552380d66bb9b47e230816f6fb5':
  Tap, don't touch.

Change-Id: I044914c79c6214da96342fc76cd6d0636171dc43
2016-04-25 19:34:39 +00:00
Dan Sandler
90b4f88952 Merge "Don\'t generate stack in logcat if assistant missing." into nyc-dev
am: 5602898

* commit '5602898dd5e9595dde59377fbad5b2beeee46510':
  Don't generate stack in logcat if assistant missing.

Change-Id: I463db9fd2e78419e1bbf3dcfddc08c294fa27ccb
2016-04-25 19:34:34 +00:00