Commit Graph

255075 Commits

Author SHA1 Message Date
Victor Chang
98801e9f2b Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev 2016-05-31 09:43:37 +00:00
Victor Chang
86b4701d7f Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev
am: 76609106b7

* commit '76609106b72e944eb87782f1c622519f98ff490f':
  Fix VPN Request dialog appearing each time VPN is connecting

Change-Id: I67f2434f144ec1eca21092da8b757507072c937d
2016-05-31 08:27:50 +00:00
Victor Chang
76609106b7 Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev 2016-05-31 08:21:24 +00:00
Victor Chang
aa2e02348a Finish ConfirmDialog when another vpn app is always-on
Bug:29000925
Change-Id: I1087dbb2c366cebb4583ae0bb97302b3d2caf42c
2016-05-31 09:11:19 +01:00
Bill Yi
fc22bd87ff Merge "Import translations. DO NOT MERGE" into nyc-dev
am: e71cdef7e3  -s ours

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

Change-Id: I2180ff991e0f2a3969dc13b44931a9cf6a639f24
2016-05-31 04:50:22 +00:00
Bill Yi
4f6969c7eb Merge "Import translations. DO NOT MERGE" into nyc-dev
am: ae284e6cb6  -s ours

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

Change-Id: Ib50a2d6669eec4e8c2185d056712700f0ebd5d21
2016-05-31 04:50:16 +00:00
Bill Yi
3551359739 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 5854f2aa07  -s ours

* commit '5854f2aa077e5ceba2977724f71162eaf3faa384':
  Import translations. DO NOT MERGE

Change-Id: I8e1a06a15432d0599f86bba7c42d7e9d1f2fcd38
2016-05-31 04:50:12 +00:00
Roozbeh Pournader
08b6d01ccb Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev
am: fe524c0e24

* commit 'fe524c0e24ba2dc65c9ea490b2334a039c1b0a6a':
  Support ellipsizing LocaleHelper.getDisplayLocaleList()

Change-Id: I98301daa256ab8e8dc2dc05c1e877f39ef685c23
2016-05-31 04:49:59 +00:00
TreeHugger Robot
e71cdef7e3 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-31 03:54:31 +00:00
TreeHugger Robot
ae284e6cb6 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-31 03:46:00 +00:00
TreeHugger Robot
5854f2aa07 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-31 03:45:44 +00:00
Bill Yi
f03166100c Import translations. DO NOT MERGE
Change-Id: I55d645f1ec4661ef1db9a650aa555178fc6ed6a5
Auto-generated-cl: translation import
2016-05-30 18:11:25 -07:00
Roozbeh Pournader
fe524c0e24 Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev 2016-05-31 01:02:42 +00:00
Bill Yi
95c8a941af Import translations. DO NOT MERGE
Change-Id: Ieeea0ff0eefd470b6a929f69671ca10724990c88
Auto-generated-cl: translation import
2016-05-30 17:49:58 -07:00
Bill Yi
650a11a2dd Import translations. DO NOT MERGE
Change-Id: Idaa6156bb45c7c8c23f7b9b66910bcbf7a774ab1
Auto-generated-cl: translation import
2016-05-30 11:53:22 -07:00
Victor Chang
98a633a89c Fix VPN Request dialog appearing each time VPN is connecting
cause: ConfirmDialog is shown when prepareVpn(package, null)
returns false when the package is in always-on mode

We added the code in ag/949136 to stop app replacing app currently set to always-on.

Bug: 28941235
Change-Id: I370e56ad59332cc3fb722a98730fa73a97e26831
2016-05-30 18:35:08 +01:00
Tomasz Mikolajewski
ad3b61623f Make CotentResolver#openInputStream handle errors from reliable pipes.
Bug: 28967963
Change-Id: I3b1343e91e7b6616ea0d641888f5b41d1b83a8a5
2016-05-30 11:05:35 +09:00
Greg Hackmann
f11d0fe8c5 Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support"" am: 6fb921a61b
am: 359a4d9569

* commit '359a4d9569fd88a896650065256e8a377546b8e2':
  Revert "AlarmManagerService: remove legacy /dev/alarm support"

Change-Id: I0f1ed806b1261796da0dad770c50e8e1b9f5b3e1
2016-05-28 16:41:13 +00:00
Greg Hackmann
359a4d9569 Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support""
am: 6fb921a61b

* commit '6fb921a61b0ca6bac8002e0fdbeb521453dce408':
  Revert "AlarmManagerService: remove legacy /dev/alarm support"

Change-Id: I7cfaa210c181c9f3754727797609d3ed4ce3244e
2016-05-28 16:34:39 +00:00
Treehugger Robot
6fb921a61b Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support"" 2016-05-28 16:19:03 +00:00
Greg Hackmann
dea57bac3d Revert "AlarmManagerService: remove legacy /dev/alarm support"
This reverts commit f68cdb9cb4.

Change-Id: I13e954656771f32c6156b4c4adb52922bcd0717a
2016-05-28 13:07:22 +00:00
Hemal Patel
10b673c234 Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs am: 709f0df0d8 am: 71b5005a66
am: 747d945b2c

* commit '747d945b2c8717e9a501c861a3caf20633355979':
  Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample

Change-Id: Ibc785405ec7100f4bfac65b1e0e71933bf3270f9
2016-05-28 01:27:49 +00:00
Hemal Patel
747d945b2c Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs am: 709f0df0d8
am: 71b5005a66

* commit '71b5005a66872c25aaf71be865246294d0888279':
  Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample

Change-Id: I09b59dd2cc85de4478012e2326bfce1cfd314e6b
2016-05-28 01:24:52 +00:00
Hemal Patel
71b5005a66 Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs
am: 709f0df0d8

* commit '709f0df0d883ee5351d4f5688360fa76f9a84dbc':
  Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample

Change-Id: Idee5539ed59ec115e90b4f5413f385e8d51369d8
2016-05-28 01:20:26 +00:00
Hemal Patel
709f0df0d8 Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs 2016-05-28 01:16:51 +00:00
Jorim Jaggi
cbd53dca91 Merge "Replace Log.wtf by Log.e" into nyc-dev
am: be2527b964

* commit 'be2527b964796aa490f94043deedc2ad7bcd222d':
  Replace Log.wtf by Log.e

Change-Id: I6ea32ab06cf2b0584f6d0574ea7d5106e28793ee
2016-05-28 01:08:59 +00:00
Jorim Jaggi
be2527b964 Merge "Replace Log.wtf by Log.e" into nyc-dev 2016-05-28 01:03:28 +00:00
Christopher Tate
7317034daf Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev
am: b182735757

* commit 'b182735757630db7e84e577c999b9e7d8a288353':
  Don't call .toString() on potentially null CharSequence

Change-Id: I5c8253739fa06b07abd4d67b4947c6bed153d010
2016-05-28 00:57:43 +00:00
Chris Tate
b182735757 Merge "Don't call .toString() on potentially null CharSequence" into nyc-dev 2016-05-28 00:52:11 +00:00
Jorim Jaggi
25f332ca19 Replace Log.wtf by Log.e
Bug: 28949995
Change-Id: I2193511566124980860843da0a822621184218b1
2016-05-27 17:47:14 -07:00
Winson
c58084447d Merge "Tweaking layout to make two-task stacks to closer match design." into nyc-dev
am: 8a9100caae

* commit '8a9100caaea34cadcd19910f5667407a29016d03':
  Tweaking layout to make two-task stacks to closer match design.

Change-Id: I976d0516fe103dac7bf5cad6ae48c4d026ab7982
2016-05-28 00:16:48 +00:00
Christopher Tate
f135b271bf Don't call .toString() on potentially null CharSequence
We're building an exception message string, but by explicitly invoking
.toString() we're accidentally triggering an NPE rather than the typed
exception we want to throw.  Build the string in a way that will be
safe and sensical even if the CharSequence is null.

Bug 29009255

Change-Id: I1813260f0b36fd44506b8327f997dd20c2d6c8bf
2016-05-27 17:13:10 -07:00
Winson Chung
8a9100caae Merge "Tweaking layout to make two-task stacks to closer match design." into nyc-dev 2016-05-28 00:07:47 +00:00
Selim Cinek
ddf1b399d8 Fixed a few accessibility issues with notifications and groups
Change-Id: I78fa62884eaa0efe825b5eb1e6cac7d88fc05a7f
Fixes: 28069681
2016-05-27 17:04:56 -07:00
Jorim Jaggi
e525a35704 Fix multi-window enter animation
Stable insets are not calculated in the first pass, so fetch it
manually if needed to avoid a relayout.

Bug: 28705801
Change-Id: I8f9a3bab96b597a80963d7ebcc8b19454b3e45a6
2016-05-27 23:58:20 +00:00
Doris Liu
cf9df710e5 Merge "Add more doc for Object animators defined with a single value" into nyc-dev
am: f97a0f5c9c

* commit 'f97a0f5c9c501bc7e39c779ebb2e009e1ea496cd':
  Add more doc for Object animators defined with a single value

Change-Id: I1be74292a21b0b9d86dd2df35c319f3a2f4a230c
2016-05-27 23:56:51 +00:00
TreeHugger Robot
f97a0f5c9c Merge "Add more doc for Object animators defined with a single value" into nyc-dev 2016-05-27 23:51:18 +00:00
smain@google.com
6d6e6d2457 redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890 am: d6c76ddc51 am: 3152ead0f8
am: c26b8afd35

* commit 'c26b8afd35c2debf14cdefb6120b908cfb9ef5c3':
  redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890

Change-Id: I28198ddb49b95c07aeb5ec90135bcb57533ce8d2
2016-05-27 23:08:00 +00:00
smain@google.com
c26b8afd35 redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890 am: d6c76ddc51
am: 3152ead0f8

* commit '3152ead0f8cb5994100a423b47907db06d8e0d7b':
  redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890

Change-Id: I8ec4aee36c2f39f9590fe94ffa8fa7b8da90cf43
2016-05-27 23:02:25 +00:00
Adrian Roos
9fb91a6c04 Merge "Fix status bar autohide with DirectReply" into nyc-dev
am: e3e80bde12

* commit 'e3e80bde1246ed403be3315dcb1b92edc326aaf7':
  Fix status bar autohide with DirectReply

Change-Id: I9f86201ef1569ac06f09c704f1dce480de750d95
2016-05-27 23:02:09 +00:00
Yigit Boyar
51b5caf902 Invalidate child bounds when AbsListView bounds change
This CL fixes a bug in AbsListView where it was not invalidating
children's bounds when AbsListView's bounds change. This was
triggering bugs where if you set padding on a list view, it would
not resize its children.

Bug: 28800232
Change-Id: I81a4e9ea234c395de80efea5ef5e47a71cb95136
2016-05-27 16:00:22 -07:00
smain@google.com
3152ead0f8 redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890
am: d6c76ddc51

* commit 'd6c76ddc51a1b607c50d8e443a7affb9b2e0e1b6':
  redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890

Change-Id: Ia14317cc6a292fcda6328d96660db0eda5757e12
2016-05-27 22:56:53 +00:00
Adrian Roos
e3e80bde12 Merge "Fix status bar autohide with DirectReply" into nyc-dev 2016-05-27 22:55:00 +00:00
Joe Fernandez
f6ccafda22 Merge "Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs am: 580bff3d90 am: 25967b7577" into nyc-dev
am: ddb8133841

* commit 'ddb8133841e7a85c4697e9cbcf601768e435e83b':
  docs: update redirects for GMS and GCM reference docs

Change-Id: I007c32014960ff6fa856a77166a41be8c7aee948
2016-05-27 22:51:53 +00:00
Jeremy Joslin
b17d1a36fb Merge "Fix issue #28930592: Scoring service binding is not reestablished." into nyc-dev
am: 49b515a2a5

* commit '49b515a2a5d602ddb24d146d3b6ada54a496b6c2':
  Fix issue #28930592: Scoring service binding is not reestablished.

Change-Id: I3fdb0cb78e2991810ee7e62e901638be71272895
2016-05-27 22:51:49 +00:00
Adrian Roos
33fbd2c965 MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT
Generates an appropriate title and text for MessagingStyle
Notifications, such that SystemUI can generate the appropriate
oneline representation.

Bug: 28934989
Change-Id: Ic23ed18bb9c4af21ad59626ca161ca7abb25a4e9
2016-05-27 15:49:05 -07:00
smain@google.com
d6c76ddc51 redirect adt guide to release notes to consolidate the deprecation message.
related deletion of file: https://critique.corp.google.com/#review/123463890

Change-Id: Ia9b533ec52a0fd05fcfeede04dda64ae6041c6a2
2016-05-27 15:48:44 -07:00
Android Build Merger (Role)
ddb8133841 Merge "Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs am: 580bff3d90 am: 25967b7577" into nyc-dev 2016-05-27 22:46:28 +00:00
Joe Fernandez
3ccb88b97a Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs am: 580bff3d90
am: 25967b7577

* commit '25967b7577b427b81417848678dad3916b92d6ba':
  docs: update redirects for GMS and GCM reference docs

Change-Id: I383c15867a5a0334b856bedf27ccb93f464a9751
2016-05-27 22:46:01 +00:00
TreeHugger Robot
49b515a2a5 Merge "Fix issue #28930592: Scoring service binding is not reestablished." into nyc-dev 2016-05-27 22:44:19 +00:00