Commit Graph

246497 Commits

Author SHA1 Message Date
Roozbeh Pournader
5f55e2c43d Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev
am: fe524c0e24

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

Change-Id: Ifc5d3f3b43bef256141db089d5783427561e4dae
2016-05-31 01:20:44 +00:00
Bill Yi
5248b0cb75 Import translations. DO NOT MERGE
Change-Id: I2bc1e221db4776d03f49e80844a482628e632262
Auto-generated-cl: translation import
2016-05-30 18:16:13 -07: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
f5fcd787d2 Import translations. DO NOT MERGE
Change-Id: Ie8c966447c73755f887ffde0f039f5dcbecfa809
Auto-generated-cl: translation import
2016-05-30 11:59:18 -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
Hemal Patel
d69a99e3a9 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: I7b701650b8ffeb97ddff0df52a2654dd88f5dffb
2016-05-28 01:31:18 +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
031def9e8e Merge "Replace Log.wtf by Log.e" into nyc-dev
am: be2527b964

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

Change-Id: Ifb47a055fb715852310f3ec65f38d040f29554b9
2016-05-28 01:08:39 +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
8cc9f36067 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: I7242f7f064f6695956a9b529f38c2ece82effbcb
2016-05-28 00:57:39 +00:00
Annie Chin
1ea49352cb Introduce ButtonInterface and getHomeId()
Bug: 28957690

Change-Id: Ief61d63b5358d07a6feb222a379a7e8cdcd712b2
2016-05-27 17:52:14 -07: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
0786743a94 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: I3f8aaebee4c47911715dbaaac904c9b93b89dac1
2016-05-28 00:13:14 +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
Makoto Onuki
8c5578bcb0 Merge "Fix build breakage due to res-id changes" into nyc-mr1-dev 2016-05-28 00:05:17 +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
Android Build Merger (Role)
d01f474773 Merge "Merge "Add more doc for Object animators defined with a single value" into nyc-dev am: f97a0f5c9c" into nyc-mr1-dev 2016-05-27 23:57:15 +00:00
TreeHugger Robot
1b9f13d7bc Merge "Adding Reset Demo Notification" into nyc-mr1-dev 2016-05-27 23:57:11 +00:00
Doris Liu
55455b2da3 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: I14cfe5e0a80832b57a270b5b34164d7e4232feeb
2016-05-27 23:56:47 +00:00
Makoto Onuki
c421b31447 Fix build breakage due to res-id changes
Change-Id: I3c8160b277e2dac83b433b5454d18b7253f5d0bd
2016-05-27 16:54:04 -07: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
f92f6351b6 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: I3588745db102813ca7fd2c3d7f646a8c1ed3378e
2016-05-27 23:18:46 +00:00
Adrian Roos
2210e541bf Merge "Fix status bar autohide with DirectReply" into nyc-dev
am: e3e80bde12

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

Change-Id: I403dced0a5e78a61a392383ad3112c9da0d3c27a
2016-05-27 23:18:43 +00:00
Joe Fernandez
e6a5e9ad6b 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: Ifdbab02807491b65706a7eba6f7ac75d0bfb92bf
2016-05-27 23:18:41 +00:00
Jeremy Joslin
0b6676d7bc 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: I6468641835c8ca50a3516146c3107fa7c59f855c
2016-05-27 23:16:42 +00:00
Hang Yin
e6880cbef9 Merge "Code Patch for camera preview switch tests" into nyc-dev
am: 5c950a8078

* commit '5c950a8078e37eb9057da4aa5b3355189b675291':
  Code Patch for camera preview switch tests

Change-Id: I79c8f93d3c161aab19d35cc9fe02ae474b8949a5
2016-05-27 23:16:40 +00:00
Doris Liu
fe0a4e4189 Merge "Copy native tree\'s property when mutate vector drawable" into nyc-dev
am: fceaa60e24

* commit 'fceaa60e249575021e41b873673e12d9b4123fbe':
  Copy native tree's property when mutate vector drawable

Change-Id: I539bbbbf5ad57c3d79ac3e2a4517ac160379c6cf
2016-05-27 23:16:36 +00:00
Adrian Roos
b87023903e Merge "Change app crash dialog strings" into nyc-dev
am: a7d66aa6b8

* commit 'a7d66aa6b86865b223bd3b0d906b9a0f95e7c3b5':
  Change app crash dialog strings

Change-Id: I45b1d5663e0ee45b59155883757850efedbdfe31
2016-05-27 23:16:33 +00:00
Adrian Roos
b1ca71dc16 Merge "Simplify crash dialog" into nyc-dev
am: 9764fea483

* commit '9764fea48350e9148b606f8e10686e298437e440':
  Simplify crash dialog

Change-Id: Idbe8524005b63fe008fa01dde96b9408eceaefc6
2016-05-27 23:16:31 +00:00
Adrian Roos
7d4da18d03 Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev
am: 5dbb9ff674

* commit '5dbb9ff67468979214542eb6a448711d2d614cdb':
  Fix bad one-line MessagingStyle

Change-Id: I1b6cf5033b970aea74fed1ac07c93fe69b7fb1de
2016-05-27 23:12:29 +00:00
Hemal Patel
f986b700de Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs am: 9dfa75ef43 am: 202017dcbf
am: 2c69d1ecae

* commit '2c69d1ecae5efff06a29bec3d73f9654b8851972':
  Fix IME and NavBar overlap with Direct Reply

Change-Id: I9983d40ed0da917ea7f19df60b8f36e760dc26d7
2016-05-27 23:12:24 +00:00
Hemal Patel
6396bf5e28 Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7a62915c51
am: 8d8718fc53

* commit '8d8718fc534325ff477036034eea058c179d1e04':
  Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub.

Change-Id: I6328e016fa56e110832281a4c2e7b42cc673e3f8
2016-05-27 23:12:18 +00:00
Hemal Patel
ffc5ae0721 Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev
am: 2b9497069d

* commit '2b9497069dbabdd1f3fd6668c86922d52b9246fd':
  Docs: Removed note in "Platform Versions" section

Change-Id: Ib636c5df935f12b70092792796ae2a3cde995cd1
2016-05-27 23:12:13 +00:00
Michael Wright
b19774bd32 Merge "Revert "Finalize resource IDs for N."" into nyc-dev
am: d63315e535

* commit 'd63315e535e57eb949feb4238cc31832a76a6229':
  Docs: Fixed the end-of-comment tag

Change-Id: Icb8763a976ea1768f8dfb68875d87dcb0a53cca5
2016-05-27 23:12:07 +00:00
Bart Sears
ffc8723d88 Merge "resolve merge conflicts of 82a8c5f to nyc-mr1-dev" into nyc-mr1-dev 2016-05-27 23:09:24 +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
Bart Sears
f87ee48da9 resolve merge conflicts of 82a8c5f to nyc-mr1-dev
Change-Id: I7ba17e4b36997684d5f542900a81a03d28228a7a
2016-05-27 16:02:22 -07: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
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